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 | |
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')
-rw-r--r-- | kopete/protocols/msn/msnaccount.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/msn/msnchatsession.cpp | 10 | ||||
-rw-r--r-- | kopete/protocols/msn/msncontact.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/msn/msnswitchboardsocket.cpp | 6 | ||||
-rw-r--r-- | kopete/protocols/msn/ui/msneditaccountwidget.cpp | 8 | ||||
-rw-r--r-- | kopete/protocols/msn/webcam.cpp | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index c4dcabf2..034f2548 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -1184,8 +1184,8 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co * see MSNChatSession::receivedTypingMsg * - KGlobal::config()->setGroup( "MSN" ); - bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false ); + TDEGlobal::config()->setGroup( "MSN" ); + bool notifyNewChat = TDEGlobal::config()->readBoolEntry( "NotifyNewChat", false ); if ( !ID.isEmpty() && notifyNewChat ) { // this temporary message should open the window if they not exist 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 diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 700bf213..e77ba2ff 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -700,7 +700,7 @@ void MSNContact::setObject(const TQString &obj) removeProperty( Kopete::Global::Properties::self()->photo() ) ; emit displayPictureChanged(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty() && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible ) 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 ) ) { diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 4bb246a2..60672824 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -84,8 +84,8 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->autoConfig->retrieveSettings( true ); //Get a list of all jabber accounts - KGlobal::config()->setGroup("MSN"); - TQString jab_account=KGlobal::config()->readEntry("JabberAccount"); + TDEGlobal::config()->setGroup("MSN"); + TQString jab_account=TDEGlobal::config()->readEntry("JabberAccount"); TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *a=accounts.first() ; a; a=accounts.next() ) @@ -192,8 +192,8 @@ MSNEditAccountWidget::~MSNEditAccountWidget() Kopete::Account * MSNEditAccountWidget::apply() { d->autoConfig->saveSettings(); - KGlobal::config()->setGroup("MSN"); - KGlobal::config()->writeEntry("JabberAccount", d->ui->JabberAccount->currentText()); + TDEGlobal::config()->setGroup("MSN"); + TDEGlobal::config()->writeEntry("JabberAccount", d->ui->JabberAccount->currentText()); if ( !account() ) setAccount( new MSNAccount( d->protocol, d->ui->m_login->text() ) ); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 88fe7d33..43b0f33e 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -54,7 +54,7 @@ Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessio m_mimic=0L; m_widget=0L; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); // Read the configuration to get the number of frame per second to send @@ -519,7 +519,7 @@ TQString Webcam::xml(uint session , uint rid) int Webcam::getAvailablePort() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); TQString basePort=config->readEntry("WebcamPort"); if(basePort.isEmpty() || basePort == "0" ) |