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

debugger: The DebuggerEngine refactoring.

Browse Source 
This replaces the (de facto) singleton engines and data handlers by classes
that are instantiated per run. The DebuggerRunControl will now create an
object of (a class derived from) DebuggerEngine that contains all the relevant
"dynamic" data.

DebuggerManager is no more. The "singleton" bits are merged into DebuggerPlugin,
whereas the data bits went to DebuggerEngine.

There is no formal notion of a "current" DebuggerEngine. However, as there's
only one DebuggerEngine at a time that has its data models connected to the
view, there's still some "de facto" notion of a "current" engine. Calling
SomeModel::setData(int role, QVariant data) with custom role is used as the
primary dispatch mechanism from the views to the "current" data models
(and the engine, as all data models know their engine).
This commit is contained in:
hjk
2010-06-16 11:08:54 +02:00
parent 4cc244469a
commit 6a6cba5518
93 changed files with 5258 additions and 4846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/debugger/gdb/gdbengine.h
View File

@@ -30,8 +30,7 @@
#ifndef DEBUGGER_GDBENGINE_H
#define DEBUGGER_GDBENGINE_H
#include "idebuggerengine.h"
#include "debuggermanager.h" // only for StartParameters
#include "debuggerengine.h"
#include "gdbmi.h"
#include "localgdbprocess.h"
#include "watchutils.h"
@@ -56,7 +55,6 @@ class QTimer;
QT_END_NAMESPACE
namespace Debugger {
class DebuggerManager;
namespace Internal {
class AbstractGdbAdapter;
@@ -83,15 +81,12 @@ enum DebuggingHelperState
};
class GdbEngine : public IDebuggerEngine
class GdbEngine : public DebuggerEngine
{
Q_OBJECT
public:
typedef QMultiMap<QString, int> GdbBinaryToolChainMap;
typedef QSharedPointer<GdbBinaryToolChainMap> GdbBinaryToolChainMapPtr;
explicit GdbEngine(DebuggerManager *manager);
explicit GdbEngine(const DebuggerStartParameters &startParameters);
~GdbEngine();
private:
@@ -107,10 +102,6 @@ private:
private: ////////// General Interface //////////
virtual void addOptionPages(QList<Core::IOptionsPage*> *opts) const;
virtual bool checkConfiguration(int toolChain, QString *errorMessage,
QString *settingsPage = 0) const;
virtual void startDebugger();
virtual unsigned debuggerCapabilities() const;
virtual void exitDebugger();
@@ -125,8 +116,6 @@ private: ////////// General State //////////
void initializeVariables();
DebuggerStartMode startMode() const;
const DebuggerStartParameters &startParameters() const
{ return m_runControl->sp(); }
Q_SLOT void setAutoDerefPointers(const QVariant &on);
bool m_registerNamesListed;
@@ -332,8 +321,6 @@ private: ////////// View & Data Stuff //////////
virtual void selectThread(int index);
virtual void activateFrame(int index);
void gotoLocation(const StackFrame &frame, bool setLocationMarker);
//
// Breakpoint specific stuff
//
@@ -502,8 +489,9 @@ private: ////////// View & Data Stuff //////////
QSet<QByteArray> m_processedNames;
private: ////////// Dumper Management //////////
QString qtDumperLibraryName() const;
//
// Dumper Management
//
bool checkDebuggingHelpers();
bool checkDebuggingHelpersClassic();
void setDebuggingHelperStateClassic(DebuggingHelperState);
@@ -515,13 +503,13 @@ private: ////////// Dumper Management //////////
Q_SLOT void setDebugDebuggingHelpersClassic(const QVariant &on);
Q_SLOT void setUseDebuggingHelpers(const QVariant &on);
const GdbBinaryToolChainMapPtr m_gdbBinaryToolChainMap;
DebuggingHelperState m_debuggingHelperState;
QtDumperHelper m_dumperHelper;
QString m_gdb;
private: ////////// Convenience Functions //////////
//
// Convenience Functions
//
QString errorMessage(QProcess::ProcessError error);
QMessageBox *showMessageBox(int icon, const QString &title, const QString &text,
int buttons = 0);