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

ClassView: Optimize operator== of internal data

Browse Source 
Make all of the fields of SymbolLocation and SymbolInformation
const members. Optimize a bit operator== of these structures:
check first if hashes are non-equal - in this case return
false early. Fix hash type of SymbolInformation for porting
to Qt6 purpose.

Task-number: QTCREATORBUG-25317
Task-number: QTCREATORBUG-24098
Change-Id: I769f99ff3157093e9f10ee3929bc7f6eb83f34e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2021-02-16 01:37:49 +01:00
parent 06f305265b
commit 4a15f6d16b
6 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/classview/classviewmanager.cpp
View File

@@ -317,8 +317,7 @@ void Manager::gotoLocations(const QList<QVariant> &list)
return;
// Default to first known location
SymbolLocation loc = *locations.constBegin();
auto locationIt = locations.constBegin();
if (locations.size() > 1) {
// The symbol has multiple locations. Check if we are already at one location,
// and if so, cycle to the "next" one
@@ -329,20 +328,19 @@ void Manager::gotoLocations(const QList<QVariant> &list)
int line;
int column;
textEditor->convertPosition(textEditor->position(), &line, &column);
SymbolLocation current(fileName, line, column);
QSet<SymbolLocation>::const_iterator it = locations.constFind(current);
QSet<SymbolLocation>::const_iterator end = locations.constEnd();
if (it != end) {
const SymbolLocation current(fileName, line, column);
if (auto it = locations.constFind(current), end = locations.constEnd(); it != end) {
// we already are at the symbol, cycle to next location
++it;
if (it == end)
it = locations.constBegin();
loc = *it;
locationIt = it;
}
}
}
const SymbolLocation &location = *locationIt;
// line is 1-based, column is 0-based
gotoLocation(loc.fileName(), loc.line(), loc.column() - 1);
gotoLocation(location.fileName(), location.line(), location.column() - 1);
}
/*!