Remove REGISTER_STATIC_PLUGIN_V2

This was never officially part of the public API. Remove it from
public headers so that it is not accidentally used.

This macro cannot be used with the new Qt plugins.

There are 2 unit tests that use this mechanism and for this reason,
loading of static, legacy plugins will continue but they will use
internal logic to achieve this rather than a macro defined in a
public header.

Change-Id: I3fadcc1ca5c22ea0fc3660584ddba28271d18a89
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>

4 files changed, 16 insertions, 90 deletions

diff --git a/src/sensors/gestures/qsensorgesturemanager.h b/src/sensors/gestures/qsensorgesturemanager.h
index 7b9e4896..c6d8f1e3 100644
--- a/src/sensors/gestures/qsensorgesturemanager.h
+++ b/src/sensors/gestures/qsensorgesturemanager.h
@@ -47,7 +47,6 @@
 
 #include "qsensorgesture.h"
 #include "qsensorgesturerecognizer.h"
-#include <QtSensors/qsensorplugindefs.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/sensors/qsensormanager.h b/src/sensors/qsensormanager.h
index 48a2ed46..f23f9e7e 100644
--- a/src/sensors/qsensormanager.h
+++ b/src/sensors/qsensormanager.h
@@ -43,7 +43,6 @@
 #define QSENSORMANAGER_H
 
 #include "qsensor.h"
-#include "qsensorplugindefs.h"
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
@@ -80,6 +79,21 @@ protected:
     ~QSensorBackendFactory() {}
 };
 
+// Static plugins have their own registration methods.
+// They can only register types. They cannot use the changes interface.
+#define REGISTER_STATIC_PLUGIN(pluginname) \
+    static QSensorPluginInterface *create_static_plugin_ ## pluginname()\
+    {\
+        return new pluginname;\
+    }\
+    static bool side_effect_sensor_backend_ ## pluginname ()\
+    {\
+        QSensorManager::registerStaticPlugin(create_static_plugin_ ## pluginname);\
+        return false;\
+    }\
+    /* This assignment calls the function above */\
+    static bool dummy_sensor_backend_ ## pluginname = side_effect_sensor_backend_ ## pluginname();
+
 QT_END_NAMESPACE
 QT_END_HEADER
 
diff --git a/src/sensors/qsensorplugindefs.h b/src/sensors/qsensorplugindefs.h
deleted file mode 100644
index b9173b14..00000000
--- a/src/sensors/qsensorplugindefs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSENSORPLUGINDEFS_H
-#define QSENSORPLUGINDEFS_H
-
-#include <QtCore/qplugin.h>
-
-// The default is for legacy static plugins
-// This will change to Qt-style static plugins in 1.3
-#define REGISTER_STATIC_PLUGIN(pluginname) \
-        REGISTER_STATIC_PLUGIN_V1(pluginname)
-
-// Legacy static plugins have their own registration methods.
-// They can only register types. They cannot use the changes interface.
-#define REGISTER_STATIC_PLUGIN_V1(pluginname) \
-    static QSensorPluginInterface *create_static_plugin_ ## pluginname()\
-    {\
-        return new pluginname;\
-    }\
-    static bool side_effect_sensor_backend_ ## pluginname ()\
-    {\
-        QSensorManager::registerStaticPlugin(create_static_plugin_ ## pluginname);\
-        return false;\
-    }\
-    /* This assignment calls the function above */\
-    static bool dummy_sensor_backend_ ## pluginname = side_effect_sensor_backend_ ## pluginname();
-
-// Qt-style static plugins use macros from Qt.
-// They are handled just like regular plugins.
-// FIXME remove the ifdef and else case once everyone is using the new qtbase
-#ifdef QT_MOC_EXPORT_PLUGIN
-#define REGISTER_STATIC_PLUGIN_V2(pluginname) \
-    static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance() \
-    Q_PLUGIN_INSTANCE(pluginname) \
-    const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_##pluginname() { \
-        QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, 0 }; \
-        return plugin; \
-    }\
-    Q_IMPORT_PLUGIN(pluginname)
-#else
-#define REGISTER_STATIC_PLUGIN_V2(pluginname) \
-    QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##pluginname() Q_PLUGIN_INSTANCE(pluginname)\
-    Q_IMPORT_PLUGIN(pluginname)
-#endif
-
-
-#endif
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index 0f918697..02d38cf2 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -14,8 +14,7 @@ QT = core core-private
 DEFINES += QT_BUILD_SENSORS_LIB QT_MAKEDLL
 
 load(qt_module_config)
-HEADERS += qtsensorsversion.h \
-    qsensorplugindefs.h
+HEADERS += qtsensorsversion.h
 
 
 symbian {