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

qmake: Combine two variables into an array to simplify a loop.

Browse Source 
Change-Id: If787ed4a72c5fb91bb4a9e908ab3f6443b9358b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Edward Welbourne 2015-12-15 16:56:09 +01:00 committed by Simon Hausmann
parent d6efc0aab3
commit 4815f1cda4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qmake/generators/makefiledeps.cpp
View File

@ -898,7 +898,7 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
debug_msg(2, "findMocs: %s", file->file.local().toLatin1().constData()); debug_msg(2, "findMocs: %s", file->file.local().toLatin1().constData());
int line_count = 1; int line_count = 1;
bool ignore_qobject = false, ignore_qgadget = false; bool ignore[2] = { false, false }; // [0] for Q_OBJECT, [1] for Q_GADGET
/* qmake ignore Q_GADGET */ /* qmake ignore Q_GADGET */
/* qmake ignore Q_OBJECT */ /* qmake ignore Q_OBJECT */
for(int x = 0; x < buffer_len; x++) { for(int x = 0; x < buffer_len; x++) {
@ -926,13 +926,13 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_OBJECT\"", debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_OBJECT\"",
file->file.real().toLatin1().constData(), line_count); file->file.real().toLatin1().constData(), line_count);
x += 20; x += 20;
ignore_qobject = true; ignore[0] = true;
} else if(buffer_len >= (x + 20) && } else if(buffer_len >= (x + 20) &&
!strncmp(buffer + x + 1, "make ignore Q_GADGET", 20)) { !strncmp(buffer + x + 1, "make ignore Q_GADGET", 20)) {
debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_GADGET\"", debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_GADGET\"",
file->file.real().toLatin1().constData(), line_count); file->file.real().toLatin1().constData(), line_count);
x += 20; x += 20;
ignore_qgadget = true; ignore[1] = true;
} }
} else if (buffer[x] == '*') { } else if (buffer[x] == '*') {
extralines = 0; extralines = 0;
@ -962,10 +962,8 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
if (buffer[y] == 'Q') { if (buffer[y] == 'Q') {
static const char interesting[][9] = { "Q_OBJECT", "Q_GADGET" }; static const char interesting[][9] = { "Q_OBJECT", "Q_GADGET" };
for (int interest = 0; interest < 2; ++interest) { for (int interest = 0; interest < 2; ++interest) {
if(interest == 0 && ignore_qobject) if (ignore[interest])
continue; continue;
else if(interest == 1 && ignore_qgadget)
continue;
int matchlen = 0, extralines = 0; int matchlen = 0, extralines = 0;
if (matchWhileUnsplitting(buffer, buffer_len, y, if (matchWhileUnsplitting(buffer, buffer_len, y,