diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:52:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:52:50 -0600 |
| commit | 0117fbed932653a04aeef16b2ed7edee858959ac (patch) | |
| tree | 769ae82d3aec3a66184bd33b65843380b5265fbb /kbabel/common/catalog.cpp | |
| parent | 087f8d4521b0bc6614dc4b664b23674a7f5f5020 (diff) | |
| download | tdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.tar.gz tdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/common/catalog.cpp')
| -rw-r--r-- | kbabel/common/catalog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index 601f113f..3f288826 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -900,14 +900,14 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) // gimme plugin for this MIME type KMimeType::Ptr mime = KMimeType::findByURL( url, 0, true ); kdDebug() << "Found mimetype: " << mime->name() << endl; - KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Import])"); + TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Import])"); KService::Ptr ptr = offers.first(); // we have no offer for this MIME type if( !ptr ) { kdDebug(KBABEL) << "No plugin for this type, will try PO" << endl; - offers = KTrader::self()->query("KBabelFilter", "('application/x-gettext' in [X-TDE-Import])"); + offers = TDETrader::self()->query("KBabelFilter", "('application/x-gettext' in [X-TDE-Import])"); ptr = offers.first(); if( !ptr ) { @@ -1003,7 +1003,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons // gimme plugin for this MIME type KMimeType::Ptr mime = KMimeType::findByURL( openUrl, 0, true ); - KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Import])"); + TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Import])"); KService::Ptr ptr = offers.first(); // we have no offer for this MIME type @@ -2071,7 +2071,7 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite) // gimme plugin for this MIME type KMimeType::Ptr mime = KMimeType::findByURL( KURL::fromPathOrURL( localFile ) ); - KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Export])"); + TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Export])"); KService::Ptr ptr = offers.first(); // we have no offer for this MIME type |