diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 8a11ecefb21760870cc4e3aeed30db24be17da9e..c4ce7405a5b7c32920b8a62e040685d7ca60e026 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3103,8 +3103,7 @@ void DebuggerPluginPrivate::extensionsInitialized() } // Register factory of DebuggerRunControl. - m_debuggerRunControlFactory = new DebuggerRunControlFactory - (m_plugin, DebuggerEngineType(m_cmdLineEnabledEngines)); + m_debuggerRunControlFactory = new DebuggerRunControlFactory(m_plugin); m_plugin->addAutoReleasedObject(m_debuggerRunControlFactory); // The main "Start Debugging" action. diff --git a/src/plugins/debugger/debuggerruncontrolfactory.h b/src/plugins/debugger/debuggerruncontrolfactory.h index b2ebf627cea0fe2e41c47f89c5534a3858863506..5166059b8a6bfe8e4596fa2f479ef2ec9f358bca 100644 --- a/src/plugins/debugger/debuggerruncontrolfactory.h +++ b/src/plugins/debugger/debuggerruncontrolfactory.h @@ -43,7 +43,7 @@ class DebuggerRunControlFactory : public ProjectExplorer::IRunControlFactory { public: - explicit DebuggerRunControlFactory(QObject *parent, unsigned enabledEngines); + explicit DebuggerRunControlFactory(QObject *parent); // This is used by the "Non-Standard" scenarios, e.g. Attach to Core. // FIXME: What to do in case of a 0 runConfiguration? @@ -66,8 +66,6 @@ public: private: QString displayName() const; ProjectExplorer::RunConfigWidget *createConfigurationWidget(RunConfiguration *runConfiguration); - - const unsigned m_enabledEngines; }; } // namespace Internal diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 9d95678f8e78378f22aba234ba70e5b555a93dca..4f9f7a1ac846e4a41d7573a3f8ca5bd03d992765 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -827,9 +827,8 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa //////////////////////////////////////////////////////////////////////// // A factory to create DebuggerRunControls -DebuggerRunControlFactory::DebuggerRunControlFactory(QObject *parent, - unsigned enabledEngines) - : IRunControlFactory(parent), m_enabledEngines(enabledEngines) +DebuggerRunControlFactory::DebuggerRunControlFactory(QObject *parent) + : IRunControlFactory(parent) {} bool DebuggerRunControlFactory::canRun(RunConfiguration *runConfiguration, RunMode mode) const diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp index 4329b507c02965cef5a43966779ac570b4073957..aa61d38576f559348adb89dfe5fbb0134355bacd 100644 --- a/src/plugins/debugger/logwindow.cpp +++ b/src/plugins/debugger/logwindow.cpp @@ -125,7 +125,7 @@ class InputHighlighter : public QSyntaxHighlighter { public: InputHighlighter(QPlainTextEdit *parent) - : QSyntaxHighlighter(parent->document()), m_parent(parent) + : QSyntaxHighlighter(parent->document()) {} private: @@ -137,8 +137,6 @@ private: setFormat(1, text.size(), format); } } - - QPlainTextEdit *m_parent; };