diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:48:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:48:31 -0600 |
| commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
| tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/libkopete/private | |
| 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/libkopete/private')
| -rw-r--r-- | kopete/libkopete/private/kopeteemoticons.cpp | 6 | ||||
| -rw-r--r-- | kopete/libkopete/private/kopeteviewmanager.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
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()) |