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

4 files changed, 8 insertions, 8 deletions

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"));