1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moc generator: avoid creating QMap::keys().

Browse Source 
Iterate the keys directly off the QMap itself.

Change-Id: I7792414db250d8ae63a935513a16a01eb184ebde
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Anton Kudryavtsev 2016-04-14 09:17:55 +03:00
parent 760b2929a3
commit 5361a8dec5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/moc/generator.cpp
View File

@ -499,9 +499,9 @@ void Generator::generateCode()
// QTBUG-20639 - Accept non-local enums for QML signal/slot parameters. // QTBUG-20639 - Accept non-local enums for QML signal/slot parameters.
// Look for any scoped enum declarations, and add those to the list // Look for any scoped enum declarations, and add those to the list
// of extra/related metaobjects for this object. // of extra/related metaobjects for this object.
QList<QByteArray> enumKeys = cdef->enumDeclarations.keys(); for (auto it = cdef->enumDeclarations.keyBegin(),
for (int i = 0; i < enumKeys.count(); ++i) { end = cdef->enumDeclarations.keyEnd(); it != end; ++it) {
const QByteArray &enumKey = enumKeys[i]; const QByteArray &enumKey = *it;
int s = enumKey.lastIndexOf("::"); int s = enumKey.lastIndexOf("::");
if (s > 0) { if (s > 0) {
QByteArray scope = enumKey.left(s); QByteArray scope = enumKey.left(s);