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/oscar/oscarversionupdater.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kopete/protocols/oscar/oscarversionupdater.cpp') diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index 90981434..d79e47fc 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -66,7 +66,7 @@ bool OscarVersionUpdater::update( unsigned int stamp ) { mVersionData.resize( 0 ); - KConfigGroup config( KGlobal::config(), "Oscar" ); + KConfigGroup config( TDEGlobal::config(), "Oscar" ); TQString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" ); mTransferJob = KIO::get ( url ); kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl; @@ -87,7 +87,7 @@ unsigned int OscarVersionUpdater::stamp() const void OscarVersionUpdater::initICQVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "ICQVersion" ); + KConfigGroup config( TDEGlobal::config(), "ICQVersion" ); mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" ); mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 ); @@ -104,7 +104,7 @@ void OscarVersionUpdater::initAIMVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "AIMVersion" ); + KConfigGroup config( TDEGlobal::config(), "AIMVersion" ); mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" ); mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 ); @@ -264,7 +264,7 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElem void OscarVersionUpdater::storeVersionInfo( const TQString& group, const Oscar::ClientVersion& version ) const { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Storing version info to group: " << group << endl; - KConfigGroup config( KGlobal::config(), group ); + KConfigGroup config( TDEGlobal::config(), group ); config.writeEntry( "ClientString", version.clientString ); config.writeEntry( "ClientId", version.clientId ); -- cgit v1.2.1