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

Debugger: Dissolve WatchHandler::insertBulkData

Browse Source 
Change-Id: Ie2b073531f28943e78e89157798fef1645d4aa2b
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-03-06 14:37:36 +01:00
parent 3f79ae203f
commit e4c2582b62
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,7 +204,6 @@ public:
void insertDataItem(const WatchData &data, bool destructive); void insertDataItem(const WatchData &data, bool destructive);
void reinsertAllData(); void reinsertAllData();
void reinsertAllDataHelper(WatchItem *item, QList<WatchData> *data); void reinsertAllDataHelper(WatchItem *item, QList<WatchData> *data);
void insertBulkData(const QList<WatchData> &data);
QString displayForAutoTest(const QByteArray &iname) const; QString displayForAutoTest(const QByteArray &iname) const;
void reinitialize(bool includeInspectData = false); void reinitialize(bool includeInspectData = false);
@@ -304,7 +303,8 @@ void WatchModel::reinsertAllData()
foreach (TreeItem *child, rootItem()->children()) foreach (TreeItem *child, rootItem()->children())
reinsertAllDataHelper(static_cast<WatchItem *>(child), &list); reinsertAllDataHelper(static_cast<WatchItem *>(child), &list);
reinitialize(true); reinitialize(true);
insertBulkData(list); for (int i = 0, n = list.size(); i != n; ++i)
insertDataItem(list.at(i), true);
} }
void WatchModel::reinsertAllDataHelper(WatchItem *item, QList<WatchData> *data) void WatchModel::reinsertAllDataHelper(WatchItem *item, QList<WatchData> *data)
@@ -1138,14 +1138,6 @@ void WatchModel::insertDataItem(const WatchData &data, bool destructive)
m_handler->showEditValue(data); m_handler->showEditValue(data);
} }
void WatchModel::insertBulkData(const QList<WatchData> &list)
{
for (int i = 0, n = list.size(); i != n; ++i) {
const WatchData &data = list.at(i);
insertDataItem(data, true);
}
}
int WatchItem::requestedFormat() const int WatchItem::requestedFormat() const
{ {
int format = theIndividualFormats.value(d.iname, AutomaticFormat); int format = theIndividualFormats.value(d.iname, AutomaticFormat);
@@ -1253,7 +1245,8 @@ void WatchHandler::insertData(const WatchData &data)
void WatchHandler::insertDataList(const QList<WatchData> &list) void WatchHandler::insertDataList(const QList<WatchData> &list)
{ {
m_model->insertBulkData(list); for (int i = 0, n = list.size(); i != n; ++i)
m_model->insertDataItem(list.at(i), true);
m_contentsValid = true; m_contentsValid = true;
updateWatchersWindow(); updateWatchersWindow();
} }
@@ -1339,7 +1332,7 @@ 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);
insertData(data); m_model->insertDataItem(data, true);
} else { } else {
m_engine->updateWatchData(data); m_engine->updateWatchData(data);
} }