Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[sensorfw] Remove obsolete Qt4 support. Contributes to JB#38781
Remove not needed pro.user file. Fix a build warning.
Add missing spec files to .pro file.
  • Loading branch information
mlehtima committed Feb 3, 2020
1 parent da05328 commit e71c809
Show file tree
Hide file tree
Showing 171 changed files with 49 additions and 926 deletions.
4 changes: 0 additions & 4 deletions adaptors/accelerometeradaptor/accelerometeradaptorplugin.cpp
Expand Up @@ -34,7 +34,3 @@ void AccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<AccelerometerAdaptor>("accelerometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(accelerometeradaptor, AccelerometerAdaptorPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/accelerometeradaptor/accelerometeradaptorplugin.h
Expand Up @@ -31,9 +31,7 @@
class AccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
Expand Down
4 changes: 0 additions & 4 deletions adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.cpp
Expand Up @@ -39,7 +39,3 @@ void ALSAdaptorAsciiPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorAscii>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorAsciiPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h
Expand Up @@ -37,9 +37,7 @@
class ALSAdaptorAsciiPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
Expand Down
4 changes: 0 additions & 4 deletions adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.cpp
Expand Up @@ -37,7 +37,3 @@ void ALSAdaptorEvdevPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorEvdev>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor-evdev, ALSAdaptorEvdevPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.h
Expand Up @@ -34,9 +34,7 @@
class ALSAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
4 changes: 0 additions & 4 deletions adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.cpp
Expand Up @@ -35,7 +35,3 @@ void ALSAdaptorSysfsPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorSysfs>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor-sysfs, ALSAdaptorSysfsPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h
Expand Up @@ -32,9 +32,7 @@
class ALSAdaptorSysfsPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
4 changes: 0 additions & 4 deletions adaptors/alsadaptor/alsadaptorplugin.cpp
Expand Up @@ -34,7 +34,3 @@ void ALSAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptor>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/alsadaptor/alsadaptorplugin.h
Expand Up @@ -31,9 +31,7 @@
class ALSAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
Expand Down
4 changes: 0 additions & 4 deletions adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.cpp
Expand Up @@ -37,7 +37,3 @@ void GyroAdaptorEvdevPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<GyroAdaptorEvdev>("gyroscopeadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(gyroadaptor-evdev, GyroAdaptorEvdevPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.h
Expand Up @@ -34,9 +34,7 @@
class GyroAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
4 changes: 0 additions & 4 deletions adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.cpp
Expand Up @@ -34,7 +34,3 @@ void GyroscopeAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<GyroscopeAdaptor>("gyroscopeadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(gyroscopeadaptor, GyroscopeAdaptorPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h
Expand Up @@ -32,9 +32,7 @@
class GyroscopeAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
Expand Down
4 changes: 0 additions & 4 deletions adaptors/humidityadaptor/humidityadaptorplugin.cpp
Expand Up @@ -34,7 +34,3 @@ void HumidityAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HumidityAdaptor>("humidityadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(humidityadaptor, HumidityAdaptorPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/humidityadaptor/humidityadaptorplugin.h
Expand Up @@ -31,9 +31,7 @@
class HumidityAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
Expand Up @@ -29,7 +29,3 @@ void HybrisAccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisAccelerometerAdaptor>("accelerometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisaccelerometeradaptor, HybrisAccelerometerAdaptorPlugin)
#endif
Expand Up @@ -26,9 +26,7 @@
class HybrisAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
4 changes: 0 additions & 4 deletions adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.cpp
Expand Up @@ -29,7 +29,3 @@ void HybrisAlsAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisAlsAdaptor>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisalsadaptor, HybrisAlsAdaptorPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.h
Expand Up @@ -26,9 +26,7 @@
class HybrisAlsAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
Expand Up @@ -29,7 +29,3 @@ void HybrisGyroscopeAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisGyroscopeAdaptor>("gyroscopeadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisgyroscopeadaptor, HybrisGyroscopeAdaptorPlugin)
#endif
Expand Up @@ -26,9 +26,7 @@
class HybrisGyroscopeAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
Expand Up @@ -29,7 +29,3 @@ void HybrisMagnetometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisMagnetometerAdaptor>("magnetometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrismagnetometeradaptor, HybrisMagnetometerAdaptorPlugin)
#endif
Expand Up @@ -26,9 +26,7 @@
class HybrisMagnetometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
Expand Up @@ -29,7 +29,3 @@ void HybrisOrientationAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisOrientationAdaptor>("orientationadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisorientationadaptor, HybrisOrientationAdaptorPlugin)
#endif
Expand Up @@ -26,9 +26,7 @@
class HybrisOrientationAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
Expand Up @@ -31,7 +31,3 @@ void HybrisPressureAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisPressureAdaptor>("pressureadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrispressureadaptor, HybrisPressureAdaptorPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.h
Expand Up @@ -28,9 +28,7 @@
class HybrisPressureAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
Expand Up @@ -29,7 +29,3 @@ void HybrisProximityAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisProximityAdaptor>("proximityadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisproximityadaptor, HybrisProximityAdaptorPlugin)
#endif
Expand Up @@ -26,9 +26,7 @@
class HybrisProximityAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
Expand Up @@ -32,7 +32,3 @@ void HybrisStepCounterAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisStepCounterAdaptor>("stepcounteradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisstepcounteradaptor, HybrisStepCounterAdaptorPlugin)
#endif
Expand Up @@ -29,9 +29,7 @@
class HybrisStepCounterAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
4 changes: 0 additions & 4 deletions adaptors/iioadaptor/iioadaptorplugin.cpp
Expand Up @@ -38,7 +38,3 @@ void IioAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<IioAdaptor>("alsadaptor");
sm.registerDeviceAdaptor<IioAdaptor>("proximityadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(iioadaptor, IioAdaptorPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/iioadaptor/iioadaptorplugin.h
Expand Up @@ -32,9 +32,7 @@ r <lorn.potter@canonical.com>
class IioAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
void Register(class Loader& l);
Expand Down
4 changes: 0 additions & 4 deletions adaptors/kbslideradaptor/kbslideradaptorplugin.cpp
Expand Up @@ -34,7 +34,3 @@ void KeyboardSliderAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<KeyboardSliderAdaptor>("kbslideradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(kbslideradaptor, KeyboardSliderAdaptorPlugin)
#endif
2 changes: 0 additions & 2 deletions adaptors/kbslideradaptor/kbslideradaptorplugin.h
Expand Up @@ -31,9 +31,7 @@
class KeyboardSliderAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
Expand Down

0 comments on commit e71c809

Please sign in to comment.