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

Debugger: More interface streamlining

Browse Source 
This makes WatchModel practically a WatchHandlerPrivate.

Change-Id: Iaf3435711012af5e233a7dfc0dc0caf9c8c3ab24
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-03-20 13:18:36 +01:00
parent 2c8e0c34e7
commit dba12a1eab
2 changed files with 46 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/plugins/debugger/watchhandler.cpp
View File

@@ -102,6 +102,11 @@ static QByteArray stripForFormat(const QByteArray &ba)
return res; return res;
} }
static void saveWatchers()
{
setSessionValue("Watchers", WatchHandler::watchedExpressions());
}
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// //
// SeparatedView // SeparatedView
@@ -194,7 +199,7 @@ public:
class WatchModel : public WatchModelBase class WatchModel : public WatchModelBase
{ {
public: public:
explicit WatchModel(WatchHandler *handler); WatchModel(WatchHandler *handler, DebuggerEngine *engine);
static QString nameForFormat(int format); static QString nameForFormat(int format);
@@ -210,15 +215,17 @@ public:
void insertItem(WatchItem *item); void insertItem(WatchItem *item);
void reexpandItems(); void reexpandItems();
void setCurrentItem(const QByteArray &iname);
void showEditValue(const WatchData &data); void showEditValue(const WatchData &data);
void setFormat(const QByteArray &type, int format);
QString removeNamespaces(QString str) const; QString removeNamespaces(QString str) const;
DebuggerEngine *engine() const;
bool contentIsValid() const;
public: public:
WatchHandler *m_handler; // Not owned. WatchHandler *m_handler; // Not owned.
DebuggerEngine *m_engine; // Not owned.
bool m_contentsValid;
bool m_resetLocationScheduled;
WatchItem *root() const { return static_cast<WatchItem *>(rootItem()); } WatchItem *root() const { return static_cast<WatchItem *>(rootItem()); }
WatchItem *m_localsRoot; // Not owned. WatchItem *m_localsRoot; // Not owned.
@@ -236,11 +243,15 @@ public:
QHash<QByteArray, QString> m_valueCache; QHash<QByteArray, QString> m_valueCache;
}; };
WatchModel::WatchModel(WatchHandler *handler) WatchModel::WatchModel(WatchHandler *handler, DebuggerEngine *engine)
: m_handler(handler), m_separatedView(new SeparatedView) : m_handler(handler), m_engine(engine), m_separatedView(new SeparatedView)
{ {
setObjectName(QLatin1String("WatchModel")); setObjectName(QLatin1String("WatchModel"));
m_contentsValid = false;
m_contentsValid = true; // FIXME
m_resetLocationScheduled = false;
setHeader(QStringList() << tr("Name") << tr("Value") << tr("Type")); setHeader(QStringList() << tr("Name") << tr("Value") << tr("Type"));
auto root = new WatchItem; auto root = new WatchItem;
root->appendChild(m_localsRoot = new WatchItem("local", tr("Locals"))); root->appendChild(m_localsRoot = new WatchItem("local", tr("Locals")));
@@ -272,11 +283,6 @@ void WatchModel::reinitialize(bool includeInspectData)
m_inspectorRoot->removeChildren(); m_inspectorRoot->removeChildren();
} }
DebuggerEngine *WatchModel::engine() const
{
return m_handler->m_engine;
}
WatchItem *WatchModel::findItem(const QByteArray &iname) const WatchItem *WatchModel::findItem(const QByteArray &iname) const
{ {
return root()->findItem(iname); return root()->findItem(iname);
@@ -327,7 +333,7 @@ QString WatchModel::removeNamespaces(QString str) const
if (!boolSetting(ShowStdNamespace)) if (!boolSetting(ShowStdNamespace))
str.remove(QLatin1String("std::")); str.remove(QLatin1String("std::"));
if (!boolSetting(ShowQtNamespace)) { if (!boolSetting(ShowQtNamespace)) {
const QString qtNamespace = QString::fromLatin1(engine()->qtNamespace()); const QString qtNamespace = QString::fromLatin1(m_engine->qtNamespace());
if (!qtNamespace.isEmpty()) if (!qtNamespace.isEmpty())
str.remove(qtNamespace); str.remove(qtNamespace);
} }
@@ -602,7 +608,7 @@ bool WatchItem::canFetchMore() const
return false; return false;
if (!watchModel()) if (!watchModel())
return false; return false;
if (!watchModel()->contentIsValid() && !isInspect()) if (!watchModel()->m_contentsValid && !isInspect())
return false; return false;
return !fetchTriggered; return !fetchTriggered;
} }
@@ -616,7 +622,7 @@ void WatchItem::fetchMore()
fetchTriggered = true; fetchTriggered = true;
if (children().isEmpty()) { if (children().isEmpty()) {
setChildrenNeeded(); setChildrenNeeded();
watchModel()->engine()->updateWatchItem(this); watchModel()->m_engine->updateWatchItem(this);
} }
} }
@@ -640,15 +646,6 @@ int WatchItem::itemFormat() const
return theTypeFormats.value(stripForFormat(type), AutomaticFormat); return theTypeFormats.value(stripForFormat(type), AutomaticFormat);
} }
bool WatchModel::contentIsValid() const
{
// FIXME:
// inspector doesn't follow normal beginCycle()/endCycle()
//if (m_type == InspectWatch)
// return true;
return m_handler->m_contentsValid;
}
QString WatchItem::expression() const QString WatchItem::expression() const
{ {
if (!exp.isEmpty()) if (!exp.isEmpty())
@@ -715,7 +712,7 @@ QColor WatchItem::valueColor() const
if (watchModel()) { if (watchModel()) {
if (!valueEnabled) if (!valueEnabled)
return gray; return gray;
if (!watchModel()->contentIsValid() && !isInspect()) if (!watchModel()->m_contentsValid && !isInspect())
return gray; return gray;
if (value.isEmpty()) // This might still show 0x... if (value.isEmpty()) // This might still show 0x...
return gray; return gray;
@@ -811,7 +808,7 @@ QVariant WatchItem::data(int column, int role) const
case LocalsIsWatchpointAtObjectAddressRole: { case LocalsIsWatchpointAtObjectAddressRole: {
BreakpointParameters bp(WatchpointAtAddress); BreakpointParameters bp(WatchpointAtAddress);
bp.address = address; bp.address = address;
return watchModel()->engine()->breakHandler()->findWatchpoint(bp) != 0; return watchModel()->m_engine->breakHandler()->findWatchpoint(bp) != 0;
} }
case LocalsSizeRole: case LocalsSizeRole:
@@ -821,7 +818,7 @@ QVariant WatchItem::data(int column, int role) const
if (isPointerType(type)) { if (isPointerType(type)) {
BreakpointParameters bp(WatchpointAtAddress); BreakpointParameters bp(WatchpointAtAddress);
bp.address = pointerValue(value); bp.address = pointerValue(value);
return watchModel()->engine()->breakHandler()->findWatchpoint(bp) != 0; return watchModel()->m_engine->breakHandler()->findWatchpoint(bp) != 0;
} }
return false; return false;
@@ -860,10 +857,10 @@ bool WatchModel::setData(const QModelIndex &idx, const QVariant &value, int role
break; break;
} }
case 1: // Change value case 1: // Change value
engine()->assignValueInDebugger(item, item->expression(), value); m_engine->assignValueInDebugger(item, item->expression(), value);
break; break;
case 2: // TODO: Implement change type. case 2: // TODO: Implement change type.
engine()->assignValueInDebugger(item, item->expression(), value); m_engine->assignValueInDebugger(item, item->expression(), value);
break; break;
} }
case LocalsExpandedRole: case LocalsExpandedRole:
@@ -878,8 +875,8 @@ bool WatchModel::setData(const QModelIndex &idx, const QVariant &value, int role
break; break;
case LocalsTypeFormatRole: case LocalsTypeFormatRole:
m_handler->setFormat(item->type, value.toInt()); setFormat(item->type, value.toInt());
engine()->updateWatchItem(item); m_engine->updateWatchItem(item);
break; break;
case LocalsIndividualFormatRole: { case LocalsIndividualFormatRole: {
@@ -888,7 +885,7 @@ bool WatchModel::setData(const QModelIndex &idx, const QVariant &value, int role
theIndividualFormats.remove(item->iname); theIndividualFormats.remove(item->iname);
else else
theIndividualFormats[item->iname] = format; theIndividualFormats[item->iname] = format;
engine()->updateWatchItem(item); m_engine->updateWatchItem(item);
break; break;
} }
} }
@@ -900,7 +897,7 @@ bool WatchModel::setData(const QModelIndex &idx, const QVariant &value, int role
Qt::ItemFlags WatchItem::flags(int column) const Qt::ItemFlags WatchItem::flags(int column) const
{ {
QTC_ASSERT(model(), return Qt::ItemFlags()); QTC_ASSERT(model(), return Qt::ItemFlags());
DebuggerEngine *engine = watchModel()->engine(); DebuggerEngine *engine = watchModel()->m_engine;
QTC_ASSERT(engine, return Qt::ItemFlags()); QTC_ASSERT(engine, return Qt::ItemFlags());
const DebuggerState state = engine->state(); const DebuggerState state = engine->state();
@@ -1120,14 +1117,6 @@ int WatchItem::requestedFormat() const
return format; return format;
} }
void WatchModel::setCurrentItem(const QByteArray &iname)
{
if (WatchItem *item = findItem(iname)) {
QModelIndex idx = indexFromItem(item);
emit currentIndexRequested(idx);
}
}
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// //
// WatchHandler // WatchHandler
@@ -1136,11 +1125,7 @@ void WatchModel::setCurrentItem(const QByteArray &iname)
WatchHandler::WatchHandler(DebuggerEngine *engine) WatchHandler::WatchHandler(DebuggerEngine *engine)
{ {
m_engine = engine; m_model = new WatchModel(this, engine);
m_model = new WatchModel(this);
m_contentsValid = false;
m_contentsValid = true; // FIXME
m_resetLocationScheduled = false;
} }
WatchHandler::~WatchHandler() WatchHandler::~WatchHandler()
@@ -1220,13 +1205,13 @@ void WatchHandler::resetWatchers()
void WatchHandler::notifyUpdateStarted() void WatchHandler::notifyUpdateStarted()
{ {
m_model->m_requestUpdateTimer.start(80); m_model->m_requestUpdateTimer.start(80);
m_contentsValid = false; m_model->m_contentsValid = false;
updateWatchersWindow(); updateWatchersWindow();
} }
void WatchHandler::notifyUpdateFinished() void WatchHandler::notifyUpdateFinished()
{ {
m_contentsValid = true; m_model->m_contentsValid = true;
updateWatchersWindow(); updateWatchersWindow();
m_model->m_requestUpdateTimer.stop(); m_model->m_requestUpdateTimer.stop();
emit m_model->updateFinished(); emit m_model->updateFinished();
@@ -1241,7 +1226,7 @@ void WatchHandler::purgeOutdatedItems(const QSet<QByteArray> &inames)
m_model->layoutChanged(); m_model->layoutChanged();
m_model->reexpandItems(); m_model->reexpandItems();
m_contentsValid = true; m_model->m_contentsValid = true;
updateWatchersWindow(); updateWatchersWindow();
} }
@@ -1279,12 +1264,12 @@ void WatchHandler::watchExpression(const QString &exp0, const QString &name)
item->iname = watcherName(exp); item->iname = watcherName(exp);
saveWatchers(); saveWatchers();
if (m_engine->state() == DebuggerNotReady) { if (m_model->m_engine->state() == DebuggerNotReady) {
item->setAllUnneeded(); item->setAllUnneeded();
item->setValue(QString(QLatin1Char(' '))); item->setValue(QString(QLatin1Char(' ')));
m_model->insertItem(item); m_model->insertItem(item);
} else { } else {
m_engine->updateWatchItem(item); m_model->m_engine->updateWatchItem(item);
} }
updateWatchersWindow(); updateWatchersWindow();
} }
@@ -1426,12 +1411,7 @@ QStringList WatchHandler::watchedExpressions()
return watcherNames; return watcherNames;
} }
void WatchHandler::saveWatchers() static void loadFormats()
{
setSessionValue("Watchers", watchedExpressions());
}
void WatchHandler::loadFormats()
{ {
QVariant value = sessionValue("DefaultFormats"); QVariant value = sessionValue("DefaultFormats");
QMapIterator<QString, QVariant> it(value.toMap()); QMapIterator<QString, QVariant> it(value.toMap());
@@ -1450,7 +1430,7 @@ void WatchHandler::loadFormats()
} }
} }
void WatchHandler::saveFormats() static void saveFormats()
{ {
QMap<QString, QVariant> formats; QMap<QString, QVariant> formats;
QHashIterator<QByteArray, int> it(theTypeFormats); QHashIterator<QByteArray, int> it(theTypeFormats);
@@ -1529,12 +1509,7 @@ const WatchItem *WatchHandler::findCppLocalVariable(const QString &name) const
return 0; return 0;
} }
bool WatchHandler::hasItem(const QByteArray &iname) const void WatchModel::setFormat(const QByteArray &type0, int format)
{
return m_model->findItem(iname);
}
void WatchHandler::setFormat(const QByteArray &type0, int format)
{ {
const QByteArray type = stripForFormat(type0); const QByteArray type = stripForFormat(type0);
if (format == AutomaticFormat) if (format == AutomaticFormat)
@@ -1542,7 +1517,7 @@ void WatchHandler::setFormat(const QByteArray &type0, int format)
else else
theTypeFormats[type] = format; theTypeFormats[type] = format;
saveFormats(); saveFormats();
m_model->reinsertAllData(); reinsertAllData();
} }
int WatchHandler::format(const QByteArray &iname) const int WatchHandler::format(const QByteArray &iname) const
@@ -1680,18 +1655,21 @@ DumperTypeFormats WatchHandler::typeFormats() const
void WatchHandler::scheduleResetLocation() void WatchHandler::scheduleResetLocation()
{ {
m_contentsValid = false; m_model->m_contentsValid = false;
m_resetLocationScheduled = true; m_model->m_resetLocationScheduled = true;
} }
void WatchHandler::resetLocation() void WatchHandler::resetLocation()
{ {
m_resetLocationScheduled = false; m_model->m_resetLocationScheduled = false;
} }
void WatchHandler::setCurrentItem(const QByteArray &iname) void WatchHandler::setCurrentItem(const QByteArray &iname)
{ {
m_model->setCurrentItem(iname); if (WatchItem *item = m_model->findItem(iname)) {
QModelIndex idx = m_model->indexFromItem(item);
emit m_model->currentIndexRequested(idx);
}
} }
QHash<QByteArray, int> WatchHandler::watcherNames() QHash<QByteArray, int> WatchHandler::watcherNames()

13
src/plugins/debugger/watchhandler.h
View File

@@ -187,7 +187,6 @@ public:
void fetchMore(const QByteArray &iname) const; void fetchMore(const QByteArray &iname) const;
WatchItem *findItem(const QByteArray &iname) const; WatchItem *findItem(const QByteArray &iname) const;
const WatchItem *findCppLocalVariable(const QString &name) const; const WatchItem *findCppLocalVariable(const QString &name) const;
bool hasItem(const QByteArray &iname) const;
void loadSessionData(); void loadSessionData();
void saveSessionData(); void saveSessionData();
@@ -231,19 +230,7 @@ public:
void purgeOutdatedItems(const QSet<QByteArray> &inames); void purgeOutdatedItems(const QSet<QByteArray> &inames);
private: private:
friend class WatchModel;
void saveWatchers();
static void loadFormats();
static void saveFormats();
void setFormat(const QByteArray &type, int format);
WatchModel *m_model; // Owned. WatchModel *m_model; // Owned.
DebuggerEngine *m_engine; // Not owned.
bool m_contentsValid;
bool m_resetLocationScheduled;
}; };
} // namespace Internal } // namespace Internal