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

debugger: remove unused bits from the debugger plugin interface

Browse Source
This commit is contained in:
hjk
2010-12-06 08:43:29 +01:00
parent 3006a136d0
commit 3282c1af27
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2628,6 +2628,7 @@ QString DebuggerPluginPrivate::gdbBinaryForToolChain(int toolChain) const
DebuggerLanguages DebuggerPluginPrivate::activeLanguages() const DebuggerLanguages DebuggerPluginPrivate::activeLanguages() const
{ {
QTC_ASSERT(m_mainWindow, return AnyLanguage);
return m_mainWindow->activeDebugLanguages(); return m_mainWindow->activeDebugLanguages();
} }
@@ -2851,8 +2852,9 @@ void DebuggerPluginPrivate::extensionsInitialized()
m_mainWindow->createDockWidget(CppLanguage, localsAndWatchers); m_mainWindow->createDockWidget(CppLanguage, localsAndWatchers);
m_mainWindow->createDockWidget(QmlLanguage, m_scriptConsoleWindow); m_mainWindow->createDockWidget(QmlLanguage, m_scriptConsoleWindow);
m_debuggerSettings->readSettings();
m_mainWindow->readSettings(); m_mainWindow->readSettings();
m_debuggerSettings->readSettings();
GdbOptionsPage::readGdbBinarySettings(); GdbOptionsPage::readGdbBinarySettings();
// Register factory of DebuggerRunControl. // Register factory of DebuggerRunControl.
@@ -3328,16 +3330,6 @@ void DebuggerPlugin::displayDebugger(RunControl *runControl)
theDebuggerCore->displayDebugger(rc->engine()); theDebuggerCore->displayDebugger(rc->engine());
} }
void DebuggerPlugin::runControlStarted(DebuggerRunControl *runControl)
{
theDebuggerCore->runControlStarted(runControl);
}
void DebuggerPlugin::runControlFinished(DebuggerRunControl *runControl)
{
theDebuggerCore->runControlFinished(runControl);
}
void DebuggerPlugin::extensionsInitialized() void DebuggerPlugin::extensionsInitialized()
{ {
theDebuggerCore->extensionsInitialized(); theDebuggerCore->extensionsInitialized();
@@ -3348,11 +3340,6 @@ bool DebuggerPlugin::isActiveDebugLanguage(int language)
return theDebuggerCore->isActiveDebugLanguage(language); return theDebuggerCore->isActiveDebugLanguage(language);
} }
DebuggerMainWindow *DebuggerPlugin::mainWindow()
{
return theDebuggerCore->m_mainWindow;
}
QWidget *DebugMode::widget() QWidget *DebugMode::widget()
{ {
if (!m_widget) { if (!m_widget) {

11
src/plugins/debugger/debuggerplugin.h
View File

@@ -45,11 +45,10 @@ namespace Debugger {
class DebuggerRunControl; class DebuggerRunControl;
class DebuggerStartParameters; class DebuggerStartParameters;
class DebuggerMainWindow;
// This is the "external" interface of the debugger plugin that's // This is the "external" interface of the debugger plugin that's visible
// visible from Creator core. The internal interfact to global // from Qt Creator core. The internal interface to global debugger
// functionality to be used by debugger views and debugger engines // functionality that is used by debugger views and debugger engines
// is DebuggerCore, implemented in DebuggerPluginPrivate. // is DebuggerCore, implemented in DebuggerPluginPrivate.
class DEBUGGER_EXPORT DebuggerPlugin : public ExtensionSystem::IPlugin class DEBUGGER_EXPORT DebuggerPlugin : public ExtensionSystem::IPlugin
@@ -65,7 +64,6 @@ public:
static void startDebugger(ProjectExplorer::RunControl *runControl); static void startDebugger(ProjectExplorer::RunControl *runControl);
static void displayDebugger(ProjectExplorer::RunControl *runControl); static void displayDebugger(ProjectExplorer::RunControl *runControl);
static bool isActiveDebugLanguage(int language); static bool isActiveDebugLanguage(int language);
static DebuggerMainWindow *mainWindow();
private: private:
// IPlugin implementation. // IPlugin implementation.
@@ -73,9 +71,6 @@ private:
void remoteCommand(const QStringList &options, const QStringList &arguments); void remoteCommand(const QStringList &options, const QStringList &arguments);
ShutdownFlag aboutToShutdown(); ShutdownFlag aboutToShutdown();
void extensionsInitialized(); void extensionsInitialized();
void runControlStarted(DebuggerRunControl *runControl);
void runControlFinished(DebuggerRunControl *runControl);
}; };
} // namespace Debugger } // namespace Debugger