FCL/sf/mw/qt: comparison qmake/generators/makefiledeps.cpp

equal deleted inserted replaced

-:41300fa6a67c
+:f7bc934e204c
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 if(fd == -1 || fstat(fd, &fst) || S_ISDIR(fst.st_mode))
 return false;
 buffer = getBuffer(fst.st_size);
 for(int have_read = 0;
 (have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len));
-buffer_len += have_read);
+buffer_len += have_read) ;
 QT_CLOSE(fd);
 }
 if(!buffer)
 return false;
 if(!file->deps)
 ++x;
 if(*(buffer + x) == '<') {
 ++x;
 if(buffer_len >= x + 12 && !strncmp(buffer + x, "includehint", 11) &&
 (*(buffer + x + 11) == ' ' || *(buffer + x + 11) == '>')) {
-for(x += 11; *(buffer + x) != '>'; ++x);
+for(x += 11; *(buffer + x) != '>'; ++x) ;
 int inc_len = 0;
-for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len);
+for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len) ;
 *(buffer + x + inc_len) = '\0';
 inc = buffer + x;
 } else if(buffer_len >= x + 13 && !strncmp(buffer + x, "customwidget", 12) &&
 (*(buffer + x + 12) == ' ' || *(buffer + x + 12) == '>')) {
-for(x += 13; *(buffer + x) != '>'; ++x); //skip up to >
+for(x += 13; *(buffer + x) != '>'; ++x) ; //skip up to >
 while(x < buffer_len) {
-for(x++; *(buffer + x) != '<'; ++x); //skip up to <
+for(x++; *(buffer + x) != '<'; ++x) ; //skip up to <
 x++;
 if(buffer_len >= x + 7 && !strncmp(buffer+x, "header", 6) &&
 (*(buffer + x + 6) == ' ' || *(buffer + x + 6) == '>')) {
-for(x += 7; *(buffer + x) != '>'; ++x); //skip up to >
+for(x += 7; *(buffer + x) != '>'; ++x) ; //skip up to >
 int inc_len = 0;
-for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len);
+for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len) ;
 *(buffer + x + inc_len) = '\0';
 inc = buffer + x;
 break;
 } else if(buffer_len >= x + 14 && !strncmp(buffer+x, "/customwidget", 13) &&
 (*(buffer + x + 13) == ' ' || *(buffer + x + 13) == '>')) {
 } else if(buffer_len >= x + 8 && !strncmp(buffer + x, "include", 7) &&
 (*(buffer + x + 7) == ' ' || *(buffer + x + 7) == '>')) {
 for(x += 8; *(buffer + x) != '>'; ++x) {
 if(buffer_len >= x + 9 && *(buffer + x) == 'i' &&
 !strncmp(buffer + x, "impldecl", 8)) {
-for(x += 8; *(buffer + x) != '='; ++x);
+for(x += 8; *(buffer + x) != '='; ++x) ;
 if(*(buffer + x) != '=')
 continue;
-for(++x; *(buffer+x) == '\t' || *(buffer+x) == ' '; ++x);
+for(++x; *(buffer+x) == '\t' || *(buffer+x) == ' '; ++x) ;
 char quote = 0;
 if(*(buffer+x) == '\'' || *(buffer+x) == '"') {
 quote = *(buffer + x);
 ++x;
 }
 //### do this
 }
 }
 }
 int inc_len = 0;
-for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len);
+for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len) ;
 *(buffer + x + inc_len) = '\0';
 inc = buffer + x;
 }
 }
 //read past new line now..
-for(; x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x);
+for(; x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x) ;
 ++line_count;
 } else if(file->type == QMakeSourceFileInfo::TYPE_QRC) {
 } else if(file->type == QMakeSourceFileInfo::TYPE_C) {
 for(int beginning=1; x < buffer_len; ++x) {
 // whitespace comments and line-endings
 // keep going
 } else if(*(buffer+x) == '/') {
 ++x;
 if(buffer_len >= x) {
 if(*(buffer+x) == '/') { //c++ style comment
-for(; x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x);
+for(; x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x) ;
 beginning = 1;
 } else if(*(buffer+x) == '*') { //c style comment
 for(++x; x < buffer_len; ++x) {
 if(*(buffer+x) == '*') {
 if(x < buffer_len-1 && *(buffer + (x+1)) == '/') {
 while(x+keyword_len < buffer_len) {
 if(((*(buffer+x+keyword_len) < 'a' || *(buffer+x+keyword_len) > 'z')) &&
 *(buffer+x+keyword_len) != '_') {
 for(x+=keyword_len; //skip spaces after keyword
 x < buffer_len && (*(buffer+x) == ' ' || *(buffer+x) == '\t');
-x++);
+x++) ;
 break;
 } else if(qmake_endOfLine(*(buffer+x+keyword_len))) {
 x += keyword_len-1;
 keyword_len = 0;
 break;
 continue;
 }
 x++;
 int inc_len;
-for(inc_len = 0; *(buffer + x + inc_len) != term && !qmake_endOfLine(*(buffer + x + inc_len)); ++inc_len);
+for(inc_len = 0; *(buffer + x + inc_len) != term && !qmake_endOfLine(*(buffer + x + inc_len)); ++inc_len) ;
 *(buffer + x + inc_len) = '\0';
 inc = buffer + x;
 x += inc_len;
 } else if(keyword_len == 13 && !strncmp(keyword, "qmake_warning", keyword_len)) {
 char term = 0;
 if(term)
 x++;
 int msg_len;
 for(msg_len = 0; (term && *(buffer + x + msg_len) != term) &&
-!qmake_endOfLine(*(buffer + x + msg_len)); ++msg_len);
+!qmake_endOfLine(*(buffer + x + msg_len)); ++msg_len) ;
 *(buffer + x + msg_len) = '\0';
 debug_msg(0, "%s:%d %s -- %s", file->file.local().toLatin1().constData(), line_count, keyword, buffer+x);
 x += msg_len;
 } else if(*(buffer+x) == '\'' || *(buffer+x) == '"') {
 const char term = *(buffer+(x++));
 if(fd == -1 || fstat(fd, &fst) || S_ISDIR(fst.st_mode))
 return false; //shouldn't happen
 buffer = getBuffer(fst.st_size);
 for(int have_read = buffer_len = 0;
 (have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len));
-buffer_len += have_read);
+buffer_len += have_read) ;
 QT_CLOSE(fd);
 }
 debug_msg(2, "findMocs: %s", file->file.local().toLatin1().constData());
 int line_count = 1;
 for(int x = 0; x < buffer_len; x++) {
 if(*(buffer + x) == '/') {
 ++x;
 if(buffer_len >= x) {
 if(*(buffer + x) == '/') { //c++ style comment
-for(;x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x);
+for(;x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x) ;
 } else if(*(buffer + x) == '*') { //c style comment
 for(++x; x < buffer_len; ++x) {
 if(*(buffer + x) == 't' || *(buffer + x) == 'q') { //ignore
 if(buffer_len >= (x + 20) &&
 !strncmp(buffer + x + 1, "make ignore Q_OBJECT", 20)) {

changeset 7	f7bc934e204c
parent 0	1918ee327afb