diff options
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 128811ef9..a59c58e4a 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; } @@ -849,9 +849,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); @@ -866,7 +866,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 ) { @@ -877,7 +877,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; @@ -887,7 +887,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; // ------------ @@ -1031,7 +1031,7 @@ void VcprojGenerator::initOld() if( init_flag ) return; - init_flag = TRUE; + init_flag = true; TQStringList::Iterator it; if ( project->isActiveConfig("stl") ) { @@ -1214,7 +1214,7 @@ void VcprojGenerator::initOld() // MOC ----------------------------------------------------------- if ( project->isActiveConfig("moc") ) - setTQMocAware(TRUE); + setTQMocAware(true); // /VERSION:x.yz ------------------------------------------------- if ( !project->variables()["VERSION"].isEmpty() ) { @@ -1250,7 +1250,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 ----------------------------------- |