diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:52:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:52:27 -0600 |
| commit | b440a9c608596cd88efdb3bfa4661c5e37efbe4b (patch) | |
| tree | 83fe0c80cbb2bbcfefac383520869fe3a64e88f1 /libtdepim | |
| parent | 6dea9442526e5ebacf313ad387c7dff4b87a53bf (diff) | |
| download | tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.tar.gz tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim')
| -rw-r--r-- | libtdepim/komposer/core/pluginmanager.cpp | 2 | ||||
| -rw-r--r-- | libtdepim/komposer/core/prefsmodule.cpp | 4 | ||||
| -rw-r--r-- | libtdepim/kscoringeditor.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index c3355f55..46ed9497 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 7abdb0e1..eeeaff62 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" ) ) ) diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 37c9abc5..d46343d6 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -129,7 +129,7 @@ void SingleConditionWidget::toggleRegExpButton( int selected ) { bool isRegExp = (KScoringExpression::MATCH == selected || KScoringExpression::MATCHCS == selected) && - !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); + !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); regExpButton->setEnabled( isRegExp ); } |