Changeset 769 for trunk/qmake/generators/makefiledeps.cpp
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/qmake/generators/makefiledeps.cpp
r651 r769 398 398 for(int have_read = 0; 399 399 (have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len)); 400 buffer_len += have_read) ;400 buffer_len += have_read); 401 401 QT_CLOSE(fd); 402 402 } … … 419 419 if(buffer_len >= x + 12 && !strncmp(buffer + x, "includehint", 11) && 420 420 (*(buffer + x + 11) == ' ' || *(buffer + x + 11) == '>')) { 421 for(x += 11; *(buffer + x) != '>'; ++x) ;421 for(x += 11; *(buffer + x) != '>'; ++x); 422 422 int inc_len = 0; 423 for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len) ;423 for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len); 424 424 *(buffer + x + inc_len) = '\0'; 425 425 inc = buffer + x; 426 426 } else if(buffer_len >= x + 13 && !strncmp(buffer + x, "customwidget", 12) && 427 427 (*(buffer + x + 12) == ' ' || *(buffer + x + 12) == '>')) { 428 for(x += 13; *(buffer + x) != '>'; ++x) ; //skip up to >428 for(x += 13; *(buffer + x) != '>'; ++x); //skip up to > 429 429 while(x < buffer_len) { 430 for(x++; *(buffer + x) != '<'; ++x) ; //skip up to <430 for(x++; *(buffer + x) != '<'; ++x); //skip up to < 431 431 x++; 432 432 if(buffer_len >= x + 7 && !strncmp(buffer+x, "header", 6) && 433 433 (*(buffer + x + 6) == ' ' || *(buffer + x + 6) == '>')) { 434 for(x += 7; *(buffer + x) != '>'; ++x) ; //skip up to >434 for(x += 7; *(buffer + x) != '>'; ++x); //skip up to > 435 435 int inc_len = 0; 436 for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len) ;436 for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len); 437 437 *(buffer + x + inc_len) = '\0'; 438 438 inc = buffer + x; … … 449 449 if(buffer_len >= x + 9 && *(buffer + x) == 'i' && 450 450 !strncmp(buffer + x, "impldecl", 8)) { 451 for(x += 8; *(buffer + x) != '='; ++x) ;451 for(x += 8; *(buffer + x) != '='; ++x); 452 452 if(*(buffer + x) != '=') 453 453 continue; 454 for(++x; *(buffer+x) == '\t' || *(buffer+x) == ' '; ++x) ;454 for(++x; *(buffer+x) == '\t' || *(buffer+x) == ' '; ++x); 455 455 char quote = 0; 456 456 if(*(buffer+x) == '\'' || *(buffer+x) == '"') { … … 476 476 } 477 477 int inc_len = 0; 478 for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len) ;478 for(x += 1 ; *(buffer + x + inc_len) != '<'; ++inc_len); 479 479 *(buffer + x + inc_len) = '\0'; 480 480 inc = buffer + x; … … 482 482 } 483 483 //read past new line now.. 484 for(; x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x) ;484 for(; x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x); 485 485 ++line_count; 486 486 } else if(file->type == QMakeSourceFileInfo::TYPE_QRC) { … … 495 495 if(buffer_len >= x) { 496 496 if(*(buffer+x) == '/') { //c++ style comment 497 for(; x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x) ;497 for(; x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x); 498 498 beginning = 1; 499 499 } else if(*(buffer+x) == '*') { //c style comment … … 559 559 for(x+=keyword_len; //skip spaces after keyword 560 560 x < buffer_len && (*(buffer+x) == ' ' || *(buffer+x) == '\t'); 561 x++) ;561 x++); 562 562 break; 563 563 } else if(qmake_endOfLine(*(buffer+x+keyword_len))) { … … 580 580 581 581 int inc_len; 582 for(inc_len = 0; *(buffer + x + inc_len) != term && !qmake_endOfLine(*(buffer + x + inc_len)); ++inc_len) ;582 for(inc_len = 0; *(buffer + x + inc_len) != term && !qmake_endOfLine(*(buffer + x + inc_len)); ++inc_len); 583 583 *(buffer + x + inc_len) = '\0'; 584 584 inc = buffer + x; … … 595 595 int msg_len; 596 596 for(msg_len = 0; (term && *(buffer + x + msg_len) != term) && 597 !qmake_endOfLine(*(buffer + x + msg_len)); ++msg_len) ;597 !qmake_endOfLine(*(buffer + x + msg_len)); ++msg_len); 598 598 *(buffer + x + msg_len) = '\0'; 599 599 debug_msg(0, "%s:%d %s -- %s", file->file.local().toLatin1().constData(), line_count, keyword, buffer+x); … … 707 707 for(int have_read = buffer_len = 0; 708 708 (have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len)); 709 buffer_len += have_read) ;709 buffer_len += have_read); 710 710 QT_CLOSE(fd); 711 711 } … … 721 721 if(buffer_len >= x) { 722 722 if(*(buffer + x) == '/') { //c++ style comment 723 for(;x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x) ;723 for(;x < buffer_len && !qmake_endOfLine(*(buffer + x)); ++x); 724 724 } else if(*(buffer + x) == '*') { //c style comment 725 725 for(++x; x < buffer_len; ++x) {
Note:
See TracChangeset
for help on using the changeset viewer.