diff options
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 124 |
1 files changed, 62 insertions, 62 deletions
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'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 ); |
