Rename moc to tqmoc

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

10 files changed, 25 insertions, 25 deletions

diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index a197b0e40..83e917bdf 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -453,7 +453,7 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
     t << endl;
     file.close();
 
-    if(mocAware()) { 
+    if(tqmocAware()) { 
 	TQString mocs = project->first("MOCS");
 	TQFile mocfile(mocs);
 	if(!mocfile.open(IO_WriteOnly)) {
@@ -558,7 +558,7 @@ MetrowerksMakefileGenerator::init()
 	if(project->first("TEMPLATE") == "lib")
 	    mocfile += project->isActiveConfig("staticlib") ? "_static" : "_shared";
 	project->variables()["MOCS"].append(mocfile + ".mocs");
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
     }
     if(!project->isEmpty("FORMS")) {
 	TQString uicfile = project->first("TARGET");
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 99b10d3e4..c4c42343f 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -94,7 +94,7 @@ static bool createDir(const TQString& fullPath)
 
 
 MakefileGenerator::MakefileGenerator(TQMakeProject *p) : init_opath_already(FALSE),
-							init_already(FALSE), moc_aware(FALSE),
+							init_already(FALSE), tqmoc_aware(FALSE),
 							no_io(FALSE), project(p)
 {
 }
@@ -545,7 +545,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons
 			    }
 			}
 		    }
-		    if( mocAware() &&		    //is it a moc file?
+		    if( tqmocAware() &&		    //is it a moc file?
 		       ( inc.endsWith(Option::cpp_ext.first()) || inc.endsWith(Option::cpp_moc_ext) )
 		       || ( (Option::cpp_ext.first() != Option::h_moc_ext) && inc.endsWith(Option::h_moc_ext) )) {
 			TQString mocs[] = { TQString("_HDRMOC"), TQString("_SRCMOC"), TQString::null };
@@ -944,8 +944,8 @@ MakefileGenerator::init()
 			if(!found_cache_moc || !found_cache_dep)
 			    write_cache = TRUE;
 		    }
-		    /* Do moc before dependency checking since some includes can come from
-		       moc_*.cpp files */
+		    /* Do tqmoc before dependency checking since some includes can come from
+		       tqmoc_*.cpp files */
 		    if(found_cache_moc) {
 			TQString fixed_file(fileFixify((*val_it), TQDir::currentDirPath(), Option::output_dir));
 			TQString moc = findMocDestination(fixed_file);
@@ -960,7 +960,7 @@ MakefileGenerator::init()
 				}
 			    }
 			}
-		    } else if(mocAware() && (sources[x] == "SOURCES" || sources[x] == "HEADERS") &&
+		    } else if(tqmocAware() && (sources[x] == "SOURCES" || sources[x] == "HEADERS") &&
 			    (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT ||
 			     Option::mkfile::do_mocs)) {
 			generateMocList((*val_it));
@@ -1199,7 +1199,7 @@ MakefileGenerator::init()
 							      Option::output_dir));
 
     //moc files
-    if ( mocAware() ) {
+    if ( tqmocAware() ) {
 	if(!project->isEmpty("MOC_DIR"))
 	    project->variables()["INCLUDEPATH"].append(project->first("MOC_DIR"));
 	if ( Option::h_moc_ext == Option::cpp_ext.first() )
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 763b57abe..c91acf79a 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -51,7 +51,7 @@
 class MakefileGenerator
 {
     TQString spec;
-    bool init_opath_already, init_already, moc_aware, no_io;
+    bool init_opath_already, init_already, tqmoc_aware, no_io;
     TQStringList createObjectList(const TQString &var);
     TQString build_args();
     TQString dependencyKey(const TQString &file) const;
@@ -95,8 +95,8 @@ protected:
     void setNoIO(bool o);
     bool noIO() const;
 
-    void setMocAware(bool o);
-    bool mocAware() const;
+    void setTQMocAware(bool o);
+    bool tqmocAware() const;
     void logicWarn(const TQString &, const TQString &);
 
     virtual bool doDepends() const { return Option::mkfile::do_deps; }
@@ -164,11 +164,11 @@ inline TQString MakefileGenerator::findMocDestination(const TQString &src_file)
 	return TQString("");
 }
 
-inline void MakefileGenerator::setMocAware(bool o)
-{ moc_aware = o; }
+inline void MakefileGenerator::setTQMocAware(bool o)
+{ tqmoc_aware = o; }
 
-inline bool MakefileGenerator::mocAware() const
-{ return moc_aware; }
+inline bool MakefileGenerator::tqmocAware() const
+{ return tqmoc_aware; }
 
 inline void MakefileGenerator::setNoIO(bool o)
 { no_io = o; }
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index dad6ca7d4..4a3b22785 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -244,7 +244,7 @@ UnixMakefileGenerator::init()
 	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"];
     }
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
     TQString compile_flag = var("QMAKE_COMPILE_FLAG");
     if(compile_flag.isEmpty())
 	compile_flag = "-c";
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 347186d75..c117a2d29 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -687,7 +687,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 	//moc itself shouldn't have this dependency - this is a little kludgy but it is
 	//better than the alternative for now.
 	TQString moc = project->first("QMAKE_MOC"), target = project->first("TARGET"),
-	    moc_dir = "$(TQTDIR)/src/moc";
+	    moc_dir = "$(TQTDIR)/src/tqmoc";
 	if(!project->isEmpty("QMAKE_MOC_SRC"))
 	    moc_dir = project->first("QMAKE_MOC_SRC");
 	fixEnvVariables(target);
@@ -777,7 +777,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
 
     TQString clean_targets;
     t << "mocclean:" << "\n";
-    if(mocAware()) {
+    if(tqmocAware()) {
 	if(!objMoc.isEmpty() || !srcMoc.isEmpty() || moc_incremental) {
 	    if(!objMoc.isEmpty())
 		t << "\t-$(DEL_FILE) $(OBJMOC)" << '\n';
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 61906de29..4e97ba527 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -557,7 +557,7 @@ BorlandMakefileGenerator::init()
         project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RT"];
     }
     if ( project->isActiveConfig("moc") ) {
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
     }
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
     // Update -lname to name.lib, and -Ldir to
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 18aa73c21..e59e7e3a2 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -574,7 +574,7 @@ MingwMakefileGenerator::init()
     }
 
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
 
     // add -L libs to libdir
     TQStringList &libs = project->variables()["QMAKE_LIBS"];
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 910400315..988d4632d 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -227,7 +227,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 			mocpath = mocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
 			buildCmds += "\t" + mocpath + (*it)  + " -o " + findMocDestination((*it)) + " \\\n";
 			createMOC  = "\"" + findMocDestination((*it)) +	"\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n   $(BuildCmds)\n\n";
-			customDependencies += "\"$(TQTDIR)\\bin\\moc.exe\"";
+			customDependencies += "\"$(TQTDIR)\\bin\\tqmoc.exe\"";
 		    }
 		    if (!createMOC.isEmpty() || !compilePCH.isEmpty()) {
 			bool doMOC = !createMOC.isEmpty();
@@ -462,7 +462,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 			    uiHeadersDir = fpath;
 		    }
 
-		    t << "USERDEP_" << base << "=\"$(TQTDIR)\\bin\\moc.exe\" \"$(TQTDIR)\\bin\\uic.exe\"" << endl << endl;
+		    t << "USERDEP_" << base << "=\"$(TQTDIR)\\bin\\tqmoc.exe\" \"$(TQTDIR)\\bin\\tquic.exe\"" << endl << endl;
 
 		    TQString build = "\n\n# Begin Custom Build - Uic'ing " + base + "...\n"
 			"InputPath=.\\" + base + "\n\n" "BuildCmds= \\\n\t" + uicpath + base +
@@ -818,7 +818,7 @@ DspMakefileGenerator::init()
     TQString targetfilename = project->variables()["TARGET"].first();
     project->variables()["TARGET"].first() += project->first("TARGET_EXT");
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
 
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
     project->variables()["QMAKE_FILETAGS"] += TQStringList::split(' ',
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 302e2532d..b95289f89 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -653,7 +653,7 @@ NmakeMakefileGenerator::init()
 
 
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
 
     TQStringList &libList = project->variables()["QMAKE_LIBS"];
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index f22c0c148..df6001580 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1214,7 +1214,7 @@ void VcprojGenerator::initOld()
 
     // MOC -----------------------------------------------------------
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
 
     // /VERSION:x.yz -------------------------------------------------
     if ( !project->variables()["VERSION"].isEmpty() ) {