From 3f07d12ae2fbaf929b4a7da8876eae37589dae0a Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 6 Sep 2013 09:52:08 +0200 Subject: Android: Fix unused variable/argument warnings There were a bunch of these in Android specific code. Change-Id: Icf6cda40302171810c1b559f9d442fba6444a3a5 Reviewed-by: BogDan Vatra --- src/corelib/kernel/qsharedmemory_android.cpp | 4 ++++ src/corelib/kernel/qsystemsemaphore_android.cpp | 3 +++ src/network/kernel/qdnslookup_android.cpp | 3 +++ src/plugins/platforms/android/src/androidjniinput.cpp | 15 +-------------- .../platforms/android/src/opengl/qeglfshooks_android.cpp | 1 + 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/corelib/kernel/qsharedmemory_android.cpp b/src/corelib/kernel/qsharedmemory_android.cpp index 56466eae03..33ebb6966a 100644 --- a/src/corelib/kernel/qsharedmemory_android.cpp +++ b/src/corelib/kernel/qsharedmemory_android.cpp @@ -57,6 +57,7 @@ QSharedMemoryPrivate::QSharedMemoryPrivate() void QSharedMemoryPrivate::setErrorString(const QString &function) { + Q_UNUSED(function); qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; } @@ -71,6 +72,7 @@ key_t QSharedMemoryPrivate::handle() #if !(defined(QT_NO_SHAREDMEMORY) && defined(QT_NO_SYSTEMSEMAPHORE)) int QSharedMemoryPrivate::createUnixKeyFile(const QString &fileName) { + Q_UNUSED(fileName); qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; return 0; } @@ -86,12 +88,14 @@ bool QSharedMemoryPrivate::cleanHandle() bool QSharedMemoryPrivate::create(int size) { + Q_UNUSED(size); qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; return false; } bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) { + Q_UNUSED(mode); qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; return false; } diff --git a/src/corelib/kernel/qsystemsemaphore_android.cpp b/src/corelib/kernel/qsystemsemaphore_android.cpp index 8158fdb2ed..6251cd822a 100644 --- a/src/corelib/kernel/qsystemsemaphore_android.cpp +++ b/src/corelib/kernel/qsystemsemaphore_android.cpp @@ -56,11 +56,13 @@ QSystemSemaphorePrivate::QSystemSemaphorePrivate() : void QSystemSemaphorePrivate::setErrorString(const QString &function) { + Q_UNUSED(function); qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; } key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) { + Q_UNUSED(mode); qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; return -1; } @@ -72,6 +74,7 @@ void QSystemSemaphorePrivate::cleanHandle() bool QSystemSemaphorePrivate::modifySemaphore(int count) { + Q_UNUSED(count); qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; return false; } diff --git a/src/network/kernel/qdnslookup_android.cpp b/src/network/kernel/qdnslookup_android.cpp index ed12c02bbf..dff81dba0c 100644 --- a/src/network/kernel/qdnslookup_android.cpp +++ b/src/network/kernel/qdnslookup_android.cpp @@ -45,6 +45,9 @@ QT_BEGIN_NAMESPACE void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestName, QDnsLookupReply *reply) { + Q_UNUSED(requestType); + Q_UNUSED(requestName); + Q_UNUSED(reply); qWarning() << Q_FUNC_INFO << "Not yet supported on Android"; reply->error = QDnsLookup::ResolverError; reply->errorString = tr("Not yet supported on Android"); diff --git a/src/plugins/platforms/android/src/androidjniinput.cpp b/src/plugins/platforms/android/src/androidjniinput.cpp index b31e74bb52..4a2d87d6a4 100644 --- a/src/plugins/platforms/android/src/androidjniinput.cpp +++ b/src/plugins/platforms/android/src/androidjniinput.cpp @@ -222,24 +222,11 @@ namespace QtAndroidInput m_touchPoints.push_back(touchPoint); } - static void touchEnd(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint action) + static void touchEnd(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint /*action*/) { if (m_touchPoints.isEmpty()) return; - QEvent::Type eventType = QEvent::None; - switch (action) { - case 0: - eventType = QEvent::TouchBegin; - break; - case 1: - eventType = QEvent::TouchUpdate; - break; - case 2: - eventType = QEvent::TouchEnd; - break; - } - QAndroidPlatformIntegration *platformIntegration = QtAndroid::androidPlatformIntegration(); QTouchDevice *touchDevice = platformIntegration->touchDevice(); if (touchDevice == 0) { diff --git a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp index 5a35310111..c6e3035476 100644 --- a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp +++ b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp @@ -98,6 +98,7 @@ QDpi QEglFSAndroidHooks::logicalDpi() const EGLNativeWindowType QEglFSAndroidHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format) { Q_UNUSED(size); + Q_UNUSED(format); ANativeWindow *window = QtAndroid::nativeWindow(); if (window != 0) ANativeWindow_acquire(window); -- cgit v1.2.3