diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-22 14:43:41 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 08:36:40 +0100 |
| commit | 2c46fea5848ffdfef2a21d01076625a6f2e547bd (patch) | |
| tree | 5a62278890b5f90a64e4e87edee64f53010a25f6 | |
| parent | d03033a2a4ba45f4b47fbf36ec84b13d4718ef24 (diff) | |
Remove compile warnings
Change-Id: Ie98d22db40fb38742c3cd1fb0ae44fe1c0bbf2ec
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
| -rw-r--r-- | src/sensors/qsensormanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index 72273806..380f8aa0 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -66,11 +66,11 @@ public: Loaded }; QSensorManagerPrivate() - : pluginLoadingState(NotLoaded) + : loadExternalPlugins(true) + , pluginLoadingState(NotLoaded) , loader(new QFactoryLoader("com.nokia.Qt.QSensorPluginInterface/1.0", QLatin1String("/sensors"))) , defaultIdentifierForTypeLoaded(false) , sensorsChanged(false) - , loadExternalPlugins(true) { QByteArray env = qgetenv("QT_SENSORS_LOAD_PLUGINS"); if (env == "0") { @@ -421,7 +421,7 @@ QByteArray QSensor::defaultSensorForType(const QByteArray &type) if (!d->defaultIdentifierForTypeLoaded) { d->defaultIdentifierForTypeLoaded = true; QStringList abspath = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation); - QString cfgpath = ""; + QString cfgpath; //first in the list is user specific, so ignore it and take the last if (abspath.length() > 0) { cfgpath = abspath[abspath.count() - 1]; @@ -431,7 +431,7 @@ QByteArray QSensor::defaultSensorForType(const QByteArray &type) if (cfgfile.open(QFile::ReadOnly)){ //Read the sensor default setting file QTextStream stream(&cfgfile); - QString line = ""; + QString line; bool isconfig = false; while (!stream.atEnd()) { line = stream.readLine(); |