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

23 files changed, 41 insertions, 41 deletions

diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
index 6824f633..3677ceb9 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
@@ -1089,7 +1089,7 @@ namespace TQMake
     "$end", "error", "$undefined", "ID_SIMPLE", "EQ", "PLUSEQ", "MINUSEQ",
   "STAREQ", "TILDEEQ", "LBRACE", "RBRACE", "COLON", "NEWLINE", "COMMENT",
   "CONT", "COMMENT_CONT", "RCURLY", "LCURLY", "ID_ARGS",
-  "TQUOTED_VARIABLE_VALUE", "VARIABLE_VALUE", "LIST_WS", "ENDOFFILE",
+  "QUOTED_VARIABLE_VALUE", "VARIABLE_VALUE", "LIST_WS", "ENDOFFILE",
   "\"else\"", "$accept", "project", "@1", "statements", "statement",
   "variable_assignment", "possible_value", "multiline_values",
   "variable_value", "listws", "operator", "scope", "@2", "function_call",
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp
index 11b61507..b625f821 100644
--- a/buildtools/qmake/projectconfigurationdlg.cpp
+++ b/buildtools/qmake/projectconfigurationdlg.cpp
@@ -442,8 +442,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     }
 
     myProjectItem->updateValues( "DEFINES", TQStringList::split( " ", m_defines->text() ) );
-    myProjectItem->updateValues( "TQMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) );
-    myProjectItem->updateValues( "TQMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) );
+    myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) );
+    myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) );
 
     //add selected includes
     TQStringList values;
@@ -603,7 +603,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     // intermediate locations
     myProjectItem->scope->setEqualOp( "OBJECTS_DIR", TQStringList( objdir_url->url() ) );
     myProjectItem->scope->setEqualOp( "UI_DIR", TQStringList( uidir_url->url() ) );
-    myProjectItem->scope->setEqualOp( "TQMOC_DIR", TQStringList( tqmocdir_url->url() ) );
+    myProjectItem->scope->setEqualOp( "QMOC_DIR", TQStringList( tqmocdir_url->url() ) );
     myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) );
 
     //CORBA
@@ -941,8 +941,8 @@ void ProjectConfigurationDlg::updateControls()
     m_targetPath->setURL( dir );
 
     m_defines->setText( myProjectItem->scope->variableValues( "DEFINES" ).join( " " ) );
-    m_debugFlags->setText( myProjectItem->scope->variableValues( "TQMAKE_CXXFLAGS_DEBUG" ).join( " " ) );
-    m_releaseFlags->setText( myProjectItem->scope->variableValues( "TQMAKE_CXXFLAGS_RELEASE" ).join( " " ) );
+    m_debugFlags->setText( myProjectItem->scope->variableValues( "QMAKE_CXXFLAGS_DEBUG" ).join( " " ) );
+    m_releaseFlags->setText( myProjectItem->scope->variableValues( "QMAKE_CXXFLAGS_RELEASE" ).join( " " ) );
 
     updateIncludeControl();
     updateLibControls();
@@ -971,7 +971,7 @@ void ProjectConfigurationDlg::updateControls()
         uidir_url->fileDialog()->setURL( KURL( dir ) );
     }
     uidir_url->setURL( dir );
-    dir = myProjectItem->scope->variableValues( "TQMOC_DIR" ).front();
+    dir = myProjectItem->scope->variableValues( "QMOC_DIR" ).front();
     if( TQFileInfo(dir).isRelative() )
     {
         tqmocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() );
diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index 6018c392..b937287c 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -31,7 +31,7 @@
 #include "trollprojectpart.h"
 #include "qmakedefaultopts.h"
 
-const TQStringList Scope::KnownVariables = TQStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "TQMAKE_CXXFLAGS_DEBUG" << "TQMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "TQMOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ;
+const TQStringList Scope::KnownVariables = TQStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "QMAKE_CXXFLAGS_DEBUG" << "QMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "QMOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ;
 
 const TQStringList Scope::KnownConfigValues = TQStringList() << "debug" << "release" << "debug_and_release" << "warn_on" << "warn_off" << "staticlib" << "dll" << "plugin" << "designer" << "create_pkgconf" << "create_libtool" << "qt" << "console" << "windows" << "x11" << "thread" << "exceptions" << "stl" << "rtti" << "opengl" << "thread" << "ordered" << "precompile_header" << "qtestlib" << "uitools" << "dbus" << "assistant" << "build_all" << "help";
 
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 3bb68ef7..66c2794d 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -246,7 +246,7 @@ TQString TrollProjectPart::makeEnvironment()
     DomUtil::PairList::ConstIterator it;
     bool hasTQtDir = false;
     for (it = envvars.begin(); it != envvars.end(); ++it) {
-        if( (*it).first == "TQTDIR" )
+        if( (*it).first == "QTDIR" )
 	    hasTQtDir = true;
 
         environstr += (*it).first;
@@ -257,7 +257,7 @@ TQString TrollProjectPart::makeEnvironment()
 
     if( !hasTQtDir && !isTQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() )
     {
-         environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " );
+         environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " );
     }
 
     KConfigGroup grp( kapp->config(), "MakeOutputView" );
@@ -808,7 +808,7 @@ void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const
         TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "");
         if( !m_defaultTQtDir.isEmpty() )
             dirs << (m_defaultTQtDir + 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;
@@ -851,7 +851,7 @@ TQString TrollProjectPart::findTQtDir()
 {
     TQStringList qtdirs;
     if( !isTQt4Project() )
-        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( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index e4294f0a..ad57b792 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -2527,7 +2527,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const
     DomUtil::PairList::ConstIterator it;
     bool hasTQtDir = false;
     for (it = envvars.begin(); it != envvars.end(); ++it) {
-        if( (*it).first == "TQTDIR" )
+        if( (*it).first == "QTDIR" )
             hasTQtDir = true;
 
         map[(*it).first] = (*it).second;
@@ -2535,7 +2535,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const
 
     if( !hasTQtDir && !m_part->isTQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() )
     {
-         map["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "");
+         map["QTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "");
          map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" );
     }
     return map;
diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index a5780339..cfafb4e9 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -304,9 +304,9 @@ void DesignerProjectImpl::setCustomSetting( const TQString &key, const TQString
 
 TQString DesignerProjectImpl::customSetting( const TQString &key ) const
 {
-    if ( key == "TQTSCRIPT_PACKAGES" ) {
-	TQString s = getenv( "TQTSCRIPT_PACKAGES" );
-	TQString s2 = project->customSetting( "TQUICK_PACKAGES" );
+    if ( key == "QTSCRIPT_PACKAGES" ) {
+	TQString s = getenv( "QTSCRIPT_PACKAGES" );
+	TQString s2 = project->customSetting( "QUICK_PACKAGES" );
 	if ( !s.isEmpty() && !s2.isEmpty() )
 #if defined(Q_OS_WIN32)
 	    s += ";";
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index e485fbb9..93486243 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -254,7 +254,7 @@ bool FormFile::saveAs( bool ignoreModified )
     }
     bool saved = FALSE;
     if ( ignoreModified ) {
-	TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "TQTSCRIPT_PACKAGES" ) ).first();
+	TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first();
 	f = TQFileInfo( f ).fileName();
 	f.prepend( dir + "/" );
     }
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index c4790ccc..e7ba30f3 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -1453,7 +1453,7 @@ void MainWindow::createNewTemplate()
     }
 
     TQStringList templRoots;
-    const char *qtdir = getenv( "TQTDIR" );
+    const char *qtdir = getenv( "QTDIR" );
     if(qtdir)
 	templRoots << qtdir;
     templRoots << qInstallPathData();
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index dcc2c416..6026a9bd 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -282,7 +282,7 @@ void NewForm::insertTemplates( TQIconView *tView,
 
 	TQString templPath = templatePath;
 	TQStringList templRoots;
-	const char *qtdir = getenv( "TQTDIR" );
+	const char *qtdir = getenv( "QTDIR" );
 	if(qtdir)
 	    templRoots << qtdir;
 	templRoots << qInstallPathData();
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index b1858859..ad76e201 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -122,7 +122,7 @@ bool SourceFile::saveAs( bool ignoreModified )
     TQString old = filename;
     TQString initFn = pro->makeAbsolute( filename );
     if ( ignoreModified ) {
-	TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "TQTSCRIPT_PACKAGES" ) ).first();
+	TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first();
 	initFn = TQFileInfo( initFn ).fileName();
 	initFn.prepend( dir + "/" );
     }
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index 72978260..9bf43f87 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -168,7 +168,7 @@ void StartDialog::initFileOpen()
     TQStringList filterlist;
     filterlist << i18n( "Designer Files (*.ui *.pro)" );
     filterlist << i18n( "TQt User-Interface Files (*.ui)" );
-    filterlist << i18n( "TQMAKE Project Files (*.pro)" );
+    filterlist << i18n( "QMAKE Project Files (*.pro)" );
 
     TQStringList list = manager.featureList();
     for ( TQStringList::Iterator it2 = list.begin(); it2 != list.end(); ++it2 )
diff --git a/languages/ada/addclass.cpp b/languages/ada/addclass.cpp
index 75420266..725d6dc9 100644
--- a/languages/ada/addclass.cpp
+++ b/languages/ada/addclass.cpp
@@ -183,7 +183,7 @@ bool AddClass::generate()
 	 " * published by the Free Software Foundation; either version 2 of the\n"
 	 " * License, or (at your option) any later version.\n";
     }
-    else if (m_info.license == "TQPL")
+    else if (m_info.license == "QPL")
     {
       code += 
 	" * This program may be distributed under the terms of the Q Public\n"
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 ) );
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp
index b3ace734..da170fa1 100644
--- a/lib/cppparser/driver.cpp
+++ b/lib/cppparser/driver.cpp
@@ -613,7 +613,7 @@ void Driver::setupLexer( Lexer * lexer ) {
   lexer->addSkipWord( "TQ_TYPENAME" );
   lexer->addSkipWord( "TQ_REFCOUNT" );
   lexer->addSkipWord( "TQ_EXPLICIT" );
-  lexer->addSkipWord( "TQMAC_PASCAL" );
+  lexer->addSkipWord( "QMAC_PASCAL" );
   lexer->addSkipWord( "QT_STATIC_CONST" );
   lexer->addSkipWord( "QT_STATIC_CONST_IMPL" );
   lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" );
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 1799c2e9..a5fbe33d 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -517,7 +517,7 @@ void AppWizardDialog::accept()
 	TQString license = license_combo->currentText();
 	if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"||
 		license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || 
-		license == "TQPL" || license == "TQPL_V1_0" )
+		license == "QPL" || license == "TQPL_V1_0" )
 	{
 		m_pCurrentAppInfo->subMap.insert("LICENSE", license );
 	}
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 257a8cc2..b3e43388 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -141,7 +141,7 @@ void DocQtPlugin::autoSetupPlugin()
     qtDocDir = URLUtil::envExpand(qtDocDir);
     if (qtDocDir.isEmpty())
     {
-        qtDocDir = getenv("TQTDIR");
+        qtDocDir = getenv("QTDIR");
     }
     if (!qtDocDir.isEmpty())
     {
diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp
index 727020bf..172da37f 100644
--- a/parts/doxygen/config.cpp
+++ b/parts/doxygen/config.cpp
@@ -3789,7 +3789,7 @@ void Config::create()
   //-----------------------------------------------------------------------------------------------
 
   cb = addBool(
-                    "TQUIET",
+                    "QUIET",
                     "The TQUIET tag can be used to turn on/off the messages that are generated \n"
                     "by doxygen. Possible values are YES and NO. If left blank NO is used. \n",
                     FALSE
@@ -4191,7 +4191,7 @@ void Config::create()
   cs->addDependency("GENERATE_HTML");
 #if 0
   cs = addString(
-                    "TQTHELP_FILE",
+                    "QTHELP_FILE",
                     "If the GENERATE_HTMLHELP tag is set to YES, the TQTHELP_FILE tag can \n"
                     "be used to specify the file name of the resulting .(qch|qhp) file. \n"
                     "You can add a path in front of the file if the result should not be \n"
@@ -4200,7 +4200,7 @@ void Config::create()
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   cs = addString(
-                    "TQTHELP_CONFIG",
+                    "QTHELP_CONFIG",
                     "If DOXYGEN2TQTHELP_LOC is set, TQTHELP_CONFIG must specify the file name \n"
                     "of a config file to pass to doxygen2qthelp. \n"
                    );
@@ -4216,8 +4216,8 @@ void Config::create()
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
 #endif
-  addObsolete("TQTHELP_FILE");
-  addObsolete("TQTHELP_CONFIG");
+  addObsolete("QTHELP_FILE");
+  addObsolete("QTHELP_CONFIG");
   addObsolete("DOXYGEN2TQTHELP_LOC");
   cb = addBool(
                     "GENERATE_CHI",
diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp
index dcebe217..8819b109 100644
--- a/parts/doxygen/messages.cpp
+++ b/parts/doxygen/messages.cpp
@@ -90,7 +90,7 @@ TQString message(const TQCString &key)
     // configuration options related to warning and progress messages
     //---------------------------------------------------------------------------
     addMessage("Messages", i18n("Messages"));
-    addMessage("TQUIET", i18n("Suppress output"));
+    addMessage("QUIET", i18n("Suppress output"));
     addMessage("WARNINGS", i18n("Show warnings"));
     addMessage("WARN_IF_UNDOCUMENTED", i18n("Warn about undocumented entities"));
     addMessage("WARN_IF_DOC_ERROR", i18n("Warn if error in documents"));