summaryrefslogtreecommitdiffstats
path: root/libtdepim/komposer
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:52:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:52:27 -0600
commitb440a9c608596cd88efdb3bfa4661c5e37efbe4b (patch)
tree83fe0c80cbb2bbcfefac383520869fe3a64e88f1 /libtdepim/komposer
parent6dea9442526e5ebacf313ad387c7dff4b87a53bf (diff)
downloadtdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.tar.gz
tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim/komposer')
-rw-r--r--libtdepim/komposer/core/pluginmanager.cpp2
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index c3355f551..46ed94975 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -82,7 +82,7 @@ PluginManager::PluginManager( TQObject *parent )
this, TQT_SLOT( loadAllPlugins() ) );
d->plugins = KPluginInfo::fromServices(
- KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
+ TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) );
}
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 7abdb0e18..eeeaff62d 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -100,9 +100,9 @@ EditorSelection::readConfig()
{
m_editorsCombo->clear();
- KTrader::OfferList editors = KTrader::self()->query(
+ TDETrader::OfferList editors = TDETrader::self()->query(
TQString::fromLatin1( "Komposer/Editor" ) );
- KTrader::OfferList::ConstIterator it;
+ TDETrader::OfferList::ConstIterator it;
int i = 0;
for ( it = editors.begin(); it != editors.end(); ++it, ++i ) {
if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) )