From c48e769eb275917717e2b55eb869f7e559293ac8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:48:31 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kopete/protocols/msn/msnswitchboardsocket.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kopete/protocols/msn/msnswitchboardsocket.cpp') diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 3298e46e..f2a7e667 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -419,7 +419,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) else if( type== "text/x-mms-emoticon" || type== "text/x-mms-animemoticon") { // TODO remove Displatcher. - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readBoolEntry( "useCustomEmoticons", true ) ) { @@ -466,7 +466,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!m_clientcapsSent) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); TQString JabberID; @@ -667,7 +667,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) } #endif - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readBoolEntry( "exportEmoticons", false ) ) { -- cgit v1.2.1