Skip to content

Commit

Permalink
[sensorfw] Remove unnecessary plugin.json.
Browse files Browse the repository at this point in the history
The metadata in FILE is optional. Omitting it won't harm anything.
  • Loading branch information
rburchell committed Jun 13, 2013
1 parent 2250f12 commit 1d8d00d
Show file tree
Hide file tree
Showing 87 changed files with 42 additions and 87 deletions.
2 changes: 1 addition & 1 deletion adaptors/accelerometeradaptor/accelerometeradaptorplugin.h
Expand Up @@ -31,7 +31,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/accelerometeradaptor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h
Expand Up @@ -37,7 +37,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/alsadaptor-ascii/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h
Expand Up @@ -32,7 +32,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
Expand Down
1 change: 0 additions & 1 deletion adaptors/alsadaptor-sysfs/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/alsadaptor/alsadaptorplugin.h
Expand Up @@ -31,7 +31,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/alsadaptor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h
Expand Up @@ -32,7 +32,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/gyroscopeadaptor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/kbslideradaptor/kbslideradaptorplugin.h
Expand Up @@ -31,7 +31,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/kbslideradaptor/plugin.json

This file was deleted.

1 change: 0 additions & 1 deletion adaptors/magnetometeradaptor-ascii/plugin.json

This file was deleted.

1 change: 0 additions & 1 deletion adaptors/magnetometeradaptor-ncdk/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/magnetometeradaptor/magnetometeradaptorplugin.h
Expand Up @@ -31,7 +31,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/magnetometeradaptor/plugin.json

This file was deleted.

Expand Up @@ -30,7 +30,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/mrstaccelerometer/plugin.json

This file was deleted.

Expand Up @@ -6,7 +6,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/oaktrailaccelerometer/plugin.json

This file was deleted.

Expand Up @@ -6,7 +6,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
Expand Down
1 change: 0 additions & 1 deletion adaptors/oemtabletaccelerometer/plugin.json

This file was deleted.

Expand Up @@ -6,7 +6,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/oemtabletalsadaptor-ascii/plugin.json

This file was deleted.

Expand Up @@ -6,7 +6,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/oemtabletgyroscopeadaptor/plugin.json

This file was deleted.

Expand Up @@ -6,7 +6,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/oemtabletmagnetometeradaptor/plugin.json

This file was deleted.

Expand Up @@ -6,7 +6,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/pegatronaccelerometeradaptor/plugin.json

This file was deleted.

1 change: 0 additions & 1 deletion adaptors/proximityadaptor-ascii/plugin.json

This file was deleted.

Expand Up @@ -36,7 +36,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/proximityadaptor-evdev/plugin.json

This file was deleted.

Expand Up @@ -32,7 +32,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/proximityadaptor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/proximityadaptor/proximityadaptorplugin.h
Expand Up @@ -32,7 +32,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/steaccelerometeradaptor/plugin.json

This file was deleted.

Expand Up @@ -6,7 +6,7 @@
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")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/tapadaptor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/tapadaptor/tapadaptorplugin.h
Expand Up @@ -31,7 +31,7 @@
class TapAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion adaptors/touchadaptor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion adaptors/touchadaptor/touchadaptorplugin.h
Expand Up @@ -31,7 +31,7 @@
class TouchAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
2 changes: 1 addition & 1 deletion chains/accelerometerchain/accelerometerchainplugin.h
Expand Up @@ -31,7 +31,7 @@
class AccelerometerChainPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
Expand Down
1 change: 0 additions & 1 deletion chains/accelerometerchain/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion chains/orientationchain/orientationchainplugin.h
Expand Up @@ -31,7 +31,7 @@
class OrientationChainPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion chains/orientationchain/plugin.json

This file was deleted.

1 change: 0 additions & 1 deletion core/plugin.json

This file was deleted.

1 change: 0 additions & 1 deletion examples/adaptorplugin/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion examples/adaptorplugin/sampleadaptorplugin.h
Expand Up @@ -31,7 +31,7 @@
class SampleAdaptorPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion examples/chainplugin/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion examples/chainplugin/samplechainplugin.h
Expand Up @@ -31,7 +31,7 @@
class SampleChainPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion examples/filterplugin/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion examples/filterplugin/samplefilterplugin.h
Expand Up @@ -31,7 +31,7 @@
class SampleFilterPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion examples/sensorplugin/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion examples/sensorplugin/sampleplugin.h
Expand Up @@ -31,7 +31,7 @@
class SamplePlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
Expand Up @@ -31,7 +31,7 @@
class CoordinateAlignFilterPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion filters/coordinatealignfilter/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion filters/declinationfilter/declinationfilterplugin.h
Expand Up @@ -31,7 +31,7 @@
class DeclinationFilterPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion filters/declinationfilter/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion filters/downsamplefilter/downsamplefilterplugin.h
Expand Up @@ -31,7 +31,7 @@
class DownsampleFilterPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion filters/downsamplefilter/plugin.json

This file was deleted.

Expand Up @@ -31,7 +31,7 @@
class OrientationInterpreterPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion filters/orientationinterpreter/plugin.json

This file was deleted.

1 change: 0 additions & 1 deletion filters/rotationfilter/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion filters/rotationfilter/rotationfilterplugin.h
Expand Up @@ -31,7 +31,7 @@
class RotationFilterPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
2 changes: 1 addition & 1 deletion sensors/accelerometersensor/accelerometerplugin.h
Expand Up @@ -31,7 +31,7 @@
class AccelerometerPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif

private:
Expand Down
1 change: 0 additions & 1 deletion sensors/accelerometersensor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion sensors/alssensor/alsplugin.h
Expand Up @@ -31,7 +31,7 @@
class ALSPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion sensors/alssensor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion sensors/compasssensor/compassplugin.h
Expand Up @@ -31,7 +31,7 @@
class CompassPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down
1 change: 0 additions & 1 deletion sensors/compasssensor/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion sensors/contextplugin/contextplugin.h
Expand Up @@ -30,7 +30,7 @@
class ContextPlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
public:
static int getSessionId();
Expand Down
1 change: 0 additions & 1 deletion sensors/contextplugin/plugin.json

This file was deleted.

2 changes: 1 addition & 1 deletion sensors/gyroscopesensor/gyroscopeplugin.h
Expand Up @@ -32,7 +32,7 @@
class GyroscopePlugin : public Plugin
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
Expand Down

0 comments on commit 1d8d00d

Please sign in to comment.