diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-10-13 20:45:16 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-10-13 23:17:38 +0300 |
commit | e9f260b38076ce56f131914cfb5ece242eb1225c (patch) | |
tree | db04b616a00931ab15cee70975738191bbdafca1 /desktop | |
parent | 2b1329663a2034bfd622d9227573421b10bdad15 (diff) |
Minor refactoring of iOS code
Rename functions so that functions called by the UI layer for actions
to happen in the LO layer and functions called by the LO layer for
things to happen in the UI layer use different prefixes. Move
declarations to the generic <touch/touch.h> and avoid iOS-specific
types in the API.
Change-Id: Ieb8979065e02a87c4a415c934163265f2790d011
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/sofficemain.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 03d2eab718af..7678e5b47ead 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -39,6 +39,10 @@ # define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG, __VA_ARGS__)) #endif +#ifdef IOS +#include <touch/touch.h> +#endif + int SVMain(); extern "C" int DESKTOP_DLLPUBLIC soffice_main() @@ -97,7 +101,7 @@ Java_org_libreoffice_android_AppSupport_runMain(JNIEnv* /* env */, #else extern "C" void -lo_runMain() +touch_lo_runMain() #endif { int nRet; |