summaryrefslogtreecommitdiffstats
path: root/src/sensors/qsensor.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-04-01 23:08:54 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-03 20:19:45 +0200
commit4c011aad53026775e25668e0fc1c2fedf2f181d8 (patch)
tree24dcccc5b8e6144c9abfdd9f57a2d6003d4640e5 /src/sensors/qsensor.cpp
parenta30762eacb5a813c36b5b87a04dca076e096f7a0 (diff)
Fix warnings in qtsensors
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 <paul.tvete@digia.com>
Diffstat (limited to 'src/sensors/qsensor.cpp')
-rw-r--r--src/sensors/qsensor.cpp11
1 files changed, 7 insertions, 4 deletions
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>("qrange");
-static int qrangelist_id = qRegisterMetaType<qrangelist>("qrangelist");
-static int qoutputrangelist_id = qRegisterMetaType<qoutputrangelist>("qoutputrangelist");
+static void registerTypes()
+{
+ qRegisterMetaType<qrange>("qrange");
+ qRegisterMetaType<qrangelist>("qrangelist");
+ qRegisterMetaType<qoutputrangelist>("qoutputrangelist");
+}
+Q_CONSTRUCTOR_FUNCTION(registerTypes)
// =====================================================================