Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q*

This fixes the Kopete MSN protocol among other things


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 9 insertions, 9 deletions

diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index ffa86b2b..cff2635d 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -316,7 +316,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where)
         cmdList_.insert(i, cmd);
     }
 
-    kdDebug(9012) << "TQUEUE: " << cmd->initialString()
+    kdDebug(9012) << "QUEUE: " << cmd->initialString()
                   << (stateReloadInProgress_ ? " (state reloading)\n" : "\n");
 
     setStateOn(s_dbgBusy);
diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp
index 22aec56f..ed4fe3fa 100644
--- a/languages/cpp/kdevdriver.cpp
+++ b/languages/cpp/kdevdriver.cpp
@@ -105,11 +105,11 @@ void KDevDriver::setup()
 	if( !kdedir.isNull() )
 		addIncludePath( kdedir + "/include" );
 
-	TQString qmakespec = getenv( "TQMAKESPEC" );
+	TQString qmakespec = getenv( "QMAKESPEC" );
 	if ( qmakespec.isNull() )
 	qmakespec = "linux-g++";
 	
-	TQString qtdir = getenv( "TQTDIR" );
+	TQString qtdir = getenv( "QTDIR" );
 	if( !qtdir.isNull() ) {
 		addIncludePath( qtdir + "/include" );
 
diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp
index a1965f78..b3e6bacb 100644
--- a/languages/cpp/main.cpp
+++ b/languages/cpp/main.cpp
@@ -86,11 +86,11 @@ public:
 		if ( !kdedir.isNull() )
 			addIncludePath( kdedir + "/include" );
 		
-		TQString qtdir = getenv( "TQTDIR" );
+		TQString qtdir = getenv( "QTDIR" );
 		if ( !qtdir.isNull() )
 			addIncludePath( qtdir + "/include" );
 		
-		TQString qmakespec = getenv( "TQMAKESPEC" );
+		TQString qmakespec = getenv( "QMAKESPEC" );
 		if ( qmakespec.isNull() )
 			qmakespec = "linux-g++";
 		// #### implement other mkspecs and find a better way to find the
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
index 10288502..fbf13efc 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
@@ -40,7 +40,7 @@ SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl)
     : SettingsDialogBase(parent,name,fl)
 {
     TQStringList qtdirs;
-	qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") );
+	qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") );
 	qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" );
 	qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" );
 	qtdirs.push_back( "/usr/qt/4/include" );
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index bcd62037..5f65e105 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -40,7 +40,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 		: SettingsDialogBase( parent, name, fl )
 {
 	TQStringList qtdirs;
-	qtdirs.push_back( ::getenv( "TQTDIR" ) + TQString("/include") );
+	qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") );
 	qtdirs.push_back( "/usr/lib/qt3/include" );
 	qtdirs.push_back( "/usr/lib/qt/include" );
 	qtdirs.push_back( "/usr/share/qt3/include" );
diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp
index a1a06a96..7a14ff2b 100644
--- a/languages/cpp/qtbuildconfig.cpp
+++ b/languages/cpp/qtbuildconfig.cpp
@@ -97,7 +97,7 @@ void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const
     {
         if( !m_root.isEmpty() )
             dirs << (m_root + TQString( TQChar( TQDir::separator() ) ) + "bin");
-        dirs << (::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin");
+        dirs << (::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin");
     }
     TQStringList paths = TQStringList::split(":",::getenv("PATH"));
     dirs += paths;
@@ -140,7 +140,7 @@ void QtBuildConfig::findTQtDir()
 {
     TQStringList qtdirs;
     if( m_version == 3 )
-        qtdirs.push_back( ::getenv("TQTDIR") );
+        qtdirs.push_back( ::getenv("QTDIR") );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( m_version ) );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) );