Replace TRUE/FALSE with boolean values true/false - part 2

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c03a4800879ab62692e017e01c825ba12a421ad0)

8 files changed, 140 insertions, 140 deletions

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 069524314..2ff61c2c8 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -44,7 +44,7 @@
 #include <time.h>
 
 
-MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(false)
 {
     Option::obj_ext = ".o";
 }
@@ -52,7 +52,7 @@ MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32Makefile
 bool
 MingwMakefileGenerator::findLibraries() // todo - pascal
 {
-    return TRUE;
+    return true;
 }
 
 bool
@@ -65,7 +65,7 @@ MingwMakefileGenerator::writeMakefile(TQTextStream &t)
 	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
 	  << "@echo \"Skipped.\"" << endl << endl;
 	writeMakeQmake(t);
-	return TRUE;
+	return true;
     }
 
     if(project->first("TEMPLATE") == "app" ||
@@ -75,9 +75,9 @@ MingwMakefileGenerator::writeMakefile(TQTextStream &t)
     }
     else if(project->first("TEMPLATE") == "subdirs") {
 	writeSubDirs(t);
-	return TRUE;
+	return true;
     }
-    return FALSE;
+    return false;
  }
 
 void createLdObjectScriptFile(const TQString & fileName, TQStringList & objList)
@@ -136,15 +136,15 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t)
 	t << "LIB	=	" << var("QMAKE_LIB") << endl;
     }
     t << "MOC		=	" << (project->isEmpty("QMAKE_MOC") ? TQString("moc") :
-			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), false)) << endl;
     t << "UIC		=	" << (project->isEmpty("QMAKE_UIC") ? TQString("uic") :
-			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), false)) << endl;
     t << "QMAKE		=	" << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") :
-			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), false)) << endl;
     t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? TQString("idc") :
-			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), false)) << endl;
     t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? TQString("midl") :
-			      Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_IDL"), false)) << endl;
     t << "ZIP		=	" << var("QMAKE_ZIP") << endl;
     t << "DEF_FILE      =	" << varList("DEF_FILE") << endl;
     t << "COPY_FILE	=       " << var("QMAKE_COPY") << endl;
@@ -333,7 +333,7 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t)
 	    TQStringList &inputs = project->variables()[(*it2)];
 	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
-		TQString in = Option::fixPathToTargetOS((*input), FALSE),
+		TQString in = Option::fixPathToTargetOS((*input), false),
 		       out = tmp_out, cmd = tmp_cmd, deps;
 		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
 		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
@@ -376,7 +376,7 @@ MingwMakefileGenerator::init()
 {
     if(init_flag)
 	return;
-    init_flag = TRUE;
+    init_flag = true;
 
     /* this should probably not be here, but I'm using it to wrap the .t files */
     if(project->first("TEMPLATE") == "app")
@@ -602,7 +602,7 @@ MingwMakefileGenerator::init()
     }
 
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setMocAware(true);
 
     // add -L libs to libdir
     TQStringList &libs = project->variables()["QMAKE_LIBS"];
@@ -622,7 +622,7 @@ MingwMakefileGenerator::init()
     for(it = l.begin(); it != l.end(); ++it) {
 	TQStringList &gdmf = project->variables()[(*it)];
 	for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
-	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+	    (*inner) = Option::fixPathToTargetOS((*inner), false);
     }
 
     if ( project->isActiveConfig("dll") ) {
@@ -686,7 +686,7 @@ MingwMakefileGenerator::init()
 	    TQStringList &inputs = project->variables()[(*it2)];
 	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
-		TQString in = Option::fixPathToTargetOS((*input), FALSE),
+		TQString in = Option::fixPathToTargetOS((*input), false),
 		       out = tmp_out;
 		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
 		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
@@ -704,7 +704,7 @@ MingwMakefileGenerator::writeSubDirs(TQTextStream &t)
     TQTextStream ts (&qs, IO_WriteOnly) ;
     Win32MakefileGenerator::writeSubDirs( ts ) ;
     TQRegExp rx("(\\n\\tcd [^\\n\\t]+)(\\n\\t.+)\\n\\t@cd ..") ;
-    rx.setMinimal(TRUE);
+    rx.setMinimal(true);
     int pos = 0 ;
     while ( -1 != (pos = rx.search( qs, pos)))
     {
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 6b6b8fdbd..962db7229 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-DspMakefileGenerator::DspMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+DspMakefileGenerator::DspMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(false)
 {
 
 }
@@ -55,7 +55,7 @@ DspMakefileGenerator::writeMakefile(TQTextStream &t)
 	/* for now just dump, I need to generated an empty dsp or something.. */
 	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
 		var("QMAKE_FAILED_REQUIREMENTS").latin1());
-	return TRUE;
+	return true;
     }
 
     if(project->first("TEMPLATE") == "vcapp" ||
@@ -65,9 +65,9 @@ DspMakefileGenerator::writeMakefile(TQTextStream &t)
     else if(project->first("TEMPLATE") == "subdirs") {
 	writeHeader(t);
 	writeSubDirs(t);
-	return TRUE;
+	return true;
     }
-    return FALSE;
+    return false;
 }
 
 bool
@@ -86,7 +86,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
     TQFile file(dspfile_loc);
     if(!file.open(IO_ReadOnly)) {
 	fprintf(stderr, "Cannot open dsp file: %s\n", dspfile.latin1());
-	return FALSE;
+	return false;
     }
     TQTextStream dsp(&file);
 
@@ -374,7 +374,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		f.close();
 
 		// create an output step for images not more than once
-		bool imagesBuildDone = FALSE;
+		bool imagesBuildDone = false;
 		for( it = list.begin(); it != list.end(); ++it ) {
 //		    beginGroupForFile((*it), t);
 		    t << "# Begin Source File\n\nSOURCE=" << (*it) << endl;
@@ -384,7 +384,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 		    uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " ";
 
 		    if ( !imagesBuildDone ) {
-			imagesBuildDone = TRUE;
+			imagesBuildDone = true;
 			TQString build = "\n\n# Begin Custom Build - Creating image collection...\n"
 			    "InputPath=.\\" + base + "\n\n";
 
@@ -577,7 +577,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
     }
     t << endl;
     file.close();
-    return TRUE;
+    return true;
 }
 
 
@@ -588,7 +588,7 @@ DspMakefileGenerator::init()
     if(init_flag)
 	return;
     TQStringList::Iterator it;
-    init_flag = TRUE;
+    init_flag = true;
 
     const bool thread = project->isActiveConfig("thread");
 
@@ -824,7 +824,7 @@ DspMakefileGenerator::init()
     TQString targetfilename = project->variables()["TARGET"].first();
     project->variables()["TARGET"].first() += project->first("TARGET_EXT");
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setMocAware(true);
 
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
     project->variables()["QMAKE_FILETAGS"] += TQStringList::split(' ',
@@ -833,7 +833,7 @@ DspMakefileGenerator::init()
     for(it = l.begin(); it != l.end(); ++it) {
 	TQStringList &gdmf = project->variables()[(*it)];
 	for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
-	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+	    (*inner) = Option::fixPathToTargetOS((*inner), false);
     }
 
     MakefileGenerator::init();
@@ -1061,7 +1061,7 @@ DspMakefileGenerator::beginGroupForFile(TQString file, TQTextStream &t,
 {
     if(project->isActiveConfig("flat"))
 	return;
-    fileFixify(file, TQDir::currentDirPath(), TQDir::currentDirPath(), TRUE);
+    fileFixify(file, TQDir::currentDirPath(), TQDir::currentDirPath(), true);
     file = file.section(Option::dir_sep, 0, -2);
     if(file.right(Option::dir_sep.length()) != Option::dir_sep)
 	file += Option::dir_sep;
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index a1ada25f5..145ee41e0 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-NmakeMakefileGenerator::NmakeMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+NmakeMakefileGenerator::NmakeMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(false)
 {
 
 }
@@ -64,7 +64,7 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t)
 	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
 	  << "@echo \"Skipped.\"" << endl << endl;
 	writeMakeQmake(t);
-	return TRUE;
+	return true;
     }
 
     if(project->first("TEMPLATE") == "app" ||
@@ -74,9 +74,9 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t)
     }
     else if(project->first("TEMPLATE") == "subdirs") {
 	writeSubDirs(t);
-	return TRUE;
+	return true;
     }
-    return FALSE;
+    return false;
 }
 
 TQStringList
@@ -146,15 +146,15 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
 	t << "LIB	=	" << var("QMAKE_LIB") << endl;
     }
     t << "MOC		=	" << (project->isEmpty("QMAKE_MOC") ? TQString("moc") :
-			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), false)) << endl;
     t << "UIC		=	" << (project->isEmpty("QMAKE_UIC") ? TQString("uic") :
-			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), false)) << endl;
     t << "QMAKE		=	" << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") :
-			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), false)) << endl;
     t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? TQString("idc") :
-			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), false)) << endl;
     t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? TQString("midl") :
-			      Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl;
+			      Option::fixPathToTargetOS(var("QMAKE_IDL"), false)) << endl;
     t << "ZIP		=	" << var("QMAKE_ZIP") << endl;
     t << "COPY_FILE	=       " << var("QMAKE_COPY") << endl;
     t << "COPY_DIR	=       " << var("QMAKE_COPY") << endl;
@@ -377,7 +377,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t)
 	    TQStringList &inputs = project->variables()[(*it2)];
 	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
-		TQString in = Option::fixPathToTargetOS((*input), FALSE),
+		TQString in = Option::fixPathToTargetOS((*input), false),
 		       out = tmp_out, cmd = tmp_cmd, deps;
 		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
 		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
@@ -461,7 +461,7 @@ NmakeMakefileGenerator::init()
 {
     if(init_flag)
 	return;
-    init_flag = TRUE;
+    init_flag = true;
 
     /* this should probably not be here, but I'm using it to wrap the .t files */
     if(project->first("TEMPLATE") == "app")
@@ -680,7 +680,7 @@ NmakeMakefileGenerator::init()
 
 
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setMocAware(true);
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
 
     TQStringList &libList = project->variables()["QMAKE_LIBS"];
@@ -704,7 +704,7 @@ NmakeMakefileGenerator::init()
     for(it = l.begin(); it != l.end(); ++it) {
 	TQStringList &gdmf = project->variables()[(*it)];
 	for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
-	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+	    (*inner) = Option::fixPathToTargetOS((*inner), false);
     }
 
     if ( !project->variables()["DEF_FILE"].isEmpty() )
@@ -780,7 +780,7 @@ NmakeMakefileGenerator::init()
 	    TQStringList &inputs = project->variables()[(*it2)];
 	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
 		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
-		TQString in = Option::fixPathToTargetOS((*input), FALSE),
+		TQString in = Option::fixPathToTargetOS((*input), false),
 		       out = tmp_out;
 		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
 		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 13dd83390..3e20838d5 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -476,25 +476,25 @@ bool VCCLCompilerTool::parseOption( const char* option )
     char second = option[2];
     char third  = option[3];
     char fourth = option[4];
-    bool found = TRUE;
+    bool found = true;
 
     switch ( first ) {
     case '?':
     case 'h':
 	tqWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
-	found = FALSE;
+	found = false;
 	break;
     case '@':
 	tqWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
-	found = FALSE;
+	found = false;
 	break;
     case 'l':
 	tqWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
-	found = FALSE;
+	found = false;
 	break;
     case 'A':
 	if ( second != 'I' ) {
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	AdditionalUsingDirectories += option+3;
 	break;
@@ -520,7 +520,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		AdditionalOptions += option;
 		break;
 	    }
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	GeneratePreprocessedFile = preprocessYes;
 	break;
@@ -577,7 +577,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		ExpandAttributedSource = _True;
 		break;
 	    default:
-		found = FALSE; break;
+		found = false; break;
 	    }
 	}
 	break;
@@ -586,7 +586,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	case '3':
 	case '4':
 	    tqWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
-	    found = FALSE; break;
+	    found = false; break;
         case '5':
 	    OptimizeForProcessor = procOptimizePentium;
 	    break;
@@ -655,7 +655,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    CallingConvention = callConventionStdCall;
 	    break;
 	default:
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	break;
     case 'H':
@@ -669,7 +669,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    AdditionalOptions += option;
 	    break;
 	}
-	found = FALSE; break;
+	found = false; break;
     case 'M':
 	if ( second == 'D' ) {
 	    RuntimeLibrary = rtMultiThreadedDLL;
@@ -687,7 +687,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		RuntimeLibrary = rtMultiThreadedDebug;
 	    break;
 	}
-	found = FALSE; break;
+	found = false; break;
     case 'O':
 	switch ( second ) {
 	case '1':
@@ -707,7 +707,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    else if ( third == '2' )
 		InlineFunctionExpansion = expandAnySuitable;
 	    else
-		found = FALSE;
+		found = false;
 	    break;
 	case 'd':
 	    Optimization = optimizeDisabled;
@@ -741,7 +741,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		OmitFramePointers = _False;
 	    break;
 	default:
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	break;
     case 'P':
@@ -752,7 +752,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    AdditionalOptions += option;
 	    break;
 	}
-	found = FALSE; break;
+	found = false; break;
     case 'R':
 	if ( second == 'T' && third == 'C' ) {
 	    if ( fourth == '1' )
@@ -764,7 +764,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    else if ( fourth == 'u' )
 		BasicRuntimeChecks = runtimeCheckUninitVariables;
 	    else
-		found = FALSE; break;
+		found = false; break;
 	}
 	break;
     case 'T':
@@ -774,7 +774,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    CompileAs = compileAsCPlusPlus;
 	} else {
 	    tqWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	break;
     case 'U':
@@ -814,7 +814,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    }
 	    // Fallthrough
 	default:
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	break;
     case 'X':
@@ -843,7 +843,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    PrecompiledHeaderFile = option+3;
 	    break;
 	default:
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	break;
     case 'Z':
@@ -876,9 +876,9 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		else if ( fourth == 'w' )
 		    TreatWChar_tAsBuiltInType = _True;
 		else
-		    found = FALSE;
+		    found = false;
 	    } else {
-		found = FALSE; break;
+		found = false; break;
 	    }
 	    break;
 	case 'g':
@@ -905,11 +905,11 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		StructMemberAlignment = alignEightBytes;
 		break;
 	    default:
-		found = FALSE; break;
+		found = false; break;
 	    }
 	    break;
 	default:
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	break;
     case 'c':
@@ -923,12 +923,12 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		CompileAsManaged = managedAssembly;
 	    }
 	} else {
-	    found = FALSE; break;
+	    found = false; break;
 	}
 	break;
     case 'd':
 	if ( second != 'r' ) {
-	    found = FALSE; break;
+	    found = false; break;
 	}
         CompileAsManaged = managedAssembly;
 	break;
@@ -941,19 +941,19 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    SuppressStartupBanner = _True;
 	    break;
 	}
-	found = FALSE; break;
+	found = false; break;
     case 'o':
         if ( second == 'p' && third == 'e' && fourth == 'n' ) {
             OpenMP = _True;
             break;
         }
-	found = FALSE; break;
+	found = false; break;
     case 's':
 	if ( second == 'h' && third == 'o' && fourth == 'w' ) {
 	    ShowIncludes = _True;
 	    break;
 	}
-	found = FALSE; break;
+	found = false; break;
     case 'u':
 	UndefineAllPreprocessorDefinitions = _True;
 	break;
@@ -962,7 +962,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    AdditionalOptions += option;
 	    break;
 	}
-	found = FALSE; break;
+	found = false; break;
     case 'w':
 	switch ( second ) {
 	case '\0':
@@ -976,11 +976,11 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	}
 	break;
     default:
-	found = FALSE; break;
+	found = false; break;
     }
     if( !found )
 	warn_msg( WarnLogic, "Could not parse Compiler option: %s", option );
-    return TRUE;
+    return true;
 }
 
 // VCLinkerTool -----------------------------------------------------
@@ -1147,7 +1147,7 @@ bool VCLinkerTool::parseOption( const char* option )
     displayHash( "CONSOLE" ); displayHash( "EFI_APPLICATION" ); displayHash( "EFI_BOOT_SERVICE_DRIVER" ); displayHash( "EFI_ROM" ); displayHash( "EFI_RUNTIME_DRIVER" ); displayHash( "NATIVE" );
     displayHash( "POSIX" ); displayHash( "WINDOWS" ); displayHash( "WINDOWSCE" ); displayHash( "NET" ); displayHash( "CD" ); displayHash( "NO" );
 #endif
-    bool found = TRUE;
+    bool found = true;
     switch ( elfHash(option) ) {
     case 0x3360dbe: // /ALIGN[:number]
     case 0x1485c34: // /ALLOWBIND[:NO]
@@ -1265,7 +1265,7 @@ bool VCLinkerTool::parseOption( const char* option )
 	    TargetMachine = machineX86;
 	    break;
 	default:
-	    found = FALSE;
+	    found = false;
 	}
 	break;
     case 0x0034160: // /MAP[:filename]
@@ -1324,7 +1324,7 @@ bool VCLinkerTool::parseOption( const char* option )
 		OptimizeForWindows98 = optWin98No;
 		break;
 	    default:
-		found = FALSE;
+		found = false;
 	    }
 	}
 	break;
@@ -1373,7 +1373,7 @@ bool VCLinkerTool::parseOption( const char* option )
 		AdditionalOptions += option;
 		break;
 	    default:
-		found = FALSE;
+		found = false;
 	    }
 	}
 	break;
@@ -1383,7 +1383,7 @@ bool VCLinkerTool::parseOption( const char* option )
 	else if ( *(option+9) == 'C' )
 	    SwapRunFromCD = _True;
 	else
-	    found = FALSE;
+	    found = false;
 	break;
     case 0x34906d4: // /TLBID:id
 	TypeLibraryResourceID = TQString( option+7 ).toLong();
@@ -1409,7 +1409,7 @@ bool VCLinkerTool::parseOption( const char* option )
 	Version = option+9;
 	break;
     default:
-	found = FALSE;
+	found = false;
     }
     if( !found )
 	warn_msg( WarnLogic, "Could not parse Linker options: %s", option );
@@ -1506,7 +1506,7 @@ bool VCMIDLTool::parseOption( const char* option )
     displayHash( "/target {system}" ); displayHash( "/tlb filename" ); displayHash( "/use_epv" );
     displayHash( "/win32" ); displayHash( "/win64" );
 #endif
-    bool found = TRUE;
+    bool found = true;
     int offset = 0;
     switch( elfHash(option) ) {
     case 0x0000334: // /D name[=def]
@@ -1542,7 +1542,7 @@ bool VCMIDLTool::parseOption( const char* option )
 	    StructMemberAlignment = midlAlignEightBytes;
 	    break;
 	default:
-	    found = FALSE;
+	    found = false;
 	}
 	break;
     case 0x0359e82: // /char {ascii7|signed|unsigned}
@@ -1557,7 +1557,7 @@ bool VCMIDLTool::parseOption( const char* option )
 	    DefaultCharType = midlCharUnsigned;
 	    break;
 	default:
-	    found = FALSE;
+	    found = false;
 	}
 	break;
     case 0xa766524: // /cpp_opt options
@@ -1594,7 +1594,7 @@ bool VCMIDLTool::parseOption( const char* option )
 	    ErrorCheckStubData = _True;
 	    break;
 	default:
-	    found = FALSE;
+	    found = false;
 	}
 	break;
     case 0x5eb7af2: // /header filename
@@ -1699,14 +1699,14 @@ bool VCMIDLTool::parseOption( const char* option )
 		WarningLevel = midlWarningLevel_4;
 		break;
 	    default:
-		found = FALSE;
+		found = false;
 	    }
 	}
 	break;
     }
     if( !found )
 	warn_msg( WarnLogic, "Could not parse MIDL option: %s", option );
-    return TRUE;
+    return true;
 }
 
 // VCLibrarianTool --------------------------------------------------
@@ -1877,8 +1877,8 @@ TQTextStream &operator<<( TQTextStream &strm, const VCConfiguration &tool )
 VCFilter::VCFilter()
     :   ParseFiles( unset )
 {
-    useCustomBuildTool = FALSE;
-    useCompilerTool = FALSE;
+    useCustomBuildTool = false;
+    useCompilerTool = false;
 }
 
 void VCFilter::addMOCstage( TQTextStream & /*strm*/, TQString filename )
@@ -1899,7 +1899,7 @@ void VCFilter::addMOCstage( TQTextStream & /*strm*/, TQString filename )
 	return;
 
     CustomBuildTool = VCCustomBuildTool();
-    useCustomBuildTool = TRUE;
+    useCustomBuildTool = true;
     CustomBuildTool.Description = "Moc&apos;ing " + filename + "...";
     CustomBuildTool.CommandLine += (mocApp + " "
 				+ filename + " -o " + mocOutput);
@@ -1912,7 +1912,7 @@ void VCFilter::addMOCstage( TQTextStream & /*strm*/, TQString filename )
 void VCFilter::addUICstage( TQTextStream & /*strm*/, TQString str )
 {
     CustomBuildTool = VCCustomBuildTool();
-    useCustomBuildTool = TRUE;
+    useCustomBuildTool = true;
 
     TQString uicApp = Project->var("QMAKE_UIC");
     TQString mocApp = Project->var( "QMAKE_MOC" );
@@ -1972,7 +1972,7 @@ void VCFilter::modifyPCHstage( TQTextStream &/*strm*/, TQString str )
 	return;
 
     CompilerTool = VCCLCompilerTool();
-    useCompilerTool = TRUE;
+    useCompilerTool = true;
 
     // Unset some default options
     CompilerTool.BufferSecurityCheck = unset;
@@ -1992,23 +1992,23 @@ void VCFilter::modifyPCHstage( TQTextStream &/*strm*/, TQString str )
 
 bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str )
 {
-    bool isCorH = FALSE;
+    bool isCorH = false;
     if (str.endsWith(".c") || str.endsWith(".rc"))
-	isCorH = TRUE;
+	isCorH = true;
     TQStringList::Iterator it;
     for(it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it)
 	if(str.endsWith(*it))
-	    isCorH = TRUE;
+	    isCorH = true;
     for(it = Option::h_ext.begin(); it != Option::h_ext.end(); ++it)
 	if(str.endsWith(*it))
-	    isCorH = TRUE;
+	    isCorH = true;
 
     TQString collectionName = Project->project->first("QMAKE_IMAGE_COLLECTION");
     if (str.isEmpty() || isCorH || collectionName.isEmpty())
-	return FALSE;
+	return false;
 
     CustomBuildTool = VCCustomBuildTool();
-    useCustomBuildTool = TRUE;
+    useCustomBuildTool = true;
 
     // Some projects (like designer core) may have too many images to
     // call uic directly. Therefor we have to create a temporary
@@ -2016,7 +2016,7 @@ bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str )
     TQString tmpFileCmd = "echo ";
     TQString tmpImageFilename = ".imgcol";
     TQStringList& list = Project->project->variables()["IMAGES"];
-    bool firstOutput = TRUE;
+    bool firstOutput = true;
     it = list.begin();
     while( it!=list.end() ) {
 	tmpFileCmd += (*it) + " ";
@@ -2026,7 +2026,7 @@ bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str )
 					  + (firstOutput?"> ":">> ")
 					  + tmpImageFilename;
 	    tmpFileCmd = "echo ";
-	    firstOutput = FALSE;
+	    firstOutput = false;
 	}
     }
 
@@ -2056,14 +2056,14 @@ bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str )
     CustomBuildTool.AdditionalDependencies += list;
     CustomBuildTool.Outputs = collectionName;
     CustomBuildTool.Outputs += tmpImageFilename;
-    return TRUE;
+    return true;
 }
 
 bool VCFilter::addLexYaccStage( TQTextStream &/*strm*/, TQString str )
 {
     bool doLex = str.endsWith(".l");
     if (!doLex && !str.endsWith(".y"))
-        return FALSE;
+        return false;
 
     TQString fname = "$(InputName)";
     if (doLex) {
@@ -2090,8 +2090,8 @@ bool VCFilter::addLexYaccStage( TQTextStream &/*strm*/, TQString str )
         CustomBuildTool.CommandLine += "move y.tab.c " + fname + Option::cpp_ext.first();
         CustomBuildTool.Outputs += fname + Option::cpp_ext.first();
     }
-    useCustomBuildTool = TRUE;
-    return TRUE;
+    useCustomBuildTool = true;
+    return true;
 }
 
 TQTextStream &operator<<( TQTextStream &strm, VCFilter &tool )
@@ -2105,7 +2105,7 @@ TQTextStream &operator<<( TQTextStream &strm, VCFilter &tool )
     strm << SPair( _Filter, tool.Filter );
     strm << ">";
 
-    bool resourceBuild = FALSE;
+    bool resourceBuild = false;
     int currentLevels = 0;
     TQStringList currentDirs;
     for ( TQStringList::ConstIterator it = tool.Files.begin(); it != tool.Files.end(); ++it ) {
@@ -2137,8 +2137,8 @@ TQTextStream &operator<<( TQTextStream &strm, VCFilter &tool )
 	    currentLevels = int(newDirs.count());
 	}
 
-	tool.useCustomBuildTool = FALSE;
-	tool.useCompilerTool = FALSE;
+	tool.useCustomBuildTool = false;
+	tool.useCompilerTool = false;
 	// Add UIC, MOC and PCH stages to file
 	if ( tool.CustomBuild == moc )
 	    tool.addMOCstage( strm, *it );
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 13b928974..b1721ae1e 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -605,7 +605,7 @@ public:
     // Functions
     VCLibrarianTool();
     virtual ~VCLibrarianTool(){}
-    bool parseOption( const char* ){ return FALSE; };
+    bool parseOption( const char* ){ return false; };
 
     // Variables
     TQStringList		    AdditionalDependencies;
@@ -626,7 +626,7 @@ public:
     // Functions
     VCCustomBuildTool();
     virtual ~VCCustomBuildTool(){}
-    bool parseOption( const char* ){ return FALSE; };
+    bool parseOption( const char* ){ return false; };
 
     // Variables
     TQStringList		    AdditionalDependencies;
@@ -643,7 +643,7 @@ public:
     // Functions
     VCResourceCompilerTool();
     virtual ~VCResourceCompilerTool(){}
-    bool parseOption( const char* ){ return FALSE; };
+    bool parseOption( const char* ){ return false; };
 
     // Variables
     TQStringList		    AdditionalIncludeDirectories;
@@ -663,7 +663,7 @@ protected:
     // Functions
     VCEventTool() : ExcludedFromBuild( unset ){};
     virtual ~VCEventTool(){}
-    bool parseOption( const char* ){ return FALSE; };
+    bool parseOption( const char* ){ return false; };
 
 public:
     // Variables
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 999b05f04..0127acefd 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -170,7 +170,7 @@ const char* _slnExtSections	= "\n\tGlobalSection(ExtensibilityGlobals) = postSol
 				  "\n\tEndGlobalSection";
 // ------------------------------------------------------------------
 
-VcprojGenerator::VcprojGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+VcprojGenerator::VcprojGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(false)
 {
 }
 
@@ -185,7 +185,7 @@ bool VcprojGenerator::writeMakefile(TQTextStream &t)
     if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
 		var("QMAKE_FAILED_REQUIREMENTS").latin1());
-	return TRUE;
+	return true;
     }
 
     // Generate project file
@@ -193,15 +193,15 @@ bool VcprojGenerator::writeMakefile(TQTextStream &t)
        project->first("TEMPLATE") == "vclib") {
         debug_msg(1, "Generator: MSVC.NET: Writing project file" );
 	t << vcProject;
-	return TRUE;
+	return true;
     }
     // Generate solution file
     else if(project->first("TEMPLATE") == "vcsubdirs") {
         debug_msg(1, "Generator: MSVC.NET: Writing solution file" );
 	writeSubDirs(t);
-	return TRUE;
+	return true;
     }
-    return FALSE;
+    return false;
 
 }
 
@@ -215,7 +215,7 @@ struct VcsolutionDepend {
 
 TQUuid VcprojGenerator::getProjectUUID(const TQString &filename)
 {
-    bool validUUID = TRUE;
+    bool validUUID = true;
 
     // Read GUID from variable-space
     TQUuid uuid = project->first("GUID");
@@ -295,14 +295,14 @@ void VcprojGenerator::writeSubDirs(TQTextStream &t)
     TQDict<VcsolutionDepend> solution_depends;
 
     TQPtrList<VcsolutionDepend> solution_cleanup;
-    solution_cleanup.setAutoDelete(TRUE);
+    solution_cleanup.setAutoDelete(true);
 
 
     TQStringList subdirs = project->variables()["SUBDIRS"];
     TQString oldpwd = TQDir::currentDirPath();
 
     for(TQStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
-	TQFileInfo fi(Option::fixPathToLocalOS((*it), TRUE));
+	TQFileInfo fi(Option::fixPathToLocalOS((*it), true));
 	if(fi.exists()) {
 	    if(fi.isDir()) {
 		TQString profile = (*it);
@@ -324,7 +324,7 @@ void VcprojGenerator::writeSubDirs(TQTextStream &t)
 			// Initialize a 'fake' project to get the correct variables
 			// and to be able to extract all the dependencies
 			VcprojGenerator tmp_vcproj(&tmp_proj);
-			tmp_vcproj.setNoIO(TRUE);
+			tmp_vcproj.setNoIO(true);
 			tmp_vcproj.init();
 			if(Option::debug_level) {
 			    TQMap<TQString, TQStringList> &vars = tmp_proj.variables();
@@ -447,7 +447,7 @@ void VcprojGenerator::init()
     if( init_flag )
 	return;
     if(project->first("TEMPLATE") == "vcsubdirs") { //too much work for subdirs
-	init_flag = TRUE;
+	init_flag = true;
 	return;
     }
 
@@ -881,9 +881,9 @@ inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode )
 	ySlashPos = y.find('\\', yPos);
 
 	if (xSlashPos == -1 && ySlashPos != -1) {
-	    return FALSE;
+	    return false;
 	} else if (xSlashPos != -1 && ySlashPos == -1) {
-	    return TRUE;
+	    return true;
 	} else if (xSlashPos == -1 /* && yySlashPos == -1 */) {
 	    TQString subX = x.mid(xPos);
 	    TQString subY = y.mid(yPos);
@@ -898,7 +898,7 @@ inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode )
 	xPos = xSlashPos + 1;
 	yPos = ySlashPos + 1;
     }
-    return FALSE;
+    return false;
 }
 void nonflatDir_BubbleSort( TQStringList& list, bool flat_mode )
 {
@@ -909,7 +909,7 @@ void nonflatDir_BubbleSort( TQStringList& list, bool flat_mode )
     if ( last == b )	// shortcut
 	return;
     while( b != last ) {// sort them
-	bool swapped = FALSE;
+	bool swapped = false;
 	TQStringList::Iterator swap_pos = b;
 	TQStringList::Iterator x = e;
 	TQStringList::Iterator y = x;
@@ -919,7 +919,7 @@ void nonflatDir_BubbleSort( TQStringList& list, bool flat_mode )
 	    --x;
 	    --y;
 	    if ( XLessThanY(*x,*y, flat_mode) ) {
-		swapped = TRUE;
+		swapped = true;
 		swap_str = (*x); // Swap -------
 		(*x) = (*y);
 		(*y) = swap_str; // ------------
@@ -1063,7 +1063,7 @@ void VcprojGenerator::initOld()
     if( init_flag )
 	return;
 
-    init_flag = TRUE;
+    init_flag = true;
     TQStringList::Iterator it;
 
     if ( project->isActiveConfig("stl") ) {
@@ -1253,7 +1253,7 @@ void VcprojGenerator::initOld()
 
     // MOC -----------------------------------------------------------
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setMocAware(true);
 
     // /VERSION:x.yz -------------------------------------------------
     if ( !project->variables()["VERSION"].isEmpty() ) {
@@ -1289,7 +1289,7 @@ void VcprojGenerator::initOld()
     for(it = l.begin(); it != l.end(); ++it) {
 	TQStringList &gdmf = project->variables()[(*it)];
 	for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
-	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+	    (*inner) = Option::fixPathToTargetOS((*inner), false);
     }
 
      // Get filename w/o extention -----------------------------------
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index 9e5488045..5e37308c1 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -65,7 +65,7 @@ public:
     ~VcprojGenerator();
 
     TQString defaultMakefile() const;
-    virtual bool doDepends() const { return FALSE; } //never necesary
+    virtual bool doDepends() const { return false; } //never necesary
     TQString precompH, precompHFilename,
 	    precompObj, precompPch;
     bool usePCH;
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 872d0fb1c..408beade9 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -259,7 +259,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
 int
 Win32MakefileGenerator::findHighestVersion(const TQString &d, const TQString &stem)
 {
-    TQString bd = Option::fixPathToLocalOS(d, TRUE);
+    TQString bd = Option::fixPathToLocalOS(d, true);
     if(!TQFile::exists(bd))
 	return -1;
     if(!project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].isEmpty())
@@ -269,7 +269,7 @@ Win32MakefileGenerator::findHighestVersion(const TQString &d, const TQString &st
     int biggest=-1;
     TQStringList entries = dir.entryList();
     TQString dllStem = stem + TQTDLL_POSTFIX;
-    TQRegExp regx( "(" + dllStem + "([0-9]*)).lib", FALSE );
+    TQRegExp regx( "(" + dllStem + "([0-9]*)).lib", false );
     for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
 	if(regx.exactMatch((*it)))
 	    biggest = TQMAX(biggest, (regx.cap(1) == dllStem ||
@@ -334,10 +334,10 @@ Win32MakefileGenerator::findLibraries(const TQString &where)
 	    dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
 	}
     }
-    dirs.setAutoDelete(TRUE);
+    dirs.setAutoDelete(true);
     for(TQStringList::Iterator it = l.begin(); it != l.end(); ) {
 	TQChar quote;
-	bool modified_opt = FALSE, remove = FALSE;
+	bool modified_opt = false, remove = false;
 	TQString opt = (*it).stripWhiteSpace();
 	if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0]) {
 	    quote = opt[0];
@@ -351,7 +351,7 @@ Win32MakefileGenerator::findLibraries(const TQString &where)
             TQString r = opt.mid(2), l = Option::fixPathToLocalOS(r);
             dirs.append(new MakefileDependDir(r.replace("\"",""),
                                               l.replace("\"","")));
-            remove = TRUE; //we eat this switch
+            remove = true; //we eat this switch
         } else if(opt.startsWith("-l") || opt.startsWith("/l")) {
             TQString lib = opt.right(opt.length() - 2), out;
             if(!lib.isEmpty()) {
@@ -369,9 +369,9 @@ Win32MakefileGenerator::findLibraries(const TQString &where)
                 }
             }
             if(out.isEmpty()) {
-                remove = TRUE; //just eat it since we cannot find one..
+                remove = true; //just eat it since we cannot find one..
             } else {
-		modified_opt = TRUE;
+		modified_opt = true;
                 (*it) = out;
 	    }
         } else if(!TQFile::exists(Option::fixPathToLocalOS(opt))) {
@@ -405,7 +405,7 @@ Win32MakefileGenerator::findLibraries(const TQString &where)
 					dir += Option::dir_sep;
 				    lib_tmpl.prepend(dir);
 				}
-				modified_opt = TRUE;
+				modified_opt = true;
 				(*it) = lib_tmpl;
 				break;
 			    }
@@ -423,7 +423,7 @@ Win32MakefileGenerator::findLibraries(const TQString &where)
             ++it;
 	}
     }
-    return TRUE;
+    return true;
 }
 
 void
@@ -431,7 +431,7 @@ Win32MakefileGenerator::processPrlFiles()
 {
     TQDict<void> processed;
     TQPtrList<MakefileDependDir> libdirs;
-    libdirs.setAutoDelete(TRUE);
+    libdirs.setAutoDelete(true);
     {
 	TQStringList &libpaths = project->variables()["QMAKE_LIBDIR"];
 	for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
@@ -441,7 +441,7 @@ Win32MakefileGenerator::processPrlFiles()
 						 l.replace("\"","")));
 	}
     }
-    for(bool ret = FALSE; TRUE; ret = FALSE) {
+    for(bool ret = false; true; ret = false) {
 	//read in any prl files included..
 	TQStringList l_out;
 	TQString where = "QMAKE_LIBS";
@@ -461,7 +461,7 @@ Win32MakefileGenerator::processPrlFiles()
 		if(!processed[opt]) {
 		    if(processPrlFile(opt)) {
 			processed.insert(opt, (void*)1);
-			ret = TRUE;
+			ret = true;
 		    } else {
 			for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
 			    TQString prl = mdd->local_dir + Option::dir_sep + opt;
@@ -469,7 +469,7 @@ Win32MakefileGenerator::processPrlFiles()
 				break;
 			    } else if(processPrlFile(prl)) {
 				processed.insert(prl, (void*)1);
-				ret = TRUE;
+				ret = true;
 				break;
 			    }
 			}