Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

20 files changed, 56 insertions, 56 deletions

diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp
index cbfe7cb1..a229937c 100644
--- a/kopete/libkopete/avdevice/videodevicepool.cpp
+++ b/kopete/libkopete/avdevice/videodevicepool.cpp
@@ -756,7 +756,7 @@ void VideoDevicePool::loadConfig()
 	kdDebug(14010) <<  k_funcinfo << "called" << endl;
 	if((hasDevices())&&(m_clients==0))
 	{
-		KConfig *config = KGlobal::config();
+		KConfig *config = TDEGlobal::config();
 		config->setGroup("Video Device Settings");
 		const TQString currentdevice = config->readEntry("Current Device", TQString());
 		kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl;
@@ -817,7 +817,7 @@ void VideoDevicePool::saveConfig()
 	kdDebug(14010) <<  k_funcinfo << "called" << endl;
 	if(hasDevices())
 	{
-		KConfig *config = KGlobal::config();
+		KConfig *config = TDEGlobal::config();
 		config->setGroup("Video Device Settings");
 
 /*		if(m_modelvector.size())
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index c1347d75..c6c0b2c0 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -107,7 +107,7 @@ KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *parent,
 }
 
 KAutoConfig::KAutoConfig(TQObject *parent, const char *name) :
-    TQObject(parent, name), config(KGlobal::config()) {
+    TQObject(parent, name), config(TDEGlobal::config()) {
   d = new KAutoConfigPrivate();
 }
 
diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h
index c9b4fa2a..0aecd380 100644
--- a/kopete/libkopete/kautoconfig.h
+++ b/kopete/libkopete/kautoconfig.h
@@ -128,7 +128,7 @@ public:
  
   /**
    * Constructor.
-   * Uses KGlobal::config() when retrieving/saving the widgets that
+   * Uses TDEGlobal::config() when retrieving/saving the widgets that
    * KAutoConfig knows about.
    * @param parent - Parent object.
    * @param name - Object name.
diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h
index 91ce9886..be76dc26 100644
--- a/kopete/libkopete/kcautoconfigmodule.h
+++ b/kopete/libkopete/kcautoconfigmodule.h
@@ -56,12 +56,12 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule
   
 	public:
 		/**
-		* Standard KCModule constructor.  Use KGlobal::config()
+		* Standard KCModule constructor.  Use TDEGlobal::config()
 		*/
 		KCAutoConfigModule( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() );
 
 		/**
-		* Standard KCModule constructor.  Use KGlobal::config()
+		* Standard KCModule constructor.  Use TDEGlobal::config()
 		*/
 		KCAutoConfigModule( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
 
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index f072254f..5bae36fb 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -92,10 +92,10 @@ void KNotification::notifyByExecute(const TQString &command, const TQString& eve
 		if ( execLine.isEmpty() )
 			execLine = command; // fallback
 
-		KProcess p;
+		TDEProcess p;
 		p.setUseShell(true);
 		p << execLine;
-		p.start(KProcess::DontCare);
+		p.start(TDEProcess::DontCare);
 //		return true;
 	}
 	//return false;
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index bb8b3d36..f549d1f0 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -86,7 +86,7 @@ public:
 Account::Account( Protocol *parent, const TQString &accountId, const char *name )
  : TQObject( parent, name ), d( new Private( parent, accountId ) )
 {
-	d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id ));
+	d->configGroup=new KConfigGroup(TDEGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id ));
 
 	d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false );
 	d->color = d->configGroup->readColorEntry( "Color", &d->color );
@@ -185,7 +185,7 @@ TQPixmap Account::accountIcon(const int size) const
 	TQString icon= d->customIcon.isEmpty() ? d->protocol->pluginIcon() : d->customIcon;
 	
 	// FIXME: this code is duplicated with OnlineStatus, can we merge it somehow?
-	TQPixmap base = KGlobal::instance()->iconLoader()->loadIcon(
+	TQPixmap base = TDEGlobal::instance()->iconLoader()->loadIcon(
 		icon, KIcon::Small, size );
 
 	if ( d->color.isValid() )
diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp
index 7f014519..69f741cb 100644
--- a/kopete/libkopete/kopeteaccountmanager.cpp
+++ b/kopete/libkopete/kopeteaccountmanager.cpp
@@ -352,7 +352,7 @@ void AccountManager::save()
 		config->writeEntry( "AccountId", it.current()->accountId() );
 	}
 
-	KGlobal::config()->sync();
+	TDEGlobal::config()->sync();
 }
 
 void AccountManager::load()
@@ -364,7 +364,7 @@ void AccountManager::load()
 	// and load the required protocols if the account is enabled.
 	// Don't try to optimize duplicate calls out, the plugin queue is smart enough
 	// (and fast enough) to handle that without adding complexity here
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) );
 	for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
 	{
@@ -387,7 +387,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin )
 
 	// Iterate over all groups that start with "Account_" as those are accounts
 	// and parse them if they are from this protocol
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) );
 	for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
 	{
diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp
index 2b18da9c..13b4ca5d 100644
--- a/kopete/libkopete/kopeteaway.cpp
+++ b/kopete/libkopete/kopeteaway.cpp
@@ -143,9 +143,9 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away")
 
 
 	load();
-	KSettings::Dispatcher::self()->registerInstance( KGlobal::instance(), this, TQT_SLOT( load() ) );
+	KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQT_SLOT( load() ) );
 	// Set up the config object
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	/* Load the saved away messages */
 	config->setGroup("Away Messages");
 
@@ -255,7 +255,7 @@ void Kopete::Away::setGlobalAway(bool status)
 
 void Kopete::Away::save()
 {
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	/* Set the away message settings in the Away Messages config group */
 	config->setGroup("Away Messages");
 	config->writeEntry("Messages", d->awayMessageList);
@@ -267,7 +267,7 @@ void Kopete::Away::save()
 
 void Kopete::Away::load()
 {
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	config->setGroup("AutoAway");
 	d->awayTimeout=config->readNumEntry("Timeout", 600);
 	d->goAvailable=config->readBoolEntry("GoAvailable", true);
diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp
index 29dbf727..88fbd0ce 100644
--- a/kopete/libkopete/kopeteblacklister.cpp
+++ b/kopete/libkopete/kopeteblacklister.cpp
@@ -37,7 +37,7 @@ public:
 BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name)
  : TQObject(parent, name), d( new Private )
 {
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	
 	d->owner = accountId;
 	d->protocol = protocolId;
@@ -87,7 +87,7 @@ void BlackLister::removeContact(Contact *contact)
 
 void BlackLister::saveToDisk()
 {
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	
 	config->setGroup("BlackLister");
 	config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist );
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index 2b0aeb4d..eba7c4ed 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -87,7 +87,7 @@ struct CommandHandlerPrivate
 {
 	PluginCommandMap pluginCommands;
 	Kopete::CommandHandler *s_handler;
-	TQMap<KProcess*,ManagerPair> processMap;
+	TQMap<TDEProcess*,ManagerPair> processMap;
 	bool inCommand;
 	TQPtrList<KAction> m_commands;
 };
@@ -274,9 +274,9 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat
 {
 	if( !args.isEmpty() )
 	{
-		KProcess *proc = 0L;
+		TDEProcess *proc = 0L;
 		if ( kapp->authorize( TQString::fromLatin1( "shell_access" ) ) )
-				proc = new KProcess(manager);
+				proc = new TDEProcess(manager);
 		
 		if( proc )
 		{
@@ -294,9 +294,9 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat
 				*proc << args;
 			}
 
-			connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(KProcess *, char *, int)));
-			connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(KProcess *, char *, int)));
-			proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
+			connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(TDEProcess *, char *, int)));
+			connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(TDEProcess *, char *, int)));
+			proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
 		}
 		else
 		{
@@ -350,7 +350,7 @@ void Kopete::CommandHandler::slotCloseCommand( const TQString &, Kopete::ChatSes
 		manager->view()->closeView();
 }
 
-void Kopete::CommandHandler::slotExecReturnedData(KProcess *proc, char *buff, int bufflen )
+void Kopete::CommandHandler::slotExecReturnedData(TDEProcess *proc, char *buff, int bufflen )
 {
 	kdDebug(14010) << k_funcinfo << endl;
 	TQString buffer = TQString::fromLocal8Bit( buff, bufflen );
@@ -362,7 +362,7 @@ void Kopete::CommandHandler::slotExecReturnedData(KProcess *proc, char *buff, in
 		mgrPair.first->appendMessage( msg );
 }
 
-void Kopete::CommandHandler::slotExecFinished(KProcess *proc)
+void Kopete::CommandHandler::slotExecFinished(TDEProcess *proc)
 {
 	delete proc;
 	p->processMap.remove( proc );
diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h
index 143a0fc6..7c26ace5 100644
--- a/kopete/libkopete/kopetecommandhandler.h
+++ b/kopete/libkopete/kopetecommandhandler.h
@@ -23,7 +23,7 @@
 
 #include "kopete_export.h"
 
-class KProcess;
+class TDEProcess;
 
 struct CommandHandlerPrivate;
 
@@ -183,8 +183,8 @@ class KOPETE_EXPORT CommandHandler : public TQObject
 	private slots:
 		void slotPluginLoaded( Kopete::Plugin * );
 		void slotPluginDestroyed( TQObject * );
-		void slotExecReturnedData(KProcess *proc, char *buff, int bufflen );
-		void slotExecFinished(KProcess *proc);
+		void slotExecReturnedData(TDEProcess *proc, char *buff, int bufflen );
+		void slotExecFinished(TDEProcess *proc);
 		void slotViewCreated( KopeteView *view );
 
 		void slotHelpCommand( const TQString & args, Kopete::ChatSession *manager );
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index e692b6f5..85387709 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -721,15 +721,15 @@ TQString Contact::toolTip() const
 				switch(val.type())
 				{
 					case TQVariant::DateTime:
-						valueText = KGlobal::locale()->formatDateTime(val.toDateTime());
+						valueText = TDEGlobal::locale()->formatDateTime(val.toDateTime());
 						valueText = Kopete::Message::escape( valueText );
 						break;
 					case TQVariant::Date:
-						valueText = KGlobal::locale()->formatDate(val.toDate());
+						valueText = TDEGlobal::locale()->formatDate(val.toDate());
 						valueText = Kopete::Message::escape( valueText );
 						break;
 					case TQVariant::Time:
-						valueText = KGlobal::locale()->formatTime(val.toTime());
+						valueText = TDEGlobal::locale()->formatTime(val.toTime());
 						valueText = Kopete::Message::escape( valueText );
 						break;
 					default:
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index 1ecd1d00..07b23e81 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -324,7 +324,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
 	TQStringList overlays = statusFor.overlayIcons();
 	if ( !( overlays.isEmpty() ) ) // otherwise leave the basis as-is
 	{
-		KIconLoader *loader = KGlobal::instance()->iconLoader();
+		KIconLoader *loader = TDEGlobal::instance()->iconLoader();
 
 		int i = 0;
 		for( TQStringList::iterator it = overlays.begin(), end = overlays.end(); it != end; ++it )
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index ab2bc683..5fb1b847 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -380,7 +380,7 @@ Kopete::Password &Kopete::Password::operator=( Password &other )
 
 void Kopete::Password::readConfig()
 {
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	config->setGroup( d->configGroup );
 
 	TQString passwordCrypted = config->readEntry( "Password" );
@@ -395,7 +395,7 @@ void Kopete::Password::readConfig()
 
 void Kopete::Password::writeConfig()
 {
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	if(!config->hasGroup(d->configGroup))
 	{
 		//### (KOPETE)
diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index 12b3822a..4322dc34 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -258,7 +258,7 @@ void PluginManager::loadAllPlugins()
 {
 	// FIXME: We need session management here - Martijn
 
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) )
 	{
 		TQMap<TQString, bool> pluginsMap;
@@ -502,7 +502,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /*
 {
 	TQString pluginId = _pluginId;
 
-	KConfig *config = KGlobal::config();
+	KConfig *config = TDEGlobal::config();
 	config->setGroup( "Plugins" );
 
 	// FIXME: What is this for? This sort of thing is kconf_update's job - Richard
diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index 6e9072d0..353ea46d 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -39,7 +39,7 @@ KopetePrefs *KopetePrefs::prefs()
 
 KopetePrefs::KopetePrefs() : TQObject( kapp, "KopetePrefs" )
 {
-	config = KGlobal::config();
+	config = TDEGlobal::config();
 	load();
 }
 
@@ -82,20 +82,20 @@ void KopetePrefs::load()
 
 	mChatViewBufferSize = config->readNumEntry("ChatView BufferSize", 250);
 
-	TQColor tmpColor = KGlobalSettings::highlightColor();
+	TQColor tmpColor = TDEGlobalSettings::highlightColor();
 	mHighlightBackground = config->readColorEntry("Highlight Background Color", &tmpColor);
-	tmpColor = KGlobalSettings::highlightedTextColor();
+	tmpColor = TDEGlobalSettings::highlightedTextColor();
 	mHighlightForeground = config->readColorEntry("Highlight Foreground Color", &tmpColor);
 	mHighlightEnabled = config->readBoolEntry("Highlighting Enabled", true);
 	mBgOverride = config->readBoolEntry("ChatView Override Background", false);
 	mFgOverride = config->readBoolEntry("ChatView Override Foreground", false);
 	mRtfOverride = config->readBoolEntry("ChatView Override RTF", false);
 	mInterfacePreference = config->readEntry("View Plugin", TQString::fromLatin1("kopete_chatwindow") );
-	tmpColor = KGlobalSettings::textColor();
+	tmpColor = TDEGlobalSettings::textColor();
 	mTextColor = config->readColorEntry("Text Color", &tmpColor );
-	tmpColor = KGlobalSettings::baseColor();
+	tmpColor = TDEGlobalSettings::baseColor();
 	mBgColor = config->readColorEntry("Bg Color", &tmpColor );
-	tmpColor = KGlobalSettings::linkColor();
+	tmpColor = TDEGlobalSettings::linkColor();
 	mLinkColor = config->readColorEntry("Link Color", &tmpColor );
 	mFontFace = config->readFontEntry("Font Face");
 	tmpColor = darkGray;
@@ -137,7 +137,7 @@ void KopetePrefs::load()
 	mContactListIconMode = (IconDisplayMode) metaObject()->property( n )->keyToValue( value.latin1() );
 	mContactListIndentContacts = config->readBoolEntry("IndentContacts", false);
 	mContactListUseCustomFonts = config->readBoolEntry("UseCustomFonts", false);
-	TQFont font = KGlobalSettings::generalFont();
+	TQFont font = TDEGlobalSettings::generalFont();
 	mContactListGroupFont = config->readFontEntry("GroupFont", &font);
 	mContactListNormalFont = config->readFontEntry("NormalFont", &font);
 	if ( font.pixelSize() != -1 )
@@ -616,7 +616,7 @@ TQFont KopetePrefs::contactListSmallFont() const
 {
 	if ( mContactListUseCustomFonts )
 		return contactListCustomSmallFont();
-	TQFont smallFont = KGlobalSettings::generalFont();
+	TQFont smallFont = TDEGlobalSettings::generalFont();
 	if ( smallFont.pixelSize() != -1 )
 		smallFont.setPixelSize( (smallFont.pixelSize() * 3) / 4 );
 	else
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())
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index 08910d46..83c0e64c 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -94,7 +94,7 @@ void KopeteEmoticonTest::testEmoticonParser()
 			inputFile.close();
 			expectedFile.close();
 
-			TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() );
+			TQString path = TDEGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() );
 				
 			Kopete::Emoticons::self();
 			TQString result = emo.parse( inputData ).replace( path, TQString() );	
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index fffeec66..7291feb9 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -42,12 +42,12 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo
 	m_view=new FileConfirmBase(this, "FileConfirmView");
 	m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::fromLatin1( " <" ) +
 			info.contact()->contactId() + TQString::fromLatin1( "> " ) );
-	m_view->m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) );
+	m_view->m_size->setText( TDEGlobal::locale()->formatNumber( long( info.size() ), 0 ) );
 	m_view->m_description->setText( description );
 	m_view->m_filename->setText( info.file() );
 	
-	KGlobal::config()->setGroup("File Transfer");
-	const TQString defaultPath=KGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() );
+	TDEGlobal::config()->setGroup("File Transfer");
+	const TQString defaultPath=TDEGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() );
 	m_view->m_saveto->setText(defaultPath  + TQString::fromLatin1( "/" ) + info.file() );
 
 	setMainWidget(m_view);
@@ -77,8 +77,8 @@ void KopeteFileConfirmDialog::slotUser2()
 		const TQString directory=url.directory();
 		if(!directory.isEmpty())
 		{
-			KGlobal::config()->setGroup("File Transfer");
-			KGlobal::config()->writeEntry("defaultPath" , directory );
+			TDEGlobal::config()->setGroup("File Transfer");
+			TDEGlobal::config()->writeEntry("defaultPath" , directory );
 		}
 		
 		if(TQFile(m_view->m_saveto->text()).exists())