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

replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance()

Browse Source
This commit is contained in:
hjk
2009-01-20 11:52:04 +01:00
parent d1dac15cc5
commit 113b81e9db
85 changed files with 432 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -55,12 +55,12 @@
#include <coreplugin/rightpane.h>
#include <coreplugin/uniqueidmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <cppeditor/cppeditorconstants.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/session.h>
@@ -346,7 +346,7 @@ DebuggerPlugin::~DebuggerPlugin()
static QSettings *settings()
{
return ExtensionSystem::PluginManager::instance()->getObject<ICore>()->settings();
return ICore::instance()->settings();
}
void DebuggerPlugin::shutdown()
@@ -387,7 +387,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes
m_pm = ExtensionSystem::PluginManager::instance();
ICore *core = m_pm->getObject<Core::ICore>();
ICore *core = ICore::instance();
QTC_ASSERT(core, return false);
Core::ActionManager *am = core->actionManager();
@@ -713,8 +713,7 @@ ProjectExplorer::ProjectExplorerPlugin *DebuggerPlugin::projectExplorer() const
/*! Activates the previous mode when the current mode is the debug mode. */
void DebuggerPlugin::activatePreviousMode()
{
ICore *core = m_pm->getObject<Core::ICore>();
Core::ModeManager *const modeManager = core->modeManager();
Core::ModeManager *const modeManager = ICore::instance()->modeManager();
if (modeManager->currentMode() == modeManager->mode(Constants::MODE_DEBUG)
&& !m_previousMode.isEmpty()) {
@@ -725,7 +724,7 @@ void DebuggerPlugin::activatePreviousMode()
void DebuggerPlugin::activateDebugMode()
{
ICore *core = m_pm->getObject<Core::ICore>();
ICore *core = ICore::instance();
Core::ModeManager *modeManager = core->modeManager();
m_previousMode = QLatin1String(modeManager->currentMode()->uniqueModeName());
modeManager->activateMode(QLatin1String(MODE_DEBUG));
@@ -733,7 +732,7 @@ void DebuggerPlugin::activateDebugMode()
void DebuggerPlugin::queryCurrentTextEditor(QString *fileName, int *lineNumber, QObject **object)
{
ICore *core = m_pm->getObject<Core::ICore>();
ICore *core = ICore::instance();
if (!core || !core->editorManager())
return;
Core::IEditor *editor = core->editorManager()->currentEditor();
@@ -872,7 +871,7 @@ void DebuggerPlugin::gotoLocation(const QString &fileName, int lineNumber,
void DebuggerPlugin::changeStatus(int status)
{
bool startIsContinue = (status == DebuggerInferiorStopped);
ICore *core = m_pm->getObject<Core::ICore>();
ICore *core = ICore::instance();
if (startIsContinue) {
core->addAdditionalContext(m_gdbRunningContext);
core->updateContext();
@@ -916,8 +915,7 @@ void DebuggerPlugin::readSettings()
#if defined(Q_OS_WIN32)
defaultCommand.append(".exe");
#endif
Core::ICore *coreIFace = m_pm->getObject<Core::ICore>();
QString defaultScript = coreIFace->resourcePath() +
QString defaultScript = ICore::instance()->resourcePath() +
QLatin1String("/gdb/qt4macros");
s->beginGroup(QLatin1String("DebugMode"));

18
src/plugins/debugger/gdbtypemacros.cpp
View File

@@ -35,7 +35,6 @@
#include "gdbengine.h"
#include "imports.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/icore.h>
#include <QtCore/QSettings>
@@ -49,9 +48,7 @@ TypeMacroPage::TypeMacroPage(GdbSettings *settings)
m_pm = ExtensionSystem::PluginManager::instance();
m_settings = settings;
Core::ICore *coreIFace = m_pm->getObject<Core::ICore>();
if (!coreIFace || !coreIFace->settings())
return;
Core::ICore *coreIFace = ICore::instance();
QSettings *s = coreIFace->settings();
s->beginGroup("GdbOptions");
@@ -164,14 +161,11 @@ void TypeMacroPage::finished(bool accepted)
m_settings->m_typeMacros.insert(item->text(0), data);
}
Core::ICore *coreIFace = m_pm->getObject<Core::ICore>();
if (coreIFace && coreIFace->settings()) {
QSettings *s = coreIFace->settings();
s->beginGroup("GdbOptions");
s->setValue("ScriptFile", m_settings->m_scriptFile);
s->setValue("TypeMacros", m_settings->m_typeMacros);
s->endGroup();
}
QSettings *s = ICore::instance()->settings();
s->beginGroup("GdbOptions");
s->setValue("ScriptFile", m_settings->m_scriptFile);
s->setValue("TypeMacros", m_settings->m_typeMacros);
s->endGroup();
}
void TypeMacroPage::onAddButton()