From 4c011aad53026775e25668e0fc1c2fedf2f181d8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 1 Apr 2013 23:08:54 -0700 Subject: Fix warnings in qtsensors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtapsensor.h:110:34: error: extra ";" [-pedantic] qsensor.cpp:147:12: error: ‘qrange_id’ defined but not used [-Werror=unused-variable] dummycommon.cpp:151:9: error: variable ‘ok’ set but not used [-Werror=unused-but-set-variable] Change-Id: Ief3b4841bae7c255a40ad8f19f3f8733a613db48 Reviewed-by: Paul Olav Tvete --- src/plugins/sensors/dummy/dummycommon.cpp | 1 + src/sensors/qsensor.cpp | 11 +++++++---- src/sensors/qtapsensor.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/plugins/sensors/dummy/dummycommon.cpp b/src/plugins/sensors/dummy/dummycommon.cpp index 33e71119..675e54b6 100644 --- a/src/plugins/sensors/dummy/dummycommon.cpp +++ b/src/plugins/sensors/dummy/dummycommon.cpp @@ -151,6 +151,7 @@ quint64 dummycommon::getTimestamp() int ok; ok = clock_gettime(CLOCK_MONOTONIC, &tv); Q_ASSERT(ok == 0); + Q_UNUSED(ok); quint64 result = (tv.tv_sec * 1000000ULL) + (tv.tv_nsec * 0.001); // scale to microseconds return result; diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index 01a4f7b7..c0589646 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -143,10 +143,13 @@ QT_BEGIN_NAMESPACE \sa QList, qoutputrange, QSensor::outputRanges */ -// A bit of a hack to call qRegisterMetaType when the library is loaded. -static int qrange_id = qRegisterMetaType("qrange"); -static int qrangelist_id = qRegisterMetaType("qrangelist"); -static int qoutputrangelist_id = qRegisterMetaType("qoutputrangelist"); +static void registerTypes() +{ + qRegisterMetaType("qrange"); + qRegisterMetaType("qrangelist"); + qRegisterMetaType("qoutputrangelist"); +} +Q_CONSTRUCTOR_FUNCTION(registerTypes) // ===================================================================== diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index 74ca40c2..b8704114 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -107,7 +107,7 @@ Q_SIGNALS: void returnDoubleTapEventsChanged(bool returnDoubleTapEvents); private: - Q_DECLARE_PRIVATE(QTapSensor); + Q_DECLARE_PRIVATE(QTapSensor) Q_DISABLE_COPY(QTapSensor) }; -- cgit v1.2.3