Undo prior accidental commit

9 files changed, 22 insertions, 22 deletions

diff --git a/qmake/book/qmake-tutorial.leaf b/qmake/book/qmake-tutorial.leaf
index 81e21d1..b300f05 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 tqDebug()
+Suppose you use Windows and you want to be able to see the qDebug()
 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 96d0f13..4f1d1d8 100644
--- a/qmake/examples/precompile/myobject.cpp
+++ b/qmake/examples/precompile/myobject.cpp
@@ -10,5 +10,5 @@ MyObject::MyObject()
 
 MyObject::~MyObject()
 {
-    tqDebug("MyObject::~MyObject()");
+    qDebug("MyObject::~MyObject()");
 }
diff --git a/qmake/examples/tutorial/hello.cpp b/qmake/examples/tutorial/hello.cpp
index d4a2745..cec428b 100644
--- a/qmake/examples/tutorial/hello.cpp
+++ b/qmake/examples/tutorial/hello.cpp
@@ -3,5 +3,5 @@
 MyPushButton::MyPushButton( const QString& text ) 
     : QPushButton( text, 0, "mypushbutton" )
 {
-    tqDebug( "My PushButton has been constructed" );
+    qDebug( "My PushButton has been constructed" );
 }
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 79f4187..5e1ca0f 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);
-	tqDebug("Not supported!");
+	qDebug("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 
-		tqDebug("bogus %d", __LINE__);
+		qDebug("bogus %d", __LINE__);
 	} else 
-	    tqDebug("bogus %d", __LINE__);
+	    qDebug("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 1f7f5bc..cd1c829 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 tqInstallPath();
+    return qInstallPath();
 }
 
 QString
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index f11aa28..e17c66b 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':
-	tqWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
+	qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
 	found = FALSE;
 	break;
     case '@':
-	tqWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
+	qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
 	found = FALSE;
 	break;
     case 'l':
-	tqWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
+	qWarning( "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':
-	    tqWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
+	    qWarning( "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 {
-	    tqWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
+	    qWarning( "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 406bffd..f7fa84f 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
-			tqDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() );
+			qDebug( "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
-    tqDebug( "Generator: MSVC.NET: List of current variables:" );
+    qDebug( "Generator: MSVC.NET: List of current variables:" );
     for ( QMap<QString, QStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-	tqDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
+	qDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
     }
 #endif
 }
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 75e8e0e..efc465d 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -90,19 +90,19 @@ QStringList qmake_mkspec_paths()
     ret << (QT_INSTALL_PREFIX + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-    ret << (tqInstallPath() + concat);
+    ret << (qInstallPath() + concat);
 #endif
 #ifdef QT_INSTALL_DATA
     ret << (QT_INSTALL_DATA + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-    ret << (tqInstallPathData() + concat);
+    ret << (qInstallPathData() + concat);
 #endif
 
     /* prefer $QTDIR if it is set */
     if (getenv("QTDIR"))
 	ret << getenv("QTDIR");
-    ret << tqInstallPathData();
+    ret << qInstallPathData();
     return ret;
 }
 
@@ -931,13 +931,13 @@ QMakeProject::doProjectTest(const QString& func, QStringList args, QMap<QString,
 		feature_roots << (QT_INSTALL_PREFIX + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-		feature_roots << (tqInstallPath() + concat);
+		feature_roots << (qInstallPath() + concat);
 #endif
 #ifdef QT_INSTALL_DATA
 		feature_roots << (QT_INSTALL_DATA + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-		feature_roots << (tqInstallPathData() + concat);
+		feature_roots << (qInstallPathData() + concat);
 #endif
 		for(QStringList::Iterator it = feature_roots.begin(); it != feature_roots.end(); ++it) {
 		    QString prf = (*it) + QDir::separator() + file;
diff --git a/qmake/property.cpp b/qmake/property.cpp
index d3d577f..fca4d1f 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -82,13 +82,13 @@ QMakeProperty::value(QString v, bool just_check)
 #ifdef QT_INSTALL_PREFIX
 	return QT_INSTALL_PREFIX;
 #elif defined(HAVE_QCONFIG_CPP)
-	return tqInstallPath();
+	return qInstallPath();
 #endif
     } else if(v == "QT_INSTALL_DATA") {
 #ifdef QT_INSTALL_DATA
 	return QT_INSTALL_DATA;
 #elif defined(HAVE_QCONFIG_CPP)
-	return tqInstallPathData();
+	return qInstallPathData();
 #endif
     } else if(v == "QMAKE_MKSPECS") {
 	return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");