diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 10:47:50 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 10:47:50 -0600 |
commit | 508a397f42749ce7956ca2e6a26a926283fb9da0 (patch) | |
tree | a9634bed699f47a9d3bd70d92d97f88952926e86 | |
parent | 40ef10c65af273f91ca4dbc115fca0ffb867a85d (diff) | |
download | libkipi-508a397f42749ce7956ca2e6a26a926283fb9da0.tar.gz libkipi-508a397f42749ce7956ca2e6a26a926283fb9da0.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r-- | libkipi/libkipi/pluginloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkipi/libkipi/pluginloader.cpp b/libkipi/libkipi/pluginloader.cpp index 24aff7e..73ea332 100644 --- a/libkipi/libkipi/pluginloader.cpp +++ b/libkipi/libkipi/pluginloader.cpp @@ -204,11 +204,11 @@ PluginLoader::PluginLoader( const TQStringList& ignores, Interface* interface ) d->m_interface = interface; d->m_ignores = ignores; - KTrader::OfferList offers = KTrader::self()->query("KIPI/Plugin"); + TDETrader::OfferList offers = TDETrader::self()->query("KIPI/Plugin"); TDEConfig* config = TDEGlobal::config(); config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) ); - KTrader::OfferList::ConstIterator iter; + TDETrader::OfferList::ConstIterator iter; for(iter = offers.begin(); iter != offers.end(); ++iter) { KService::Ptr service = *iter; |