From a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 1 Mar 2012 13:24:30 -0600
Subject: Rename additional global TQt functions

---
 qmake/generators/mac/metrowerks_xml.cpp     |  6 +++---
 qmake/generators/unix/unixmake2.cpp         |  2 +-
 qmake/generators/win32/msvc_objectmodel.cpp | 10 +++++-----
 qmake/generators/win32/msvc_vcproj.cpp      |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'qmake/generators')

diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 5e1ca0f..79f4187 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -70,7 +70,7 @@ MetrowerksMakefileGenerator::writeMakefile(QTextStream &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 QString &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 cd1c829..1f7f5bc 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();
 }
 
 QString
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index e17c66b..f11aa28 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 f7fa84f..406bffd 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -395,7 +395,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &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 QString &var, const QStringList &
 void VcprojGenerator::outputVariables()
 {
 #if 0
-    qDebug( "Generator: MSVC.NET: List of current variables:" );
+    tqDebug( "Generator: MSVC.NET: List of current variables:" );
     for ( QMap<QString, QStringList>::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
 }
-- 
cgit v1.2.3