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

Debugger: Remove actions from object pool

Browse Source 
The actions were added to the object pool so that QmlJsInspector
plugin can access them. This is obsolete now.

Change-Id: I7c33428b834c372fab354b39ffeb6c8d181c162a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-05-14 12:50:36 +02:00
parent f995ebc89f
commit 56a9d9702b
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/debuggeractions.cpp
View File

@@ -41,8 +41,6 @@
#include <utils/qtcassert.h>
#include <utils/pathchooser.h>
#include <extensionsystem/pluginmanager.h>
#include <QDebug>
#include <QVariant>
#include <QSettings>
@@ -102,13 +100,9 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
SavedAction *item = 0;
//The Actions that are accessed by QML Inspector are added to PluginManager
//Needed by QML Inspector
item = new SavedAction(this);
insertItem(SettingsDialog, item);
item->setText(tr("Debugger Properties..."));
item->setObjectName(QLatin1String(Constants::SETTINGS_DIALOG));
ExtensionSystem::PluginManager::instance()->addObject(item);
//
// View
@@ -183,8 +177,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
item->setCheckable(true);
item->setDefaultValue(false);
insertItem(UseAlternatingRowColors, item);
item->setObjectName(QLatin1String(Constants::USE_ALTERNATING_ROW_COLORS));
ExtensionSystem::PluginManager::instance()->addObject(item);
item = new SavedAction(this);
item->setText(tr("Debugger Font Size Follows Main Editor"));
@@ -257,7 +249,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
item->setValue(true);
insertItem(ShowQtNamespace, item);
//Needed by QML Inspector
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("SortStructMembers"));
item->setText(tr("Sort Members of Classes and Structs Alphabetically"));
@@ -265,8 +256,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
item->setDefaultValue(true);
item->setValue(true);
insertItem(SortStructMembers, item);
item->setObjectName(QLatin1String(Constants::SORT_STRUCT_MEMBERS));
ExtensionSystem::PluginManager::instance()->addObject(item);
//
// DebuggingHelper
@@ -577,18 +566,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
DebuggerSettings::~DebuggerSettings()
{
ExtensionSystem::PluginManager *pluginManager =
ExtensionSystem::PluginManager::instance();
QObject *o = pluginManager->getObjectByName(Constants::SETTINGS_DIALOG);
if (o)
pluginManager->removeObject(o);
o = pluginManager->getObjectByName(Constants::USE_ALTERNATING_ROW_COLORS);
if (o)
pluginManager->removeObject(o);
o = pluginManager->getObjectByName(Constants::SORT_STRUCT_MEMBERS);
if (o)
pluginManager->removeObject(o);
qDeleteAll(m_items);
}