diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/protocols/msn/msnchatsession.cpp | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/msn/msnchatsession.cpp')
-rw-r--r-- | kopete/protocols/msn/msnchatsession.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 6709f0f1..8e2113a1 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -173,7 +173,7 @@ void MSNChatSession::createChat( const TQString &handle, this, TQT_SLOT( slotSwitchBoardClosed() ) ); connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if(config->readBoolEntry( "SendTypingNotification" , true) ) { @@ -223,7 +223,7 @@ void MSNChatSession::slotUserJoined( const TQString &handle, const TQString &pub if(!m_messagesQueue.empty() || !m_invitations.isEmpty()) sendMessageQueue(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( members().count()==1 && config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() && !c->hasProperty(Kopete::Global::Properties::self()->photo().key())) slotRequestPicture(); @@ -584,7 +584,7 @@ void MSNChatSession::slotDisplayPictureChanged() } else { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() ) slotRequestPicture(); @@ -616,8 +616,8 @@ void MSNChatSession::receivedTypingMsg( const TQString &contactId, bool b ) if(c && m_newSession && !view(false)) { //this was originaly in MSNAccount::slotCreateChat - KGlobal::config()->setGroup( "MSN" ); - bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false ); + TDEGlobal::config()->setGroup( "MSN" ); + bool notifyNewChat = TDEGlobal::config()->readBoolEntry( "NotifyNewChat", false ); if ( notifyNewChat ) { // this internal message should open the window if they not exist |