feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make PluginManager mostly static.

Browse Source 
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Eike Ziller
2012-06-18 11:34:15 +02:00
committed by hjk
parent 9daa34003d
commit e3c354d8f2
88 changed files with 287 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -279,9 +279,7 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters,
{
setObjectName(QLatin1String("QmlEngine"));
ExtensionSystem::PluginManager *pluginManager =
ExtensionSystem::PluginManager::instance();
pluginManager->addObject(this);
ExtensionSystem::PluginManager::addObject(this);
connect(&m_adapter, SIGNAL(connectionError(QAbstractSocket::SocketError)),
SLOT(connectionError(QAbstractSocket::SocketError)));
@@ -353,11 +351,8 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters,
QmlEngine::~QmlEngine()
{
ExtensionSystem::PluginManager *pluginManager =
ExtensionSystem::PluginManager::instance();
if (pluginManager->allObjects().contains(this)) {
pluginManager->removeObject(this);
if (ExtensionSystem::PluginManager::allObjects().contains(this)) {
ExtensionSystem::PluginManager::removeObject(this);
}
QList<Core::IEditor *> editorsToClose;