fix all loops with empty bodyr14.1.x

Signed-off-by: Denis Kozadaev <denis@dilos.org>
(cherry picked from commit 37a07263c70308f7ddef4aac747446d5ede82374)

1 files changed, 60 insertions, 15 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index f9b179f44..87595038b 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -129,7 +129,10 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
     for(int have_read = total_size_read = 0;
 	(have_read = read(file, big_buffer + total_size_read,
 			  fst.st_size - total_size_read));
-	total_size_read += have_read);
+	total_size_read += have_read)
+    {
+	; // empty body
+    }
     close(file);
 
     bool ignore_qobject = false;
@@ -144,7 +147,10 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 	    x++;
 	    if(total_size_read >= x) {
 		if(*(big_buffer + x) == '/') { //c++ style comment
-		    for( ;x < total_size_read && !QMAKE_EOL(*(big_buffer + x)); x++);
+		    for( ;x < total_size_read && !QMAKE_EOL(*(big_buffer + x)); x++)
+		    {
+			; // empty body
+		    }
 		    line_count++;
 		} else if(*(big_buffer + x) == '*') { //c style comment
 		    for( ;x < total_size_read; x++) {
@@ -275,7 +281,10 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
     for(int have_read = total_size_read = 0;
 	(have_read = read(file, big_buffer + total_size_read,
 			  fst.st_size - total_size_read));
-	total_size_read += have_read);
+	total_size_read += have_read)
+    {
+	; // empty body
+    }
     close(file);
 
     bool ui_file = fn.endsWith(Option::ui_ext);
@@ -315,7 +324,10 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 		    *(big_buffer + x + 7) == '<' || *(big_buffer + x + 7) == '"')) {
 		    for(x+=7; //skip spaces after keyword
 			x < total_size_read && (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t');
-			x++);
+			x++)
+		    {
+			; // empty body
+		    }
 		    char term = *(big_buffer + x);
 		    if(term == '"');
 		    else if(term == '<')
@@ -326,13 +338,19 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 
 		    int inc_len;
 		    for(inc_len = 0; *(big_buffer + x + inc_len) != term &&
-                                     !QMAKE_EOL(*(big_buffer + x + inc_len)); inc_len++);
+                                     !QMAKE_EOL(*(big_buffer + x + inc_len)); inc_len++)
+		    {
+			; // empty body
+		    }
 		    *(big_buffer + x + inc_len) = '\0';
 		    inc = big_buffer + x;
 		} else if(total_size_read >= x + 14 && !strncmp(big_buffer + x,  "qmake_warning ", 14)) {
 		    for(x+=14; //skip spaces after keyword
 			x < total_size_read && (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t');
-			x++);
+			x++)
+		    {
+			; // empty body
+		    }
 		    char term = 0;
 		    if(*(big_buffer + x) == '"')
 			term = '"';
@@ -343,7 +361,10 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 
 		    int msg_len;
 		    for(msg_len = 0; (term && *(big_buffer + x + msg_len) != term) &&
-                                     !QMAKE_EOL(*(big_buffer + x + msg_len)); msg_len++);
+                                     !QMAKE_EOL(*(big_buffer + x + msg_len)); msg_len++)
+		    {
+			; // empty body
+		    }
                     const char saved_term = *(big_buffer + x + msg_len);
 		    *(big_buffer + x + msg_len) = '\0';
 		    TQString msg = big_buffer + x;
@@ -361,15 +382,27 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 		x++;
 		if(total_size_read >= x + 13 && !strncmp(big_buffer + x, "customwidget", 12) &&
 			  (*(big_buffer + x + 12) == ' ' || *(big_buffer + x + 12) == '>')) {
-		    for(x += 13; *(big_buffer + x) != '>'; x++); //skip up to >
+		    for(x += 13; *(big_buffer + x) != '>'; x++) //skip up to >
+		    {
+			; // empty body
+		    }
 		    while(x < total_size_read) {
-			for(x++; *(big_buffer + x) != '<'; x++); //skip up to <
+			for(x++; *(big_buffer + x) != '<'; x++) //skip up to <
+			{
+			    ; // empty body
+			}
 			x++;
 			if(total_size_read >= x + 7 && !strncmp(big_buffer+x, "header", 6) &&
 			   (*(big_buffer + x + 6) == ' ' || *(big_buffer + x + 6) == '>')) {
-			    for(x += 7; *(big_buffer + x) != '>'; x++); //skip up to >
+			    for(x += 7; *(big_buffer + x) != '>'; x++) //skip up to >
+			    {
+				; // empty body
+			    }
 			    int inc_len = 0;
-			    for(x += 1 ; *(big_buffer + x + inc_len) != '<'; inc_len++);
+			    for(x += 1 ; *(big_buffer + x + inc_len) != '<'; inc_len++)
+			    {
+				; // empty body
+			    }
 			    *(big_buffer + x + inc_len) = '\0';
 			    inc = big_buffer + x;
 			    break;
@@ -384,10 +417,16 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 		    for(x += 8; *(big_buffer + x) != '>'; x++) {
 			if(total_size_read >= x + 9 && *(big_buffer + x) == 'i' &&
 			   !strncmp(big_buffer + x, "impldecl", 8)) {
-			    for(x += 8; *(big_buffer + x) != '='; x++);
+			    for(x += 8; *(big_buffer + x) != '='; x++)
+			    {
+				; // empty body
+			    }
 			    if(*(big_buffer + x) != '=')
 				continue;
-			    for(x++; *(big_buffer+x) == '\t' || *(big_buffer+x) == ' '; x++);
+			    for(x++; *(big_buffer+x) == '\t' || *(big_buffer+x) == ' '; x++)
+			    {
+				; // empty body
+			    }
 			    char quote = 0;
 			    if(*(big_buffer+x) == '\'' || *(big_buffer+x) == '"') {
 				quote = *(big_buffer + x);
@@ -415,7 +454,10 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 			}
 		    }
 		    int inc_len = 0;
-		    for(x += 1 ; *(big_buffer + x + inc_len) != '<'; inc_len++);
+		    for(x += 1 ; *(big_buffer + x + inc_len) != '<'; inc_len++)
+		    {
+			; // empty body
+		    }
 		    *(big_buffer + x + inc_len) = '\0';
 		    inc = big_buffer + x;
 		}
@@ -593,7 +635,10 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 		outdeps->append(fqn);
 	}
 	//read past new line now..
-	for( ; x < total_size_read && !QMAKE_EOL(*(big_buffer + x)); x++);
+	for( ; x < total_size_read && !QMAKE_EOL(*(big_buffer + x)); x++)
+	{
+	    ; // empty body
+	}
         line_count++;
     }