Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
make this compile with qt5
  • Loading branch information
Lorn Potter committed Apr 12, 2013
1 parent 8517c35 commit fd116bc
Show file tree
Hide file tree
Showing 164 changed files with 1,160 additions and 36 deletions.
2 changes: 2 additions & 0 deletions adaptors/accelerometeradaptor/accelerometeradaptorplugin.cpp
Expand Up @@ -35,4 +35,6 @@ void AccelerometerAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<AccelerometerAdaptor>("accelerometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(accelerometeradaptor, AccelerometerAdaptorPlugin)
#endif
3 changes: 3 additions & 0 deletions adaptors/accelerometeradaptor/accelerometeradaptorplugin.h
Expand Up @@ -30,6 +30,9 @@

class AccelerometerAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/accelerometeradaptor/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 2 additions & 0 deletions adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.cpp
Expand Up @@ -40,4 +40,6 @@ void ALSAdaptorAsciiPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<ALSAdaptorAscii>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorAsciiPlugin)
#endif
3 changes: 3 additions & 0 deletions adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h
Expand Up @@ -36,6 +36,9 @@

class ALSAdaptorAsciiPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/alsadaptor-ascii/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 2 additions & 0 deletions adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.cpp
Expand Up @@ -36,4 +36,6 @@ void ALSAdaptorSysfsPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<ALSAdaptorSysfs>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor-sysfs, ALSAdaptorSysfsPlugin)
#endif
4 changes: 4 additions & 0 deletions adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h
Expand Up @@ -31,6 +31,10 @@

class ALSAdaptorSysfsPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif

private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/alsadaptor-sysfs/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 1 addition & 1 deletion adaptors/alsadaptor/alsadaptor.pro
Expand Up @@ -8,6 +8,6 @@ SOURCES += alsadaptor.cpp \

include( ../adaptor-config.pri )

!mce_disable {
mce {
DEFINES += SENSORFW_MCE_WATCHER
}
2 changes: 2 additions & 0 deletions adaptors/alsadaptor/alsadaptorplugin.cpp
Expand Up @@ -35,4 +35,6 @@ void ALSAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<ALSAdaptor>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorPlugin)
#endif
3 changes: 3 additions & 0 deletions adaptors/alsadaptor/alsadaptorplugin.h
Expand Up @@ -30,6 +30,9 @@

class ALSAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/alsadaptor/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 2 additions & 0 deletions adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.cpp
Expand Up @@ -35,4 +35,6 @@ void GyroscopeAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<GyroscopeAdaptor>("gyroscopeadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(gyroscopeadaptor, GyroscopeAdaptorPlugin)
#endif
3 changes: 3 additions & 0 deletions adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h
Expand Up @@ -31,6 +31,9 @@

class GyroscopeAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/gyroscopeadaptor/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 2 additions & 0 deletions adaptors/kbslideradaptor/kbslideradaptorplugin.cpp
Expand Up @@ -35,4 +35,6 @@ void KeyboardSliderAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<KeyboardSliderAdaptor>("kbslideradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(kbslideradaptor, KeyboardSliderAdaptorPlugin)
#endif
3 changes: 3 additions & 0 deletions adaptors/kbslideradaptor/kbslideradaptorplugin.h
Expand Up @@ -30,6 +30,9 @@

class KeyboardSliderAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/kbslideradaptor/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -39,4 +39,6 @@ void MagnetometerAdaptorAsciiPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<MagnetometerAdaptorAscii>("magnetometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorAsciiPlugin)
#endif
1 change: 1 addition & 0 deletions adaptors/magnetometeradaptor-ascii/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -34,4 +34,6 @@ void MagnetometerAdaptorPluginNCDK::Register(class Loader&)
sm.registerDeviceAdaptor<MagnetometerAdaptorNCDK>("magnetometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPluginNCDK)
#endif
1 change: 1 addition & 0 deletions adaptors/magnetometeradaptor-ncdk/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 2 additions & 0 deletions adaptors/magnetometeradaptor/magnetometeradaptorplugin.cpp
Expand Up @@ -35,4 +35,6 @@ void MagnetometerAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<MagnetometerAdaptor>("magnetometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPlugin)
#endif
3 changes: 3 additions & 0 deletions adaptors/magnetometeradaptor/magnetometeradaptorplugin.h
Expand Up @@ -30,6 +30,9 @@

class MagnetometerAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/magnetometeradaptor/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 2 additions & 0 deletions adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp
Expand Up @@ -34,4 +34,6 @@ void MRSTAccelerometerAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<MRSTAccelAdaptor>("accelerometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(accelerometeradaptor-mrst, MRSTAccelerometerAdaptorPlugin)
#endif
3 changes: 3 additions & 0 deletions adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.h
Expand Up @@ -29,6 +29,9 @@

class MRSTAccelerometerAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/mrstaccelerometer/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -14,7 +14,7 @@ OaktrailAccelAdaptor::OaktrailAccelAdaptor (const QString& id) :
struct stat st;

devPath = Config::configuration ()->value ("oaktrail_acc_sys_path").toString ();
if ( lstat (devPath.toAscii().constData(), &st) < 0 ) {
if ( lstat (devPath.toLatin1().constData(), &st) < 0 ) {
sensordLogW () << devPath << "no found";
return;
}
Expand Down
Expand Up @@ -10,4 +10,6 @@ void OaktrailAccelerometerAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<OaktrailAccelAdaptor>("accelerometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(oaktrailaccelerometeradaptor, OaktrailAccelerometerAdaptorPlugin)
#endif
Expand Up @@ -5,6 +5,9 @@

class OaktrailAccelerometerAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/oaktrailaccelerometer/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -14,7 +14,7 @@ OemtabletAccelAdaptor::OemtabletAccelAdaptor (const QString& id) :
struct stat st;

devPath = Config::configuration ()->value ("oem_tablet_acc_sys_path").toString ();
if ( lstat (devPath.toAscii().constData(), &st) < 0 ) {
if ( lstat (devPath.toLatin1().constData(), &st) < 0 ) {
sensordLogW () << devPath << "no found";
return;
}
Expand Down
Expand Up @@ -10,4 +10,6 @@ void OemtabletAccelerometerAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<OemtabletAccelAdaptor>("accelerometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(oemtabletaccelerometeradaptor, OemtabletAccelerometerAdaptorPlugin)
#endif
Expand Up @@ -5,6 +5,10 @@

class OemtabletAccelerometerAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif

private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/oemtabletaccelerometer/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -9,4 +9,6 @@ void OEMTabletALSAdaptorAsciiPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<OEMTabletALSAdaptorAscii>("alsadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor, OEMTabletALSAdaptorAsciiPlugin)
#endif
Expand Up @@ -5,6 +5,9 @@

class OEMTabletALSAdaptorAsciiPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/oemtabletalsadaptor-ascii/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -5,6 +5,9 @@

class OEMTabletGyroscopeAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/oemtabletgyroscopeadaptor/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -5,6 +5,9 @@

class OemtabletMagnetometerAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/oemtabletmagnetometeradaptor/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -10,4 +10,6 @@ void PegatronAccelerometerAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<PegatronAccelerometerAdaptor>("accelerometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(pegatronaccelerometeradaptor, PegatronAccelerometerAdaptorPlugin)
#endif
Expand Up @@ -5,6 +5,9 @@

class PegatronAccelerometerAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/pegatronaccelerometeradaptor/plugin.json
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions adaptors/proximityadaptor-ascii/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -39,4 +39,6 @@ void ProximityAdaptorAsciiPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<ProximityAdaptorAscii>("proximityadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorAsciiPlugin)
#endif
Expand Up @@ -35,6 +35,9 @@

class ProximityAdaptorAsciiPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/proximityadaptor-evdev/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -36,4 +36,6 @@ void ProximityAdaptorEvdevPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<ProximityAdaptorEvdev>("proximityadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(proximityadaptor-evdev, ProximityAdaptorEvdevPlugin)
#endif
Expand Up @@ -31,6 +31,9 @@

class ProximityAdaptorEvdevPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/proximityadaptor/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 1 addition & 1 deletion adaptors/proximityadaptor/proximityadaptor.pro
Expand Up @@ -8,6 +8,6 @@ SOURCES += proximityadaptor.cpp \

include( ../adaptor-config.pri )

!mce_disable {
mce {
DEFINES += SENSORFW_MCE_WATCHER
}
2 changes: 2 additions & 0 deletions adaptors/proximityadaptor/proximityadaptorplugin.cpp
Expand Up @@ -36,4 +36,6 @@ void ProximityAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<ProximityAdaptor>("proximityadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorPlugin)
#endif
3 changes: 3 additions & 0 deletions adaptors/proximityadaptor/proximityadaptorplugin.h
Expand Up @@ -31,6 +31,9 @@

class ProximityAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/steaccelerometeradaptor/plugin.json
@@ -0,0 +1 @@
{}
Expand Up @@ -10,4 +10,6 @@ void SteAccelerometerAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<SteAccelAdaptor>("accelerometeradaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(steaccelerometeradaptor,SteAccelerometerAdaptorPlugin)
#endif
Expand Up @@ -5,6 +5,9 @@

class SteAccelerometerAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
#endif
private:
void Register(class Loader& l);
};
Expand Down
1 change: 1 addition & 0 deletions adaptors/tapadaptor/plugin.json
@@ -0,0 +1 @@
{}
2 changes: 2 additions & 0 deletions adaptors/tapadaptor/tapadaptorplugin.cpp
Expand Up @@ -35,4 +35,6 @@ void TapAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<TapAdaptor>("tapadaptor");
}

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(tapadaptor, TapAdaptorPlugin)
#endif

0 comments on commit fd116bc

Please sign in to comment.