From f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:45:16 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kolf/kcomboboxdialog.cpp | 4 ++--
 kolf/kcomboboxdialog.h   | 2 +-
 kolf/kolf.cpp            | 6 +++---
 kolf/main.cpp            | 2 +-
 kolf/newgame.cpp         | 2 +-
 kolf/pluginloader.cpp    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kolf')

diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp
index 5882e257..a6e45373 100644
--- a/kolf/kcomboboxdialog.cpp
+++ b/kolf/kcomboboxdialog.cpp
@@ -86,7 +86,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti
 	TQString prevAnswer;
 	if ( !dontAskAgainName.isEmpty() )
 	{
-		KConfig *config = KGlobal::config();
+		KConfig *config = TDEGlobal::config();
 		config->setGroup( "Notification Messages" );
 		prevAnswer = config->readEntry( dontAskAgainName );
 		if ( !prevAnswer.isEmpty() )
@@ -106,7 +106,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti
 	{
 		if ( !dontAskAgainName.isEmpty() && !text.isEmpty() )
 		{
-			KConfig *config = KGlobal::config();
+			KConfig *config = TDEGlobal::config();
 			config->setGroup ( "Notification Messages" );
 			config->writeEntry( dontAskAgainName, text );
 		}
diff --git a/kolf/kcomboboxdialog.h b/kolf/kcomboboxdialog.h
index 18c0bba5..61b7ff2e 100644
--- a/kolf/kcomboboxdialog.h
+++ b/kolf/kcomboboxdialog.h
@@ -104,7 +104,7 @@ public:
 	                       const TQString &_value = TQString(),
 	                       bool *ok = 0, TQWidget *parent = 0,
 	                       const TQString &configName = TQString(),
-	                       KConfig *config = KGlobal::config());
+	                       KConfig *config = TDEGlobal::config());
 
 protected:
 	KHistoryCombo *combo;
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 246403b9..f40c3f5d 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -200,7 +200,7 @@ void Kolf::startNewGame()
 		config.setGroup("0 Saved Game");
 
 		if (isTutorial)
-			filename = KGlobal::dirs()->findResource("appdata", "tutorial.kolf");
+			filename = TDEGlobal::dirs()->findResource("appdata", "tutorial.kolf");
 		else
 			filename = config.readEntry("Course", TQString());
 
@@ -305,7 +305,7 @@ void Kolf::newGame()
 
 void Kolf::tutorial()
 {
-	TQString newfilename = KGlobal::dirs()->findResource("appdata", "tutorial.kolfgame");
+	TQString newfilename = TDEGlobal::dirs()->findResource("appdata", "tutorial.kolfgame");
 	if (newfilename.isNull())
 	        return;
 
@@ -369,7 +369,7 @@ void Kolf::createSpacer()
 	spacerPlayers.last().setId(1);
 
 	delete spacer;
-	spacer = new KolfGame(obj, &spacerPlayers, KGlobal::dirs()->findResource("appdata", "intro"), dummy);
+	spacer = new KolfGame(obj, &spacerPlayers, TDEGlobal::dirs()->findResource("appdata", "intro"), dummy);
 	spacer->setSound(false);
 	spacer->startFirstHole(1);
 	layout->addWidget(spacer, 0, 0, AlignCenter);
diff --git a/kolf/main.cpp b/kolf/main.cpp
index 8eb157fe..be2d4c6f 100644
--- a/kolf/main.cpp
+++ b/kolf/main.cpp
@@ -72,7 +72,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
 	TQApplication::setColorSpec(TQApplication::ManyColor);
 	TDEApplication a;
-	KGlobal::locale()->insertCatalogue("libtdegames");
+	TDEGlobal::locale()->insertCatalogue("libtdegames");
 
 	Kolf *top = new Kolf;
 
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 493b00fd..a617fc1f 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -104,7 +104,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 		externCourses = config->readListEntry("extra");
 
 		/// course loading
-		TQStringList items = externCourses + KGlobal::dirs()->findAllResources("appdata", "courses/*");
+		TQStringList items = externCourses + TDEGlobal::dirs()->findAllResources("appdata", "courses/*");
 		TQStringList nameList;
 		const TQString lastCourse(config->readEntry("course", ""));
 		int curItem = 0;
diff --git a/kolf/pluginloader.cpp b/kolf/pluginloader.cpp
index 8cf39d69..9f320856 100644
--- a/kolf/pluginloader.cpp
+++ b/kolf/pluginloader.cpp
@@ -17,7 +17,7 @@ ObjectList *PluginLoader::loadAll()
 	ObjectList *ret = new ObjectList;
 
 	TQStringList libs;
-	TQStringList files = KGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true);
+	TQStringList files = TDEGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true);
 
 	for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it)
 	{
-- 
cgit v1.2.3