[new downloader][android] fix: "// namespace" reformat

This commit is contained in:
Alexander Marchuk 2016-02-19 19:21:42 +03:00 committed by Sergey Yershov
parent 7106a09613
commit 28acecd51e
19 changed files with 24 additions and 22 deletions

View file

@ -39,4 +39,4 @@ private:
void operator = (ScopedLocalRef const &) = delete;
};
} // namespace jni
} // namespace jni

View file

@ -194,4 +194,4 @@ namespace jni
env->CallStaticVoidMethod(vm_class, dump_mid);
env->DeleteLocalRef(vm_class);
}
} // namespace jni
} // namespace jni

View file

@ -45,11 +45,13 @@ struct FileToDownload
namespace
{
static vector<FileToDownload> g_filesToDownload;
static int g_totalDownloadedBytes;
static int g_totalBytesToDownload;
static shared_ptr<HttpRequest> g_currentRequest;
} // namespace
} // namespace
extern "C"
{

View file

@ -43,7 +43,7 @@ namespace
return g_framework->NativeFramework();
}
} // namespace
} // namespace
namespace android
{
@ -419,7 +419,7 @@ void Framework::Migrate()
m_work.Migrate();
}
} // namespace android
} // namespace android
//============ GLUE CODE for com.mapswithme.maps.Framework class =============//
/* ____

View file

@ -40,7 +40,7 @@ void PrepareClassRefs(JNIEnv * env)
g_countryItemClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/downloader/CountryItem");
}
} // namespace
} // namespace
extern "C"
{
@ -83,7 +83,7 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeGetRootNode(JNIEnv * env, j
JNIEXPORT jobject JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env, jclass clazz)
{
static Storage::UpdateInfo info = { 0 };
Storage::UpdateInfo info = { 0 };
if (!GetStorage().GetUpdateInfo(GetStorage().GetRootId(), info))
return nullptr;

View file

@ -135,7 +135,7 @@ void OnResults(Results const & results, long long timestamp, bool isMapAndTable,
env->CallVoidMethod(g_javaListener, g_updateResultsId, jResults, static_cast<jlong>(timestamp));
env->DeleteLocalRef(jResults);
}
} // namespace
} // namespace
extern "C"
{

View file

@ -12,7 +12,7 @@ namespace
return (g_framework ? g_framework->NativeFramework() : nullptr);
}
} // namespace
} // namespace
extern "C"
{

View file

@ -152,4 +152,4 @@ jobject CreateMapObject(UserMark const * userMark)
return mapObject;
}
} // namespace usermark_helper
} // namespace usermark_helper

View file

@ -31,4 +31,4 @@ jobject CreateBookmark(int categoryId, int bookmarkId, string const & typeName,
jobject CreateMapObject(int mapObjectType, string const & name, double lat, double lon, string const & typeName, feature::Metadata const & metadata);
jobject CreateMapObject(UserMark const * userMark);
} // namespace usermark
} // namespace usermark

View file

@ -19,7 +19,7 @@ FeatureType * activeFeature()
{
return g_framework->GetActiveUserMark()->GetFeature();
}
} // namespace
} // namespace
extern "C"
{

View file

@ -176,7 +176,7 @@ TimeTableSet NativeTimetableSet(JNIEnv * env, jobjectArray jTimetables)
return tts;
}
} // namespace
} // namespace
extern "C"
{

View file

@ -27,7 +27,7 @@ jobjectArray ToStringArray(JNIEnv * env, OsmOAuth::TUrlRequestToken const & uks)
env->SetObjectArrayElement(resultArray, 2, ToJavaString(env, uks.second.second));
return resultArray;
}
} // namespace
} // namespace
extern "C"
{

View file

@ -70,7 +70,7 @@ string GetEglError(EGLint error)
}
}
} // namespace
} // namespace
void CheckEGL(my::SrcPoint const & src)
{
@ -82,4 +82,4 @@ void CheckEGL(my::SrcPoint const & src)
}
}
} // namespace android
} // namespace android

View file

@ -26,5 +26,5 @@ void CheckEGL(my::SrcPoint const & src);
#define CHECK_EGL(x) do { (x); CheckEGL(SRC());} while(false);
#define CHECK_EGL_CALL() do { CheckEGL(SRC());} while (false);
} // namespace android
} // namespace android

View file

@ -84,4 +84,4 @@ void AndroidOGLContext::resetSurface()
m_surface = EGL_NO_SURFACE;
}
} // namespace android
} // namespace android

View file

@ -36,4 +36,4 @@ private:
// @}
};
} // namespace android
} // namespace android

View file

@ -291,4 +291,4 @@ bool AndroidOGLContextFactory::createPixelbufferSurface()
return true;
}
} // namespace android
} // namespace android

View file

@ -50,4 +50,4 @@ private:
bool m_windowSurfaceValid;
};
} // namespace android
} // namespace android

View file

@ -96,7 +96,7 @@ namespace downloader
delete request;
}
} // namespace downloader
} // namespace downloader
extern "C"
{