From aaca1f57ef3dc6f96057625a4978397bb376e570 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 1 Aug 2011 21:04:03 +0000
Subject: Fix gtk-qt-engine loading failure

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1244319 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcm_gtk/kcmgtk.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kcm_gtk')

diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 3c0860b..3b6b36e 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -226,7 +226,7 @@ void KcmGtk::getInstalledThemes()
 	widget->styleBox->clear();
 	widget->styleBox->insertStringList(themes.keys());
 	
-	bool installed = (themes.tqfind("TQt") != themes.end());
+	bool installed = (themes.tqfind("Qt") != themes.end());
 	widget->styleKde->setEnabled(installed);
 	widget->warning1->setHidden(installed);
 	widget->warning2->setHidden(installed);
@@ -283,7 +283,7 @@ void KcmGtk::load()
 {
 	parser.parse(TQDir::homeDirPath() + "/" + GTK_RC_FILE);
 	
-	bool usingTQtEngine = false;
+	bool usingQtEngine = false;
 	if (!parser.style.isEmpty())
 	{
 		for ( TQMapIterator<TQString, TQString> it = themes.begin(); it != themes.end(); ++it )
@@ -291,8 +291,8 @@ void KcmGtk::load()
 			if (it.data() != parser.style)
 				continue;
 			
-			if (it.key() == "TQt")
-				usingTQtEngine = true;
+			if (it.key() == "Qt")
+				usingQtEngine = true;
 			
 			for (int i=0 ; i<widget->styleBox->count() ; ++i)
 			{
@@ -306,7 +306,7 @@ void KcmGtk::load()
 			break;
 		}
 		
-		if (usingTQtEngine)
+		if (usingQtEngine)
 			widget->styleGroup->setButton(widget->styleGroup->id(widget->styleKde));
 		else
 			widget->styleGroup->setButton(widget->styleGroup->id(widget->styleOther));
@@ -340,8 +340,8 @@ void KcmGtk::save()
 		TQString(selectedFont.italic() ? "Italic " : "") +
 		TQString::number(selectedFont.pointSize());
 	
-	TQString themeName = widget->styleKde->isChecked() ? themes["TQt"] : themes[widget->styleBox->currentText()];
-	TQString themeNameShort = widget->styleKde->isChecked() ? TQString("TQt") : widget->styleBox->currentText();
+	TQString themeName = widget->styleKde->isChecked() ? themes["Qt"] : themes[widget->styleBox->currentText()];
+	TQString themeNameShort = widget->styleKde->isChecked() ? TQString("Qt") : widget->styleBox->currentText();
 	
 	stream << "# This file was written by KDE\n";
 	stream << "# You can edit it in the KDE control center, under \"GTK Styles and Fonts\"\n";
@@ -406,7 +406,7 @@ void KcmGtk::save()
 	if (envFileDidNotExist)
 		TQMessageBox::information(this, "Restart KDE", "Your changes have been saved, but you will have to restart KDE for them to take effect.", TQMessageBox::Ok);
 	
-	// Older versions of the Gtk-TQt theme engine wrote directly into ~/.gtkrc-2.0
+	// Older versions of the Gtk-Qt theme engine wrote directly into ~/.gtkrc-2.0
 	// If the user has upgraded, that file needs to be deleted so the old settings
 	// won't override the new ones set now.
 	file.setName(TQDir::homeDirPath() + "/.gtkrc-2.0");
-- 
cgit v1.2.1