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

Debugger: Remove WatchHandler::insertIncompleteData

Browse Source 
... and replace at caller side it with the used parts
of the code.

Change-Id: Id612c66ac6d95bfc12aba16e9247cc81991dd779
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-03-06 10:30:56 +01:00
parent 74f7cd1c26
commit a7bf3c49a4
2 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1198,36 +1198,6 @@ void WatchHandler::cleanup()
m_separatedView->hide(); m_separatedView->hide();
} }
void WatchHandler::insertIncompleteData(const WatchData &data)
{
MODEL_DEBUG("INSERTDATA: " << data.toString());
if (!data.isValid()) {
qWarning("%s:%d: Attempt to insert invalid watch item: %s",
__FILE__, __LINE__, qPrintable(data.toString()));
return;
}
if (data.isSomethingNeeded() && data.iname.contains('.')) {
MODEL_DEBUG("SOMETHING NEEDED: " << data.toString());
if (!m_engine->isSynchronous() || data.isInspect()) {
m_model->insertDataItem(data, true);
m_engine->updateWatchData(data);
} else {
m_engine->showMessage(QLatin1String("ENDLESS LOOP: SOMETHING NEEDED: ")
+ data.toString());
WatchData data1 = data;
data1.setAllUnneeded();
data1.setValue(QLatin1String("<unavailable synchronous data>"));
data1.setHasChildren(false);
m_model->insertDataItem(data1, true);
}
} else {
MODEL_DEBUG("NOTHING NEEDED: " << data.toString());
m_model->insertDataItem(data, true);
showEditValue(data);
}
}
void WatchHandler::insertItem(WatchItem *item) void WatchHandler::insertItem(WatchItem *item)
{ {
m_model->insertItem(item); m_model->insertItem(item);
@@ -1356,11 +1326,9 @@ void WatchHandler::watchExpression(const QString &exp0, const QString &name)
data.setAllUnneeded(); data.setAllUnneeded();
data.setValue(QString(QLatin1Char(' '))); data.setValue(QString(QLatin1Char(' ')));
data.setHasChildren(false); data.setHasChildren(false);
insertIncompleteData(data); insertData(data);
} else if (m_engine->isSynchronous()) {
m_engine->updateWatchData(data);
} else { } else {
insertIncompleteData(data); m_engine->updateWatchData(data);
} }
updateWatchersWindow(); updateWatchersWindow();
} }

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

@@ -238,7 +238,6 @@ public:
void insertData(const WatchData &data); // Convenience. void insertData(const WatchData &data); // Convenience.
void insertData(const QList<WatchData> &list); void insertData(const QList<WatchData> &list);
void insertIncompleteData(const WatchData &data);
void insertItem(WatchItem *item); // Takes ownership. void insertItem(WatchItem *item); // Takes ownership.
void removeData(const QByteArray &iname); void removeData(const QByteArray &iname);
void removeChildren(const QByteArray &iname); void removeChildren(const QByteArray &iname);