Cleanup the C++ plugin implementation

Change-Id: Icf67d7d4804fa1d0a4ea8cbd2c982f1385c437d3
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

4 files changed, 14 insertions, 69 deletions

diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 50c8fe69..9a0d341e 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include "plugin_p.h"
 #include "qtaction_p.h"
 #include "qtexclusivegroup_p.h"
 #include "qtmenu_p.h"
@@ -75,7 +74,17 @@ public:
     }
 };
 
-void StylePlugin::registerTypes(const char *uri)
+class QtQuickControlsPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+
+void QtQuickControlsPlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<QtAction>(uri, 1, 0, "Action");
     qmlRegisterType<QtExclusiveGroup>(uri, 1, 0, "ExclusiveGroup");
@@ -91,10 +100,12 @@ void StylePlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<QtStack>(uri, 1, 0, "Stack", QLatin1String("Do not create objects of type Stack"));
 }
 
-void StylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(uri);
     engine->addImageProvider("desktoptheme", new DesktopIconProvider);
 }
 
 QT_END_NAMESPACE
+
+#include "plugin.moc"
diff --git a/src/controls/plugin.json b/src/controls/plugin.json
deleted file mode 100644
index 0967ef42..00000000
--- a/src/controls/plugin.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/src/controls/plugin.pri b/src/controls/plugin.pri
index 82f42ea3..466afcb3 100644
--- a/src/controls/plugin.pri
+++ b/src/controls/plugin.pri
@@ -1,5 +1,4 @@
 HEADERS += \
-    $$PWD/plugin_p.h \
     $$PWD/qtaction_p.h \
     $$PWD/qtexclusivegroup_p.h \
     $$PWD/qtmenu_p.h \
@@ -18,6 +17,3 @@ SOURCES += \
     $$PWD/qtmenuitem.cpp \
     $$PWD/qtmenupopupwindow.cpp \
     $$PWD/qtstack.cpp
-
-OTHER_FILES += \
-    $$PWD/plugin.json
diff --git a/src/controls/plugin_p.h b/src/controls/plugin_p.h
deleted file mode 100644
index 53b47d16..00000000
--- a/src/controls/plugin_p.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, 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, Digia gives you certain additional
-** rights.  These rights are described in the Digia 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.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSTYLEPLUGIN_P_H
-#define QSTYLEPLUGIN_P_H
-
-#include <QtQml/qqmlextensionplugin.h>
-#include <QtQml/qqmlengine.h>
-
-QT_BEGIN_NAMESPACE
-
-class StylePlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtquickcontrols.QQmlExtensionInterface" FILE "plugin.json")
-public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
-};
-
-QT_END_NAMESPACE
-
-#endif // QSTYLEPLUGIN_P_H