Automated conversion from qt3

10 files changed, 23 insertions, 23 deletions

diff --git a/qmake/book/qmake-tutorial.leaf b/qmake/book/qmake-tutorial.leaf
index b300f059..81e21d18 100644
--- a/qmake/book/qmake-tutorial.leaf
+++ b/qmake/book/qmake-tutorial.leaf
@@ -193,7 +193,7 @@ processing.
 
 \section1 Checking for more than one condition
 
-Suppose you use Windows and you want to be able to see the qDebug()
+Suppose you use Windows and you want to be able to see the tqDebug()
 statements when you run your application on the command line.  Unless
 you build your application with the console setting, you won't see the
 output.  We can easily put \e console on the CONFIG line so that on
diff --git a/qmake/examples/precompile/myobject.cpp b/qmake/examples/precompile/myobject.cpp
index 687116df..14853508 100644
--- a/qmake/examples/precompile/myobject.cpp
+++ b/qmake/examples/precompile/myobject.cpp
@@ -10,5 +10,5 @@ MyObject::MyObject()
 
 MyObject::~MyObject()
 {
-    qDebug("MyObject::~MyObject()");
+    tqDebug("MyObject::~MyObject()");
 }
diff --git a/qmake/examples/tutorial/hello.cpp b/qmake/examples/tutorial/hello.cpp
index da01513b..8ab5e5a5 100644
--- a/qmake/examples/tutorial/hello.cpp
+++ b/qmake/examples/tutorial/hello.cpp
@@ -3,5 +3,5 @@
 MyPushButton::MyPushButton( const TQString& text ) 
     : TQPushButton( text, 0, "mypushbutton" )
 {
-    qDebug( "My PushButton has been constructed" );
+    tqDebug( "My PushButton has been constructed" );
 }
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 00260f8e..34bf3507 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -70,7 +70,7 @@ MetrowerksMakefileGenerator::writeMakefile(TQTextStream &t)
     }
     else if(project->first("TEMPLATE") == "subdirs") {
 	writeHeader(t);
-	qDebug("Not supported!");
+	tqDebug("Not supported!");
 	return TRUE;
     }
     return FALSE;
@@ -641,9 +641,9 @@ MetrowerksMakefileGenerator::createFork(const TQString &f)
 	    if(FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &fileSpec, NULL) == noErr) 
 		FSpCreateResFile(&fileSpec, 'CUTE', 'TEXT', smSystemScript);
 	    else 
-		qDebug("bogus %d", __LINE__);
+		tqDebug("bogus %d", __LINE__);
 	} else 
-	    qDebug("bogus %d", __LINE__);
+	    tqDebug("bogus %d", __LINE__);
 	fclose(o);
 	if(perms)
 	    chmod(f.latin1(), perms);
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 798edc26..d988819a 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1511,7 +1511,7 @@ UnixMakefileGenerator::pkgConfigPrefix() const
 {
     if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
 	return project->first("QMAKE_PKGCONFIG_PREFIX");
-    return qInstallPath();
+    return tqInstallPath();
 }
 
 TQString
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 03653f40..30543709 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -481,15 +481,15 @@ bool VCCLCompilerTool::parseOption( const char* option )
     switch ( first ) {
     case '?':
     case 'h':
-	qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
+	tqWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
 	found = FALSE;
 	break;
     case '@':
-	qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
+	tqWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
 	found = FALSE;
 	break;
     case 'l':
-	qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
+	tqWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
 	found = FALSE;
 	break;
     case 'A':
@@ -585,7 +585,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	switch ( second ) {
 	case '3':
 	case '4':
-	    qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
+	    tqWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
 	    found = FALSE; break;
         case '5':
 	    OptimizeForProcessor = procOptimizePentium;
@@ -773,7 +773,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	} else if ( second == 'P' ) {
 	    CompileAs = compileAsCPlusPlus;
 	} else {
-	    qWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
+	    tqWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
 	    found = FALSE; break;
 	}
 	break;
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 843d3aad..b5148dfb 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -395,7 +395,7 @@ void VcprojGenerator::writeSubDirs(TQTextStream &t)
 			    }
 			}
 #ifdef DEBUG_SOLUTION_GEN
-			qDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() );
+			tqDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() );
 #endif
 			solution_cleanup.append(newDep);
   			solution_depends.insert(newDep->target, newDep);
@@ -1533,9 +1533,9 @@ void VcprojGenerator::processPrlVariable(const TQString &var, const TQStringList
 void VcprojGenerator::outputVariables()
 {
 #if 0
-    qDebug( "Generator: MSVC.NET: List of current variables:" );
+    tqDebug( "Generator: MSVC.NET: List of current variables:" );
     for ( TQMap<TQString, TQStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-	qDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
+	tqDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
     }
 #endif
 }
diff --git a/qmake/main.cpp b/qmake/main.cpp
index ac65f5ca..ceb8e468 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -54,7 +54,7 @@
 #undef main
 #ifdef Q_OS_MAC
 // for qurl
-bool qt_resolve_symlinks = FALSE;
+bool tqt_resolve_symlinks = FALSE;
 #endif
 
 #if defined(Q_WS_WIN)
diff --git a/qmake/project.cpp b/qmake/project.cpp
index d905b089..f60dba06 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -90,19 +90,19 @@ TQStringList qmake_mkspec_paths()
     ret << (QT_INSTALL_PREFIX + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-    ret << (qInstallPath() + concat);
+    ret << (tqInstallPath() + concat);
 #endif
 #ifdef QT_INSTALL_DATA
     ret << (QT_INSTALL_DATA + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-    ret << (qInstallPathData() + concat);
+    ret << (tqInstallPathData() + concat);
 #endif
 
     /* prefer $QTDIR if it is set */
     if (getenv("QTDIR"))
 	ret << getenv("QTDIR");
-    ret << qInstallPathData();
+    ret << tqInstallPathData();
     return ret;
 }
 
@@ -931,13 +931,13 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 		feature_roots << (QT_INSTALL_PREFIX + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-		feature_roots << (qInstallPath() + concat);
+		feature_roots << (tqInstallPath() + concat);
 #endif
 #ifdef QT_INSTALL_DATA
 		feature_roots << (QT_INSTALL_DATA + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-		feature_roots << (qInstallPathData() + concat);
+		feature_roots << (tqInstallPathData() + concat);
 #endif
 		for(TQStringList::Iterator it = feature_roots.begin(); it != feature_roots.end(); ++it) {
 		    TQString prf = (*it) + TQDir::separator() + file;
diff --git a/qmake/property.cpp b/qmake/property.cpp
index 846b4512..d7ce32f0 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -82,13 +82,13 @@ TQMakeProperty::value(TQString v, bool just_check)
 #ifdef QT_INSTALL_PREFIX
 	return QT_INSTALL_PREFIX;
 #elif defined(HAVE_QCONFIG_CPP)
-	return qInstallPath();
+	return tqInstallPath();
 #endif
     } else if(v == "QT_INSTALL_DATA") {
 #ifdef QT_INSTALL_DATA
 	return QT_INSTALL_DATA;
 #elif defined(HAVE_QCONFIG_CPP)
-	return qInstallPathData();
+	return tqInstallPathData();
 #endif
     } else if(v == "QMAKE_MKSPECS") {
 	return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");