pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

style correction

Browse source
This commit is contained in:
AlexeiVitenko 2012-12-05 21:52:04 +03:00 • committed by Alex Zolotarev
parent 491dcea892
commit b09db81e9d
3 changed files with 8 additions and 13 deletions
android/jni/com/mapswithme/maps
Framework.cppFramework.hppMWMActivity.cpp

13
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -19,7 +19,6 @@
#include "../../../../../platform/location.hpp"
#include "../../../../../platform/file_name_utils.hpp"
#include "../../../../../base/logging.hpp"
#include "../../../../../base/math.hpp"
#include "../../../../../std/shared_ptr.hpp"
@ -281,9 +280,9 @@ namespace android
if ((eventType == NV_MULTITOUCH_UP) && (m_isCleanSingleClick))
{
double seconds = m_longClickTimer.ElapsedSeconds();
if ( seconds >= LONG_CLICK_LENGTH_SEC)
if (seconds >= LONG_CLICK_LENGTH_SEC)
{
CallLongClickListeners((int)x1,(int) y1);
CallLongClickListeners(static_cast<int>(x1), static_cast<int>(y1));
}
if (m_work.GetGuiController()->OnTapEnded(m2::PointD(x1, y1)))
return;
@ -518,13 +517,13 @@ namespace android
void Framework::CallLongClickListeners(int x, int y)
{
map<int, TOnLongClickListener>::iterator it;
for ( it=m_onLongClickFns.begin() ; it != m_onLongClickFns.end(); it++ )
for (it = m_onLongClickFns.begin(); it != m_onLongClickFns.end(); it++)
{
(*it).second(x,y);
(*it).second(x, y);
}
}
int Framework::AddLongClickListener(Framework::TOnLongClickListener l)
int Framework::AddLongClickListener(Framework::TOnLongClickListener const & l)
{
int handle = ++m_onLongClickFnsHandler;
m_onLongClickFns[handle] = l;
@ -533,6 +532,6 @@ namespace android
void Framework::RemoveLongClickListener(int h)
{
m_onLongClickFns.erase(m_onLongClickFns.find(h));
m_onLongClickFns.erase(h);
}
}

3
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -6,7 +6,6 @@
#include "../../../../../map/drawer.hpp"
#include "../../../../../map/window_handle.hpp"
#include "../../../../../map/feature_vec_model.hpp"
#include "../../../../../base/logging.hpp"
#include "../../../../../geometry/avg_vector.hpp"
@ -110,7 +109,7 @@ namespace android
void Scale(double k);
int AddLongClickListener(TOnLongClickListener l);
int AddLongClickListener(TOnLongClickListener const & l);
void RemoveLongClickListener(int h);

5
android/jni/com/mapswithme/maps/MWMActivity.cpp
View file

@ -7,10 +7,7 @@
#include "../../../nv_event/nv_event.hpp"
#include "../../../../../map/country_status_display.hpp"
#include "../../../../../base/logging.hpp"
/*
private native int addOnLongClickListener( l);
private native void removeOnLongClickListener(int h);*/
////////////////////////////////////////////////////////////////////////////////////////////
extern "C"
{