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

---
 kopete/libkopete/private/kopeteemoticons.cpp   | 6 +++---
 kopete/libkopete/private/kopeteviewmanager.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kopete/libkopete/private')

diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index f7fbb373..8ea3dad4 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -296,7 +296,7 @@ Emoticons::~Emoticons(  )
 
 void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList &emoticons )
 {
-	KStandardDirs *dir = KGlobal::dirs();
+	KStandardDirs *dir = TDEGlobal::dirs();
 	TQString pic;
 
 	//maybe an extension was given, so try to find the exact file
@@ -365,10 +365,10 @@ void Emoticons::initEmoticons( const TQString &theme )
 	d->emoticonAndPicList.clear();
 	d->emoticonMap.clear();
 
-	TQString filename= KGlobal::dirs()->findResource( "emoticons",  d->theme + TQString::fromLatin1( "/emoticons.xml" ) );
+	TQString filename= TDEGlobal::dirs()->findResource( "emoticons",  d->theme + TQString::fromLatin1( "/emoticons.xml" ) );
 	if(!filename.isEmpty())
 		return initEmoticon_emoticonsxml( filename );
-	filename= KGlobal::dirs()->findResource( "emoticons",  d->theme + TQString::fromLatin1( "/icondef.xml" ) );
+	filename= TDEGlobal::dirs()->findResource( "emoticons",  d->theme + TQString::fromLatin1( "/icondef.xml" ) );
 	if(!filename.isEmpty())
 		return initEmoticon_JEP0038( filename );
 	kdWarning(14010) << k_funcinfo << "emotiucon XML theme description not found" <<endl;
diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp
index 783c399c..2a5074f8 100644
--- a/kopete/libkopete/private/kopeteviewmanager.cpp
+++ b/kopete/libkopete/private/kopeteviewmanager.cpp
@@ -205,7 +205,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi
 				&& msg.direction() != Kopete::Message::Internal )
 		{
 			TQWidget *w=dynamic_cast<TQWidget*>(manager->view(false));
-			KConfig *config = KGlobal::config();
+			KConfig *config = TDEGlobal::config();
 			config->setGroup("General");
 			if( (!manager->view(false) || !w || manager->view() != d->activeView ||
 						   config->readBoolEntry("EventIfActive", true) || !w->isActiveWindow())
-- 
cgit v1.2.1