From 21790a7e8bada37ab356473d3cb65f0cf112d8bd Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Mon, 3 Sep 2012 12:44:27 +0200
Subject: [PATCH] QmlDesigner: Remove WidgetPluginManagerPrivate

Change-Id: Ibe3352dff9d620656ca4279d67e1e622a3e4dd41
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
 .../pluginmanager/widgetpluginmanager.cpp     | 26 +++++--------------
 .../pluginmanager/widgetpluginmanager.h       |  9 ++++---
 .../pluginmanager/widgetpluginpath.cpp        |  2 +-
 .../pluginmanager/widgetpluginpath.h          |  5 ++--
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
index e01c5114b70..ebad04d28a1 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
@@ -29,7 +29,6 @@
 **************************************************************************/
 
 #include "widgetpluginmanager.h"
-#include "widgetpluginpath.h"
 #include <iwidgetplugin.h>
 
 #include <QCoreApplication>
@@ -52,30 +51,17 @@ namespace QmlDesigner {
 
 namespace Internal {
 
-// ---- PluginManager[Private]
-class WidgetPluginManagerPrivate {
-public:
-    typedef QList<WidgetPluginPath> PluginPathList;
-    PluginPathList m_paths;
-};
-
-WidgetPluginManager::WidgetPluginManager() :
-        d(new WidgetPluginManagerPrivate)
+WidgetPluginManager::WidgetPluginManager()
 {
 }
 
-WidgetPluginManager::~WidgetPluginManager()
-{
-    delete d;
-}
-
 WidgetPluginManager::IWidgetPluginList WidgetPluginManager::instances()
 {
     if (debug)
         qDebug() << '>' << Q_FUNC_INFO << QLibraryInfo::buildKey();
     IWidgetPluginList rc;
-    const WidgetPluginManagerPrivate::PluginPathList::iterator end = d->m_paths.end();
-    for (WidgetPluginManagerPrivate::PluginPathList::iterator it = d->m_paths.begin(); it != end; ++it)
+    const PluginPathList::iterator end = m_paths.end();
+    for (PluginPathList::iterator it = m_paths.begin(); it != end; ++it)
         it->getInstances(&rc);
     if (debug)
         qDebug() << '<' << Q_FUNC_INFO << rc.size();
@@ -87,15 +73,15 @@ bool WidgetPluginManager::addPath(const QString &path)
     const QDir dir(path);
     if (!dir.exists())
         return false;
-    d->m_paths.push_back(WidgetPluginPath(dir));
+    m_paths.push_back(WidgetPluginPath(dir));
     return true;
 }
 
 QAbstractItemModel *WidgetPluginManager::createModel(QObject *parent)
 {
     QStandardItemModel *model = new QStandardItemModel(parent);
-    const WidgetPluginManagerPrivate::PluginPathList::iterator end = d->m_paths.end();
-    for (WidgetPluginManagerPrivate::PluginPathList::iterator it = d->m_paths.begin(); it != end; ++it)
+    const PluginPathList::iterator end = m_paths.end();
+    for (PluginPathList::iterator it = m_paths.begin(); it != end; ++it)
         model->appendRow(it->createModelItem());
     return model;
 }
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h
index cdc231c24e8..1bcfdd93aa8 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h
@@ -34,6 +34,9 @@
 #include <QObject>
 #include <QList>
 
+#include "widgetpluginpath.h"
+
+
 QT_BEGIN_NAMESPACE
 class QString;
 class QAbstractItemModel;
@@ -45,8 +48,6 @@ class IWidgetPlugin;
 
 namespace Internal {
 
-class WidgetPluginManagerPrivate;
-
 // PluginManager: Loads the plugin libraries on demand "as lazy as
 // possible", that is, directories are scanned and
 // instances are created only when  instances() is called.
@@ -54,11 +55,11 @@ class WidgetPluginManagerPrivate;
 class WidgetPluginManager
 {
     Q_DISABLE_COPY(WidgetPluginManager)
+    typedef QList<WidgetPluginPath> PluginPathList;
 public:
     typedef QList<IWidgetPlugin *> IWidgetPluginList;
 
     WidgetPluginManager();
-    ~WidgetPluginManager();
 
     bool addPath(const QString &path);
 
@@ -69,7 +70,7 @@ public:
     QAbstractItemModel *createModel(QObject *parent = 0);
 
 private:
-    WidgetPluginManagerPrivate *d;
+    PluginPathList m_paths;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
index 48fe0616a3f..a4d1f40fe24 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
@@ -173,7 +173,7 @@ void WidgetPluginPath::ensureLoaded()
     }
 }
 
-void WidgetPluginPath::getInstances(WidgetPluginManager::IWidgetPluginList *list)
+void WidgetPluginPath::getInstances(IWidgetPluginList *list)
 {
     ensureLoaded();
     // Compile list of instances
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h
index ae1fe1c10a3..b443f881bcc 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h
@@ -31,8 +31,6 @@
 #ifndef WIDGETPLUGINPATH_H
 #define WIDGETPLUGINPATH_H
 
-#include "widgetpluginmanager.h"
-
 #include <QObject>
 #include <QWeakPointer>
 #include <QList>
@@ -74,11 +72,12 @@ struct WidgetPluginData {
 // IPlugins.
 
 class WidgetPluginPath {
+    typedef QList<IWidgetPlugin *> IWidgetPluginList;
 public:
     explicit WidgetPluginPath(const QDir &path);
 
 
-    void getInstances(WidgetPluginManager::IWidgetPluginList *list);
+    void getInstances(IWidgetPluginList *list);
 
     QDir path() const { return m_path; }