diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:52:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:52:14 -0600 |
| commit | 2e53bd0b77676f879fad7baeecea5879bf496a7d (patch) | |
| tree | 518dd08a0776eaeec89c9772676c3b8b35208d39 | |
| parent | 3a41b8717f3769966a157f243f46bc58dea9bbd7 (diff) | |
| download | tdenetwork-2e53bd0b77676f879fad7baeecea5879bf496a7d.tar.gz tdenetwork-2e53bd0b77676f879fad7baeecea5879bf496a7d.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
| -rw-r--r-- | kopete/KABC_INTEG_NOTES | 2 | ||||
| -rw-r--r-- | kopete/libkopete/kopetepluginmanager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES index f249f22c..2cf33e8e 100644 --- a/kopete/KABC_INTEG_NOTES +++ b/kopete/KABC_INTEG_NOTES @@ -406,7 +406,7 @@ Notes Client would need to identify addressbook entries that are IM contactable, and obtain status information from an IM app or library. -David Faure says it's possible to do loose lazy binding to the app responsible for providing status information as in 1). Something to do with KTrader and DCOP. We would need some DCOP to return status info to the client from the IM app. +David Faure says it's possible to do loose lazy binding to the app responsible for providing status information as in 1). Something to do with TDETrader and DCOP. We would need some DCOP to return status info to the client from the IM app. Showing the IM status of a contact in KMail, in KAddressBook.... A "reply-by-IM" action in KMail diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 5648e0cc..4c94a326 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -91,7 +91,7 @@ PluginManager* PluginManager::self() PluginManager::PluginManager() : TQObject( tqApp ), d( new Private ) { - d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "Kopete/Plugin" ), + d->plugins = KPluginInfo::fromServices( TDETrader::self()->query( TQString::fromLatin1( "Kopete/Plugin" ), TQString::fromLatin1( "[X-Kopete-Version] == 1000900" ) ) ); // We want to add a reference to the application's event loop so we |