summaryrefslogtreecommitdiff
path: root/src/libs/extensionsystem
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/extensionsystem')
-rw-r--r--src/libs/extensionsystem/extensionsystem.pro1
-rw-r--r--src/libs/extensionsystem/extensionsystem.qbs3
-rw-r--r--src/libs/extensionsystem/iplugin.cpp9
-rw-r--r--src/libs/extensionsystem/iplugin.h15
-rw-r--r--src/libs/extensionsystem/pluginerroroverview.cpp14
-rw-r--r--src/libs/extensionsystem/pluginerroroverview.h2
-rw-r--r--src/libs/extensionsystem/pluginmanager.cpp98
-rw-r--r--src/libs/extensionsystem/pluginmanager.h62
-rw-r--r--src/libs/extensionsystem/pluginview.cpp12
-rw-r--r--src/libs/extensionsystem/pluginview.h4
-rw-r--r--src/libs/extensionsystem/pluginview_p.h51
11 files changed, 114 insertions, 157 deletions
diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro
index 9a0937742f..13e1f39809 100644
--- a/src/libs/extensionsystem/extensionsystem.pro
+++ b/src/libs/extensionsystem/extensionsystem.pro
@@ -23,7 +23,6 @@ HEADERS += pluginerrorview.h \
pluginspec.h \
pluginspec_p.h \
pluginview.h \
- pluginview_p.h \
optionsparser.h \
plugincollection.h \
pluginerroroverview.h
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 13125b6651..3c36c327bb 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -14,7 +14,7 @@ QtcLibrary {
]
Depends { name: "cpp" }
- Depends { name: "Qt"; submodules: ["core", "gui"] }
+ Depends { name: "Qt"; submodules: ["core", "widgets"] }
Depends { name: "Aggregation" }
files: [
@@ -46,7 +46,6 @@ QtcLibrary {
"pluginspec_p.h",
"pluginview.cpp",
"pluginview.h",
- "pluginview_p.h",
"pluginspec.cpp",
"images/error.png",
"images/notloaded.png",
diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp
index e6ee6e4a6b..0817e1efc8 100644
--- a/src/libs/extensionsystem/iplugin.cpp
+++ b/src/libs/extensionsystem/iplugin.cpp
@@ -185,9 +185,8 @@ IPlugin::IPlugin()
*/
IPlugin::~IPlugin()
{
- PluginManager *pm = PluginManager::instance();
foreach (QObject *obj, d->addedObjectsInReverseOrder)
- pm->removeObject(obj);
+ PluginManager::removeObject(obj);
qDeleteAll(d->addedObjectsInReverseOrder);
d->addedObjectsInReverseOrder.clear();
delete d;
@@ -211,7 +210,7 @@ PluginSpec *IPlugin::pluginSpec() const
*/
void IPlugin::addObject(QObject *obj)
{
- PluginManager::instance()->addObject(obj);
+ PluginManager::addObject(obj);
}
/*!
@@ -227,7 +226,7 @@ void IPlugin::addObject(QObject *obj)
void IPlugin::addAutoReleasedObject(QObject *obj)
{
d->addedObjectsInReverseOrder.prepend(obj);
- PluginManager::instance()->addObject(obj);
+ PluginManager::addObject(obj);
}
/*!
@@ -237,6 +236,6 @@ void IPlugin::addAutoReleasedObject(QObject *obj)
*/
void IPlugin::removeObject(QObject *obj)
{
- PluginManager::instance()->removeObject(obj);
+ PluginManager::removeObject(obj);
}
diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h
index 37f474a09c..598eef9aab 100644
--- a/src/libs/extensionsystem/iplugin.h
+++ b/src/libs/extensionsystem/iplugin.h
@@ -36,6 +36,9 @@
#include "extensionsystem_global.h"
#include <QObject>
+#if QT_VERSION >= 0x050000
+# include <QtPlugin>
+#endif
namespace ExtensionSystem {
@@ -83,4 +86,16 @@ private:
} // namespace ExtensionSystem
+// The macros Q_EXPORT_PLUGIN, Q_EXPORT_PLUGIN2 become obsolete in Qt 5.
+#if QT_VERSION >= 0x050000
+# if defined(Q_EXPORT_PLUGIN)
+# undef Q_EXPORT_PLUGIN
+# undef Q_EXPORT_PLUGIN2
+# endif
+# define Q_EXPORT_PLUGIN(plugin)
+# define Q_EXPORT_PLUGIN2(function, plugin)
+#else
+# define Q_PLUGIN_METADATA(x)
+#endif
+
#endif // IPLUGIN_H
diff --git a/src/libs/extensionsystem/pluginerroroverview.cpp b/src/libs/extensionsystem/pluginerroroverview.cpp
index ad87241603..1d65f52dc5 100644
--- a/src/libs/extensionsystem/pluginerroroverview.cpp
+++ b/src/libs/extensionsystem/pluginerroroverview.cpp
@@ -44,7 +44,7 @@ class PluginErrorOverviewPrivate : public QObject
{
Q_OBJECT
public:
- PluginErrorOverviewPrivate(PluginManager *manager, QDialog *dialog);
+ PluginErrorOverviewPrivate(QDialog *dialog);
~PluginErrorOverviewPrivate();
private slots:
@@ -52,7 +52,6 @@ private slots:
private:
Ui::PluginErrorOverview *m_ui;
- PluginManager *m_manager;
};
} // Internal
@@ -61,9 +60,9 @@ private:
using namespace ExtensionSystem;
using namespace ExtensionSystem::Internal;
-PluginErrorOverview::PluginErrorOverview(PluginManager *manager, QWidget *parent) :
+PluginErrorOverview::PluginErrorOverview(QWidget *parent) :
QDialog(parent),
- d(new PluginErrorOverviewPrivate(manager, this))
+ d(new PluginErrorOverviewPrivate(this))
{
}
@@ -72,14 +71,13 @@ PluginErrorOverview::~PluginErrorOverview()
delete d;
}
-PluginErrorOverviewPrivate::PluginErrorOverviewPrivate(PluginManager *manager, QDialog *dialog)
- : m_ui(new Ui::PluginErrorOverview),
- m_manager(manager)
+PluginErrorOverviewPrivate::PluginErrorOverviewPrivate(QDialog *dialog)
+ : m_ui(new Ui::PluginErrorOverview)
{
m_ui->setupUi(dialog);
m_ui->buttonBox->addButton(tr("Continue"), QDialogButtonBox::AcceptRole);
- foreach (PluginSpec *spec, m_manager->plugins()) {
+ foreach (PluginSpec *spec, PluginManager::plugins()) {
// only show errors on startup if plugin is enabled.
if (spec->hasError() && spec->isEnabled() && !spec->isDisabledIndirectly()) {
QListWidgetItem *item = new QListWidgetItem(spec->name());
diff --git a/src/libs/extensionsystem/pluginerroroverview.h b/src/libs/extensionsystem/pluginerroroverview.h
index 148b67bed3..4e65335b0f 100644
--- a/src/libs/extensionsystem/pluginerroroverview.h
+++ b/src/libs/extensionsystem/pluginerroroverview.h
@@ -50,7 +50,7 @@ class EXTENSIONSYSTEM_EXPORT PluginErrorOverview : public QDialog
Q_OBJECT
public:
- explicit PluginErrorOverview(PluginManager *manager, QWidget *parent = 0);
+ explicit PluginErrorOverview(QWidget *parent = 0);
~PluginErrorOverview();
private:
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index e3164f0412..e8a90249f1 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -290,7 +290,7 @@ PluginManager::~PluginManager()
*/
void PluginManager::addObject(QObject *obj)
{
- d->addObject(obj);
+ m_instance->d->addObject(obj);
}
/*!
@@ -300,7 +300,7 @@ void PluginManager::addObject(QObject *obj)
*/
void PluginManager::removeObject(QObject *obj)
{
- d->removeObject(obj);
+ m_instance->d->removeObject(obj);
}
/*!
@@ -310,9 +310,9 @@ void PluginManager::removeObject(QObject *obj)
\sa PluginManager::getObject()
\sa PluginManager::getObjects()
*/
-QList<QObject *> PluginManager::allObjects() const
+QList<QObject *> PluginManager::allObjects()
{
- return d->allObjects;
+ return m_instance->d->allObjects;
}
/*!
@@ -326,7 +326,7 @@ QList<QObject *> PluginManager::allObjects() const
*/
void PluginManager::loadPlugins()
{
- return d->loadPlugins();
+ return m_instance->d->loadPlugins();
}
/*!
@@ -334,7 +334,7 @@ void PluginManager::loadPlugins()
Returns true if any plugin has errors even though it is enabled.
Most useful to call after loadPlugins().
*/
-bool PluginManager::hasError() const
+bool PluginManager::hasError()
{
foreach (PluginSpec *spec, plugins()) {
// only show errors on startup if plugin is enabled.
@@ -360,9 +360,9 @@ void PluginManager::shutdown()
\sa setPluginPaths()
*/
-QStringList PluginManager::pluginPaths() const
+QStringList PluginManager::pluginPaths()
{
- return d->pluginPaths;
+ return m_instance->d->pluginPaths;
}
/*!
@@ -376,7 +376,7 @@ QStringList PluginManager::pluginPaths() const
*/
void PluginManager::setPluginPaths(const QStringList &paths)
{
- d->setPluginPaths(paths);
+ m_instance->d->setPluginPaths(paths);
}
/*!
@@ -386,9 +386,9 @@ void PluginManager::setPluginPaths(const QStringList &paths)
\sa setFileExtension()
*/
-QString PluginManager::fileExtension() const
+QString PluginManager::fileExtension()
{
- return d->extension;
+ return m_instance->d->extension;
}
/*!
@@ -400,7 +400,7 @@ QString PluginManager::fileExtension() const
*/
void PluginManager::setFileExtension(const QString &extension)
{
- d->extension = extension;
+ m_instance->d->extension = extension;
}
/*!
@@ -409,7 +409,7 @@ void PluginManager::setFileExtension(const QString &extension)
*/
void PluginManager::setSettings(QSettings *settings)
{
- d->setSettings(settings);
+ m_instance->d->setSettings(settings);
}
/*!
@@ -418,28 +418,28 @@ void PluginManager::setSettings(QSettings *settings)
*/
void PluginManager::setGlobalSettings(QSettings *settings)
{
- d->setGlobalSettings(settings);
+ m_instance->d->setGlobalSettings(settings);
}
/*!
Returns the user specific settings used for information about enabled/disabled plugins.
*/
-QSettings *PluginManager::settings() const
+QSettings *PluginManager::settings()
{
- return d->settings;
+ return m_instance->d->settings;
}
/*!
Returns the global (user-independent) settings used for information about default disabled plugins.
*/
-QSettings *PluginManager::globalSettings() const
+QSettings *PluginManager::globalSettings()
{
- return d->globalSettings;
+ return m_instance->d->globalSettings;
}
void PluginManager::writeSettings()
{
- d->writeSettings();
+ m_instance->d->writeSettings();
}
/*!
@@ -447,9 +447,9 @@ void PluginManager::writeSettings()
The arguments left over after parsing (Neither startup nor plugin
arguments). Typically, this will be the list of files to open.
*/
-QStringList PluginManager::arguments() const
+QStringList PluginManager::arguments()
{
- return d->arguments;
+ return m_instance->d->arguments;
}
/*!
@@ -462,14 +462,14 @@ QStringList PluginManager::arguments() const
\sa setPluginPaths()
*/
-QList<PluginSpec *> PluginManager::plugins() const
+QList<PluginSpec *> PluginManager::plugins()
{
- return d->pluginSpecs;
+ return m_instance->d->pluginSpecs;
}
-QHash<QString, PluginCollection *> PluginManager::pluginCollections() const
+QHash<QString, PluginCollection *> PluginManager::pluginCollections()
{
- return d->pluginCategories;
+ return m_instance->d->pluginCategories;
}
/*!
@@ -485,7 +485,7 @@ QHash<QString, PluginCollection *> PluginManager::pluginCollections() const
static const char argumentKeywordC[] = ":arguments";
-QString PluginManager::serializedArguments() const
+QString PluginManager::serializedArguments()
{
const QChar separator = QLatin1Char('|');
QString rc;
@@ -499,13 +499,13 @@ QString PluginManager::serializedArguments() const
rc += ps->arguments().join(QString(separator));
}
}
- if (!d->arguments.isEmpty()) {
+ if (!m_instance->d->arguments.isEmpty()) {
if (!rc.isEmpty())
rc += separator;
rc += QLatin1String(argumentKeywordC);
// If the argument appears to be a file, make it absolute
// when sending to another instance.
- foreach(const QString &argument, d->arguments) {
+ foreach (const QString &argument, m_instance->d->arguments) {
rc += separator;
const QFileInfo fi(argument);
if (fi.exists() && fi.isRelative()) {
@@ -578,7 +578,7 @@ bool PluginManager::parseOptions(const QStringList &args,
QMap<QString, QString> *foundAppOptions,
QString *errorString)
{
- OptionsParser options(args, appOptions, foundAppOptions, errorString, d);
+ OptionsParser options(args, appOptions, foundAppOptions, errorString, m_instance->d);
return options.parse();
}
@@ -633,12 +633,12 @@ void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int d
Format the plugin options of the plugin specs for command line help.
*/
-void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation, int descriptionIndentation) const
+void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation, int descriptionIndentation)
{
typedef PluginSpec::PluginArgumentDescriptions PluginArgumentDescriptions;
// Check plugins for options
- const PluginSpecSet::const_iterator pcend = d->pluginSpecs.constEnd();
- for (PluginSpecSet::const_iterator pit = d->pluginSpecs.constBegin(); pit != pcend; ++pit) {
+ const PluginSpecSet::const_iterator pcend = m_instance->d->pluginSpecs.constEnd();
+ for (PluginSpecSet::const_iterator pit = m_instance->d->pluginSpecs.constBegin(); pit != pcend; ++pit) {
const PluginArgumentDescriptions pargs = (*pit)->argumentDescriptions();
if (!pargs.empty()) {
str << "\nPlugin: " << (*pit)->name() << '\n';
@@ -655,10 +655,10 @@ void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation,
Format the version of the plugin specs for command line help.
*/
-void PluginManager::formatPluginVersions(QTextStream &str) const
+void PluginManager::formatPluginVersions(QTextStream &str)
{
- const PluginSpecSet::const_iterator cend = d->pluginSpecs.constEnd();
- for (PluginSpecSet::const_iterator it = d->pluginSpecs.constBegin(); it != cend; ++it) {
+ const PluginSpecSet::const_iterator cend = m_instance->d->pluginSpecs.constEnd();
+ for (PluginSpecSet::const_iterator it = m_instance->d->pluginSpecs.constBegin(); it != cend; ++it) {
const PluginSpec *ps = *it;
str << " " << ps->name() << ' ' << ps->version() << ' ' << ps->description() << '\n';
}
@@ -675,9 +675,13 @@ void PluginManager::startTests()
methods.append("arg0");
// We only want slots starting with "test"
for (int i = mo->methodOffset(); i < mo->methodCount(); ++i) {
- if (QByteArray(mo->method(i).signature()).startsWith("test") &&
- !QByteArray(mo->method(i).signature()).endsWith("_data()")) {
- QString method = QString::fromLatin1(mo->method(i).signature());
+#if QT_VERSION >= 0x050000
+ const QByteArray signature = mo->method(i).methodSignature();
+#else
+ const QByteArray signature = mo->method(i).signature();
+#endif
+ if (signature.startsWith("test") && !signature.endsWith("_data()")) {
+ const QString method = QString::fromLatin1(signature);
methods.append(method.left(method.size()-2));
}
}
@@ -695,16 +699,16 @@ void PluginManager::startTests()
* \fn bool PluginManager::runningTests() const
* \internal
*/
-bool PluginManager::runningTests() const
+bool PluginManager::runningTests()
{
- return !d->testSpecs.isEmpty();
+ return !m_instance->d->testSpecs.isEmpty();
}
/*!
* \fn QString PluginManager::testDataDirectory() const
* \internal
*/
-QString PluginManager::testDataDirectory() const
+QString PluginManager::testDataDirectory()
{
QByteArray ba = qgetenv("QTCREATOR_TEST_DIR");
QString s = QString::fromLocal8Bit(ba.constData(), ba.size());
@@ -724,7 +728,7 @@ QString PluginManager::testDataDirectory() const
void PluginManager::profilingReport(const char *what, const PluginSpec *spec)
{
- d->profilingReport(what, spec);
+ m_instance->d->profilingReport(what, spec);
}
@@ -735,7 +739,7 @@ void PluginManager::profilingReport(const char *what, const PluginSpec *spec)
*/
QList<PluginSpec *> PluginManager::loadQueue()
{
- return d->loadQueue();
+ return m_instance->d->loadQueue();
}
//============PluginManagerPrivate===========
@@ -1282,9 +1286,9 @@ void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *s
\sa addObject()
*/
-QObject *PluginManager::getObjectByName(const QString &name) const
+QObject *PluginManager::getObjectByName(const QString &name)
{
- QReadLocker lock(&m_lock);
+ QReadLocker lock(&m_instance->m_lock);
QList<QObject *> all = allObjects();
foreach (QObject *obj, all) {
if (obj->objectName() == name)
@@ -1299,10 +1303,10 @@ QObject *PluginManager::getObjectByName(const QString &name) const
\sa addObject()
*/
-QObject *PluginManager::getObjectByClassName(const QString &className) const
+QObject *PluginManager::getObjectByClassName(const QString &className)
{
const QByteArray ba = className.toUtf8();
- QReadLocker lock(&m_lock);
+ QReadLocker lock(&m_instance->m_lock);
QList<QObject *> all = allObjects();
foreach (QObject *obj, all) {
if (obj->inherits(ba.constData()))
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index b0d555dd64..2d0529b375 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -66,12 +66,12 @@ public:
virtual ~PluginManager();
// Object pool operations
- void addObject(QObject *obj);
- void removeObject(QObject *obj);
- QList<QObject *> allObjects() const;
- template <typename T> QList<T *> getObjects() const
+ static void addObject(QObject *obj);
+ static void removeObject(QObject *obj);
+ static QList<QObject *> allObjects();
+ template <typename T> static QList<T *> getObjects()
{
- QReadLocker lock(&m_lock);
+ QReadLocker lock(&m_instance->m_lock);
QList<T *> results;
QList<QObject *> all = allObjects();
QList<T *> result;
@@ -82,9 +82,9 @@ public:
}
return results;
}
- template <typename T> T *getObject() const
+ template <typename T> static T *getObject()
{
- QReadLocker lock(&m_lock);
+ QReadLocker lock(&m_instance->m_lock);
QList<QObject *> all = allObjects();
T *result = 0;
foreach (QObject *obj, all) {
@@ -94,43 +94,43 @@ public:
return result;
}
- QObject *getObjectByName(const QString &name) const;
- QObject *getObjectByClassName(const QString &className) const;
+ static QObject *getObjectByName(const QString &name);
+ static QObject *getObjectByClassName(const QString &className);
// Plugin operations
- QList<PluginSpec *> loadQueue();
- void loadPlugins();
- QStringList pluginPaths() const;
- void setPluginPaths(const QStringList &paths);
- QList<PluginSpec *> plugins() const;
- QHash<QString, PluginCollection *> pluginCollections() const;
- void setFileExtension(const QString &extension);
- QString fileExtension() const;
- bool hasError() const;
+ static QList<PluginSpec *> loadQueue();
+ static void loadPlugins();
+ static QStringList pluginPaths();
+ static void setPluginPaths(const QStringList &paths);
+ static QList<PluginSpec *> plugins();
+ static QHash<QString, PluginCollection *> pluginCollections();
+ static void setFileExtension(const QString &extension);
+ static QString fileExtension();
+ static bool hasError();
// Settings
- void setSettings(QSettings *settings);
- QSettings *settings() const;
- void setGlobalSettings(QSettings *settings);
- QSettings *globalSettings() const;
- void writeSettings();
+ static void setSettings(QSettings *settings);
+ static QSettings *settings();
+ static void setGlobalSettings(QSettings *settings);
+ static QSettings *globalSettings();
+ static void writeSettings();
// command line arguments
- QStringList arguments() const;
- bool parseOptions(const QStringList &args,
+ static QStringList arguments();
+ static bool parseOptions(const QStringList &args,
const QMap<QString, bool> &appOptions,
QMap<QString, QString> *foundAppOptions,
QString *errorString);
static void formatOptions(QTextStream &str, int optionIndentation, int descriptionIndentation);
- void formatPluginOptions(QTextStream &str, int optionIndentation, int descriptionIndentation) const;
- void formatPluginVersions(QTextStream &str) const;
+ static void formatPluginOptions(QTextStream &str, int optionIndentation, int descriptionIndentation);
+ static void formatPluginVersions(QTextStream &str);
- QString serializedArguments() const;
+ static QString serializedArguments();
- bool runningTests() const;
- QString testDataDirectory() const;
+ static bool runningTests();
+ static QString testDataDirectory();
- void profilingReport(const char *what, const PluginSpec *spec = 0);
+ static void profilingReport(const char *what, const PluginSpec *spec = 0);
signals:
void objectAdded(QObject *obj);
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index b4e0699b6e..e04ef78652 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -31,7 +31,6 @@
**************************************************************************/
#include "pluginview.h"
-#include "pluginview_p.h"
#include "pluginmanager.h"
#include "pluginspec.h"
#include "plugincollection.h"
@@ -78,10 +77,9 @@ Q_DECLARE_METATYPE(ExtensionSystem::PluginCollection*)
Constructs a PluginView that gets the list of plugins from the
given plugin \a manager with a given \a parent widget.
*/
-PluginView::PluginView(PluginManager *manager, QWidget *parent)
+PluginView::PluginView(QWidget *parent)
: QWidget(parent),
m_ui(new Internal::Ui::PluginView),
- p(new Internal::PluginViewPrivate),
m_allowCheckStateUpdate(true),
C_LOAD(1)
{
@@ -100,8 +98,7 @@ PluginView::PluginView(PluginManager *manager, QWidget *parent)
m_whitelist << QString("Core") << QString("Locator")
<< QString("Find") << QString("TextEditor");
- p->manager = manager;
- connect(p->manager, SIGNAL(pluginsChanged()), this, SLOT(updateList()));
+ connect(PluginManager::instance(), SIGNAL(pluginsChanged()), this, SLOT(updateList()));
connect(m_ui->categoryWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
this, SLOT(selectPlugin(QTreeWidgetItem*)));
connect(m_ui->categoryWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)),
@@ -116,7 +113,6 @@ PluginView::PluginView(PluginManager *manager, QWidget *parent)
*/
PluginView::~PluginView()
{
- delete p;
delete m_ui;
}
@@ -139,7 +135,7 @@ void PluginView::updateList()
this, SLOT(updatePluginSettings(QTreeWidgetItem*,int)));
PluginCollection *defaultCollection = 0;
- foreach(PluginCollection *collection, p->manager->pluginCollections()) {
+ foreach (PluginCollection *collection, PluginManager::pluginCollections()) {
if (collection->name().isEmpty()) {
defaultCollection = collection;
continue;
@@ -345,7 +341,7 @@ void PluginView::updatePluginSettings(QTreeWidgetItem *item, int column)
void PluginView::updatePluginDependencies()
{
- foreach (PluginSpec *spec, PluginManager::instance()->loadQueue()) {
+ foreach (PluginSpec *spec, PluginManager::loadQueue()) {
bool disableIndirectly = false;
if (m_whitelist.contains(spec->name()))
continue;
diff --git a/src/libs/extensionsystem/pluginview.h b/src/libs/extensionsystem/pluginview.h
index c0ee0501b5..18b4d97f3a 100644
--- a/src/libs/extensionsystem/pluginview.h
+++ b/src/libs/extensionsystem/pluginview.h
@@ -50,7 +50,6 @@ class PluginSpec;
class PluginCollection;
namespace Internal {
- class PluginViewPrivate;
namespace Ui {
class PluginView;
} // namespace Ui
@@ -61,7 +60,7 @@ class EXTENSIONSYSTEM_EXPORT PluginView : public QWidget
Q_OBJECT
public:
- explicit PluginView(PluginManager *manager, QWidget *parent = 0);
+ explicit PluginView(QWidget *parent = 0);
~PluginView();
PluginSpec *currentPlugin() const;
@@ -84,7 +83,6 @@ private:
int parsePluginSpecs(QTreeWidgetItem *parentItem, Qt::CheckState &groupState, QList<PluginSpec*> plugins);
Internal::Ui::PluginView *m_ui;
- Internal::PluginViewPrivate *p;
QList<QTreeWidgetItem*> m_items;
QHash<PluginSpec*, QTreeWidgetItem*> m_specToItem;
diff --git a/src/libs/extensionsystem/pluginview_p.h b/src/libs/extensionsystem/pluginview_p.h
deleted file mode 100644
index 9e79d09cae..0000000000
--- a/src/libs/extensionsystem/pluginview_p.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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.
-**
-** 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.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**************************************************************************/
-
-#ifndef PLUGINVIEW_P_H
-#define PLUGINVIEW_P_H
-
-namespace ExtensionSystem {
-
-class PluginManager;
-
-namespace Internal {
-
-class PluginViewPrivate
-{
-public:
- PluginManager *manager;
-};
-
-} // namespace Internal
-} // namespace ExtensionSystem
-
-#endif // PLUGINVIEW_P_H
View Lorry Controller Status