Android and indentation

Author: devshgraphicsprogramming

include/nbl/system/CApplicationAndroid.h

@@ -1,19 +1,21 @@
 #ifndef	_NBL_SYSTEM_C_APPLICATION_FRAMEWORK_ANDROID_H_INCLUDED_
 #define	_NBL_SYSTEM_C_APPLICATION_FRAMEWORK_ANDROID_H_INCLUDED_
 
-#ifdef _NBL_PLATFORM_ANDROID_
-
 #include "nbl/core/declarations.h"
-#include "nbl/system/CStdoutLoggerAndroid.h"
+
 #include "nbl/system/IApplicationFramework.h"
+#include "nbl/system/CStdoutLoggerAndroid.h"
+
+
+namespace nbl::system
+{
+#ifdef _NBL_PLATFORM_ANDROID_
 #include <android_native_app_glue.h>
 #include <android/sensor.h>
 #include <android/log.h>
-namespace nbl::system
-{
 
     class CApplicationAndroid : public IApplicationFramework
-    {
+{
     public:
         void onStateSaved(android_app* params)
         {
@@ -132,10 +134,9 @@ namespace nbl::system
         };
         CEventPoller eventPoller;
         bool keepPolling() const { return eventPoller.continuePredicate(); }
-    };
-
-}
+};
 
 #endif
+}
 
 #endif 

include/nbl/system/IApplicationFramework.h

@@ -2,8 +2,8 @@
 #define	_NBL_SYSTEM_I_APPLICATION_FRAMEWORK_H_INCLUDED_
 
 #include "nbl/core/declarations.h"
-#include "nbl/system/declarations.h"
 
+#include "nbl/system/declarations.h"
 #include "nbl/system/definitions.h"
 
 namespace nbl::system

src/nbl/system/CAPKResourcesArchive.cpp

@@ -15,24 +15,24 @@ CAPKResourcesArchive::CAPKResourcesArchive(const path& _path, system::logger_opt
 core::vector<IFileArchive::SListEntry> CAPKResourcesArchive::computeItems(const std::string& asset_path, ANativeActivity* activity, JNIEnv* jniEnv)
 {
 	auto context_object = activity->clazz;
-	auto getAssets_method = env->GetMethodID(env->GetObjectClass(context_object), "getAssets", "()Landroid/content/res/AssetManager;");
-	auto assetManager_object = env->CallObjectMethod(context_object,getAssets_method);
-	auto list_method = env->GetMethodID(env->GetObjectClass(assetManager_object), "list", "(Ljava/lang/String;)[Ljava/lang/String;");
+	auto getAssets_method = jniEnv->GetMethodID(jniEnv->GetObjectClass(context_object), "getAssets", "()Landroid/content/res/AssetManager;");
+	auto assetManager_object = jniEnv->CallObjectMethod(context_object,getAssets_method);
+	auto list_method = jniEnv->GetMethodID(jniEnv->GetObjectClass(assetManager_object), "list", "(Ljava/lang/String;)[Ljava/lang/String;");
 
-	jstring path_object = env->NewStringUTF(asset_path.c_str());
+	jstring path_object = jniEnv->NewStringUTF(asset_path.c_str());
 
-	auto files_object = (jobjectArray)env->CallObjectMethod(assetManager_object, list_method, path_object);
+	auto files_object = (jobjectArray)jniEnv->CallObjectMethod(assetManager_object, list_method, path_object);
 
-	env->DeleteLocalRef(path_object);
+	jniEnv->DeleteLocalRef(path_object);
 
-	auto length = env->GetArrayLength(files_object);
+	auto length = jniEnv->GetArrayLength(files_object);
 
 	core::vector<IFileArchive::SListEntry> result;
 	for (decltype(length) i=0; i<length; i++)
 	{
-		jstring jstr = (jstring)env->GetObjectArrayElement(files_object,i);
+		jstring jstr = (jstring)jniEnv->GetObjectArrayElement(files_object,i);
 
-		const char* filename = env->GetStringUTFChars(jstr,nullptr);
+		const char* filename = jniEnv->GetStringUTFChars(jstr,nullptr);
 		if (filename != nullptr)
 		{
 			auto& item = result.emplace_back();
@@ -46,10 +46,10 @@ core::vector<IFileArchive::SListEntry> CAPKResourcesArchive::computeItems(const
 			item.ID = i;
 			item.allocatorType = EAT_APK_ALLOCATOR;
 
-			env->ReleaseStringUTFChars(jstr,filename);
+			jniEnv->ReleaseStringUTFChars(jstr,filename);
 		}
 
-		env->DeleteLocalRef(jstr);
+		jniEnv->DeleteLocalRef(jstr);
 	}
 }
 

src/nbl/ui/CGraphicalApplicationAndroid.cpp

@@ -4,22 +4,24 @@
 
 namespace nbl::ui
 {
-	system::path CGraphicalApplicationAndroid::getSharedResourcesPath(JNIEnv* env)
-	{
-		// Get File object for the external storage directory.
-		jclass classEnvironment = env->FindClass("android/os/Environment");
-		jmethodID methodIDgetExternalStorageDirectory = env->GetStaticMethodID(classEnvironment, "getExternalStorageDirectory", "()Ljava/io/File;"); // public static File getExternalStorageDirectory ()
-		jobject objectFile = env->CallStaticObjectMethod(classEnvironment, methodIDgetExternalStorageDirectory);
 
-		// Call method on File object to retrieve String object.
-		jclass classFile = env->GetObjectClass(objectFile);
-		jmethodID methodIDgetAbsolutePath = env->GetMethodID(classFile, "getAbsolutePath", "()Ljava/lang/String;");
-		jstring stringPath = (jstring)env->CallObjectMethod(objectFile, methodIDgetAbsolutePath);
+system::path CGraphicalApplicationAndroid::getSharedResourcesPath(JNIEnv* env)
+{
+	// Get File object for the external storage directory.
+	jclass classEnvironment = env->FindClass("android/os/Environment");
+	jmethodID methodIDgetExternalStorageDirectory = env->GetStaticMethodID(classEnvironment, "getExternalStorageDirectory", "()Ljava/io/File;"); // public static File getExternalStorageDirectory ()
+	jobject objectFile = env->CallStaticObjectMethod(classEnvironment, methodIDgetExternalStorageDirectory);
+
+	// Call method on File object to retrieve String object.
+	jclass classFile = env->GetObjectClass(objectFile);
+	jmethodID methodIDgetAbsolutePath = env->GetMethodID(classFile, "getAbsolutePath", "()Ljava/lang/String;");
+	jstring stringPath = (jstring)env->CallObjectMethod(objectFile, methodIDgetAbsolutePath);
+
+	// Extract a C string from the String object, and chdir() to it.
+	const char* sharedPath = env->GetStringUTFChars(stringPath, NULL);
+	return system::path(sharedPath);
+}
 
-		// Extract a C string from the String object, and chdir() to it.
-		const char* sharedPath = env->GetStringUTFChars(stringPath, NULL);
-		return system::path(sharedPath);
-		}
 }
 
 #endif