Automated update from Qt3

5 files changed, 16 insertions, 16 deletions

diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf
index f89559db9..db7f7d3d7 100644
--- a/qmake/book/qmake-commandreference.leaf
+++ b/qmake/book/qmake-commandreference.leaf
@@ -676,7 +676,7 @@ rarely needs to be modified.
 \section3 OBJMOC
 
 This variable is set by \e qmake if files can be found that
-contain the Q_OBJECT macro.  \c OBJMOC contains the
+contain the TQ_OBJECT macro.  \c OBJMOC contains the
 name of all intermediate moc object files. The value of this variable
 is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.
@@ -1605,7 +1605,7 @@ The value of this variable is typically handled by \e qmake or
 \section3 SRCMOC
 
 This variable is set by \e qmake if files can be found that
-contain the Q_OBJECT macro.  \c SRCMOC contains the
+contain the TQ_OBJECT macro.  \c SRCMOC contains the
 name of all the generated moc files. The value of this variable
 is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 476e9f9bf..b4348588c 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -134,9 +134,9 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 
     bool ignore_qobject = FALSE;
     int line_count = 1;
- /* qmake ignore Q_OBJECT */
-#define COMP_LEN 8 //strlen("Q_OBJECT")
-#define OBJ_LEN 8 //strlen("Q_OBJECT")
+ /* qmake ignore TQ_OBJECT */
+#define COMP_LEN 9 //strlen("TQ_OBJECT")
+#define OBJ_LEN 9 //strlen("TQ_OBJECT")
 #define DIS_LEN 10 //strlen("Q_DISPATCH")
     int x;
     for(x = 0; x < (total_size_read-COMP_LEN); x++) {
@@ -150,8 +150,8 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 		    for( ;x < total_size_read; x++) {
 			if(*(big_buffer + x) == 't' || *(big_buffer + x) == 'q') { //ignore
 			    if(total_size_read >= (x + 20)) {
-				if(!strncmp(big_buffer + x + 1, "make ignore Q_OBJECT", 20)) {
-				    debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_OBJECT\"",
+				if(!strncmp(big_buffer + x + 1, "make ignore TQ_OBJECT", 20)) {
+				    debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore TQ_OBJECT\"",
 					      fn_target.latin1(), line_count);
 				    x += 20;
 				    ignore_qobject = TRUE;
@@ -172,13 +172,13 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 #define SYMBOL_CHAR(x) ((x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z') || \
 			(x <= '0' && x >= '9') || x == '_')
 
-	bool interesting = *(big_buffer+x) == 'Q' && (!strncmp(big_buffer+x, "Q_OBJECT", OBJ_LEN) ||
+	bool interesting = ((*(big_buffer+x) == 'T') || (*(big_buffer+x) == 'Q')) && (!strncmp(big_buffer+x, "TQ_OBJECT", OBJ_LEN) ||
 						      !strncmp(big_buffer+x, "Q_DISPATCH", DIS_LEN));
 	if(interesting) {
 	    int len = 0;
-	    if(!strncmp(big_buffer+x, "Q_OBJECT", OBJ_LEN)) {
+	    if(!strncmp(big_buffer+x, "TQ_OBJECT", OBJ_LEN)) {
 		if(ignore_qobject) {
-		    debug_msg(2, "Mocgen: %s:%d Ignoring Q_OBJECT", fn_target.latin1(), line_count);
+		    debug_msg(2, "Mocgen: %s:%d Ignoring TQ_OBJECT", fn_target.latin1(), line_count);
 		    interesting = FALSE;
 		}
 		len=OBJ_LEN;
@@ -2101,14 +2101,14 @@ TQString MakefileGenerator::buildArgs()
 	//arguments
 	for(TQStringList::Iterator it = Option::before_user_vars.begin();
 	    it != Option::before_user_vars.end(); ++it) {
-	    if((*it).left(qstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
+	    if((*it).left(tqstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
 		ret += " \"" + (*it) + "\"";
 	}
 	if(Option::after_user_vars.count()) {
 	    ret += " -after ";
 	    for(TQStringList::Iterator it = Option::after_user_vars.begin();
 		it != Option::after_user_vars.end(); ++it) {
-		if((*it).left(qstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
+		if((*it).left(tqstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
 		    ret += " \"" + (*it) + "\"";
 	    }
 	}
@@ -2145,7 +2145,7 @@ MakefileGenerator::writeHeader(TQTextStream &t)
     time_t foo = time(NULL);
     t << "#############################################################################" << endl;
     t << "# Makefile for building: " << var("TARGET") << endl;
-    t << "# Generated by qmake (" << qmake_version() << ") (TQt " << QT_VERSION_STR << ") on: " << ctime(&foo);
+    t << "# Generated by qmake (" << qmake_version() << ") (TQt " << TQT_VERSION_STR << ") on: " << ctime(&foo);
     t << "# Project:  " << fileFixify(project->projectFile()) << endl;
     t << "# Template: " << var("TEMPLATE") << endl;
     t << "# Command: " << build_args() << endl;
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index edaa8d131..798edc260 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1433,7 +1433,7 @@ UnixMakefileGenerator::writeLibtoolFile()
     t << "# " << lname << " - a libtool library file\n";
     time_t now = time(NULL);
     t << "# Generated by qmake/libtool (" << qmake_version() << ") (TQt "
-      << QT_VERSION_STR << ") on: " << ctime(&now) << "\n";
+      << TQT_VERSION_STR << ") on: " << ctime(&now) << "\n";
 
     t << "# The name that we can dlopen(3).\n"
       << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 8865720eb..d57e39e6e 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -225,7 +225,7 @@ Option::internalParseCommandLine(int argc, char **argv, int skip)
 	    } else if(opt == "d") {
 		Option::debug_level++;
 	    } else if(opt == "version" || opt == "v" || opt == "-version") {
-		fprintf(stderr, "Qmake version: %s (TQt %s)\n", qmake_version(), QT_VERSION_STR);
+		fprintf(stderr, "Qmake version: %s (TQt %s)\n", qmake_version(), TQT_VERSION_STR);
 		fprintf(stderr, "Qmake is free software from Trolltech ASA.\n");
 		return QMAKE_CMDLINE_BAIL;
 	    } else if(opt == "h" || opt == "help") {
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 0a2379455..d905b089d 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -685,7 +685,7 @@ TQMakeProject::read(uchar cmd)
 //	    fprintf(stderr,"Current QT version number: " + ver + "\n");
 	    if (ver != "" && ver != test_version) {
 		ver = test_version;
-		fprintf(stderr,"Changed QT version number to " + test_version + "!\n");
+		fprintf(stderr,"Changed QT version number to %s!\n", test_version.ascii());
 	    }
 	}
     }