diff options
Diffstat (limited to 'qmake/generators/projectgenerator.cpp')
-rw-r--r-- | qmake/generators/projectgenerator.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 48a93b69f..4069af65e 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -60,7 +60,7 @@ TQString project_builtin_regx() //calculate the builtin regular expression.. -ProjectGenerator::ProjectGenerator(TQMakeProject *p) : MakefileGenerator(p), init_flag(FALSE) +ProjectGenerator::ProjectGenerator(TQMakeProject *p) : MakefileGenerator(p), init_flag(false) { } @@ -70,7 +70,7 @@ ProjectGenerator::init() if(init_flag) return; int file_count = 0; - init_flag = TRUE; + init_flag = true; TQMap<TQString, TQStringList> &v = project->variables(); TQString templ = Option::user_template.isEmpty() ? TQString("app") : Option::user_template; @@ -94,12 +94,12 @@ ProjectGenerator::init() for(TQStringList::Iterator pd = dirs.begin(); pd != dirs.end(); pd++) { TQString dir, regex; - bool add_depend = FALSE; + bool add_depend = false; if(TQFile::exists((*pd))) { TQFileInfo fi((*pd)); if(fi.isDir()) { dir = (*pd); - add_depend = TRUE; + add_depend = true; if(dir.right(1) != Option::dir_sep) dir += Option::dir_sep; if(Option::projfile::do_recursive) { @@ -117,7 +117,7 @@ ProjectGenerator::init() if(s != -1) dir = file.left(s+1); if(addFile(file)) { - add_depend = TRUE; + add_depend = true; file_count++; } } @@ -142,7 +142,7 @@ ProjectGenerator::init() for(int i = 0; i < (int)d.count(); i++) { TQString file = dir + d[i]; if (addFile(file)) { - add_depend = TRUE; + add_depend = true; file_count++; } } @@ -235,7 +235,7 @@ ProjectGenerator::init() } TQPtrList<MakefileDependDir> deplist; - deplist.setAutoDelete(TRUE); + deplist.setAutoDelete(true); { TQStringList &d = v["DEPENDPATH"]; for(TQStringList::Iterator it = d.begin(); it != d.end(); ++it) { @@ -244,12 +244,12 @@ ProjectGenerator::init() } } TQStringList &h = v["HEADERS"]; - bool no_qt_files = TRUE; + bool no_qt_files = true; TQString srcs[] = { "SOURCES", "YACCSOURCES", "LEXSOURCES", "INTERFACES", TQString::null }; for(int i = 0; !srcs[i].isNull(); i++) { TQStringList &l = v[srcs[i]]; for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { - if(generateDependencies(deplist, (*val_it), TRUE)) { + if(generateDependencies(deplist, (*val_it), true)) { TQStringList &tmp = findDependencies((*val_it)); if(!tmp.isEmpty()) { for(TQStringList::Iterator dep_it = tmp.begin(); dep_it != tmp.end(); ++dep_it) { @@ -262,7 +262,7 @@ ProjectGenerator::init() } } if(no_qt_files && file_no_path.find(TQRegExp("^q[a-z_0-9].h$")) != -1) - no_qt_files = FALSE; + no_qt_files = false; TQString h_ext; for(TQStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) { @@ -282,12 +282,12 @@ ProjectGenerator::init() TQString src((*dep_it).left((*dep_it).length() - h_ext.length()) + (*cppit)); if(TQFile::exists(src)) { - bool exists = FALSE; + bool exists = false; TQStringList &srcl = v["SOURCES"]; for(TQStringList::Iterator src_it = srcl.begin(); src_it != srcl.end(); ++src_it) { if((*src_it).lower() == src.lower()) { - exists = TRUE; + exists = true; break; } } @@ -309,7 +309,7 @@ ProjectGenerator::init() } } if(h.isEmpty()) - addConfig("moc", FALSE); + addConfig("moc", false); //if we find a file that matches an forms it needn't be included in the project TQStringList &u = v["INTERFACES"]; @@ -318,19 +318,19 @@ ProjectGenerator::init() for(int i = 0; !no_ui[i].isNull(); i++) { TQStringList &l = v[no_ui[i]]; for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ) { - bool found = FALSE; + bool found = false; for(TQStringList::Iterator ui_it = u.begin(); ui_it != u.end(); ++ui_it) { TQString s1 = (*val_it).right((*val_it).length() - ((*val_it).findRev(Option::dir_sep) + 1)); if(s1.findRev('.') != -1) s1 = s1.left(s1.findRev('.')) + Option::ui_ext; TQString u1 = (*ui_it).right((*ui_it).length() - ((*ui_it).findRev(Option::dir_sep) + 1)); if(s1 == u1) { - found = TRUE; + found = true; break; } } if(!found && (*val_it).endsWith(Option::cpp_moc_ext)) - found = TRUE; + found = true; if(found) val_it = l.remove(val_it); else @@ -350,14 +350,14 @@ ProjectGenerator::writeMakefile(TQTextStream &t) TQStringList::Iterator it; for(it = Option::before_user_vars.begin(); it != Option::before_user_vars.end(); ++it) t << (*it) << endl; - t << getWritableVar("TEMPLATE_ASSIGN", FALSE); + t << getWritableVar("TEMPLATE_ASSIGN", false); if(project->first("TEMPLATE_ASSIGN") == "subdirs") { t << endl << "# Directories" << "\n" << getWritableVar("SUBDIRS"); } else { t << getWritableVar("TARGET") - << getWritableVar("CONFIG", FALSE) - << getWritableVar("CONFIG_REMOVE", FALSE) + << getWritableVar("CONFIG", false) + << getWritableVar("CONFIG_REMOVE", false) << getWritableVar("DEPENDPATH") << getWritableVar("INCLUDEPATH") << endl; @@ -371,7 +371,7 @@ ProjectGenerator::writeMakefile(TQTextStream &t) } for(it = Option::after_user_vars.begin(); it != Option::after_user_vars.end(); ++it) t << (*it) << endl; - return TRUE; + return true; } bool @@ -382,9 +382,9 @@ ProjectGenerator::addConfig(const TQString &cfg, bool add) where = "CONFIG_REMOVE"; if(!project->variables()[where].contains(cfg)) { project->variables()[where] += cfg; - return TRUE; + return true; } - return FALSE; + return false; } @@ -397,13 +397,13 @@ ProjectGenerator::addFile(TQString file) if(s != -1) dir = file.left(s+1); if(file.mid(dir.length(), Option::h_moc_mod.length()) == Option::h_moc_mod) - return FALSE; + return false; TQString where; for(TQStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) { if(file.endsWith((*cppit))) { if(TQFile::exists(file.left(file.length() - (*cppit).length()) + Option::ui_ext)) - return FALSE; + return false; else where = "SOURCES"; break; @@ -433,9 +433,9 @@ ProjectGenerator::addFile(TQString file) TQString newfile = fileFixify(file); if(!where.isEmpty() && !project->variables()[where].contains(file)) { project->variables()[where] += newfile; - return TRUE; + return true; } - return FALSE; + return false; } |