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

Debugger: Start disentangling WatchHandler::insertData

Browse Source 
Rename the list overload. Make the single item overload use
the direct path to insertItem, hook the column resize requests
to the showing/hiding of the watchers pane.

Change-Id: I0a1940c8e1919341a815e6bccbcf55d989d663da
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-03-06 14:25:33 +01:00
parent 46fcfa9018
commit 3f79ae203f
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1135,6 +1135,7 @@ void WatchModel::insertDataItem(const WatchData &data, bool destructive)
emit itemIsExpanded(indexFromItem(parent));
}
}
m_handler->showEditValue(data);
}
void WatchModel::insertBulkData(const QList<WatchData> &list)
@@ -1142,9 +1143,7 @@ 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);
m_handler->showEditValue(data);
}
emit columnAdjustmentRequested();
}
int WatchItem::requestedFormat() const
@@ -1247,15 +1246,14 @@ void WatchModel::reexpandItems()
void WatchHandler::insertData(const WatchData &data)
{
QList<WatchData> list;
list.append(data);
insertData(list);
m_model->insertDataItem(data, true);
m_contentsValid = true;
updateWatchersWindow();
}
void WatchHandler::insertData(const QList<WatchData> &list)
void WatchHandler::insertDataList(const QList<WatchData> &list)
{
m_model->insertBulkData(list);
m_contentsValid = true;
updateWatchersWindow();
}
@@ -1463,6 +1461,8 @@ void WatchHandler::clearWatches()
void WatchHandler::updateWatchersWindow()
{
emit m_model->columnAdjustmentRequested();
// Force show/hide of watchers and return view.
static int previousShowWatch = -1;
static int previousShowReturn = -1;