From c0b1386361695fca7865a79af193c74c3d2ac495 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 11 Mar 2009 10:54:31 +0100
Subject: [PATCH] Fixes: use less static variables in patchedpluginloader.cpp
Details: confused designer plugins
---
.../extensionsystem/patchedpluginloader.cpp | 23 -------------------
1 file changed, 23 deletions(-)
diff --git a/src/libs/extensionsystem/patchedpluginloader.cpp b/src/libs/extensionsystem/patchedpluginloader.cpp
index 2ff684e1f83..3d8e904dd59 100644
--- a/src/libs/extensionsystem/patchedpluginloader.cpp
+++ b/src/libs/extensionsystem/patchedpluginloader.cpp
@@ -114,8 +114,6 @@ public:
QObject *instance();
- static QObjectList staticInstances();
-
bool load();
bool unload();
bool isLoaded() const;
@@ -831,9 +829,6 @@ QString PatchedPluginLoader::errorString() const
return (!d || d->errorString.isEmpty()) ? QLibrary::tr("Unknown error") : d->errorString;
}
-typedef QList<QtPluginInstanceFunction> StaticInstanceFunctionList;
-Q_GLOBAL_STATIC(StaticInstanceFunctionList, staticInstanceFunctionList)
-
void PatchedPluginLoader::setLoadHints(QLibrary::LoadHints loadHints)
{
if (!d) {
@@ -853,24 +848,6 @@ QLibrary::LoadHints PatchedPluginLoader::loadHints() const
return d->loadHints;
}
-void qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunction function)
-{
- staticInstanceFunctionList()->append(function);
-}
-
-QObjectList PatchedPluginLoader::staticInstances()
-{
- QObjectList instances;
- StaticInstanceFunctionList *functions = staticInstanceFunctionList();
- if (functions) {
- for (int i = 0; i < functions->count(); ++i)
- instances.append((*functions)[i]());
- }
- return instances;
-}
-
-
-
--
GitLab