From 0117fbed932653a04aeef16b2ed7edee858959ac Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:52:50 -0600 Subject: Rename KLock and KTrader to avoid conflicts with KDE4 --- kbabel/common/catalog.cpp | 8 ++++---- kbabel/common/exportplugin.cpp | 4 ++-- kbabel/common/importplugin.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kbabel/common') 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 diff --git a/kbabel/common/exportplugin.cpp b/kbabel/common/exportplugin.cpp index 0fe7ad6b..756199cc 100644 --- a/kbabel/common/exportplugin.cpp +++ b/kbabel/common/exportplugin.cpp @@ -60,9 +60,9 @@ TQStringList CatalogExportPlugin::availableExportMimeTypes() { TQStringList result; - KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "exist [X-TDE-Export]"); + TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "exist [X-TDE-Export]"); - for( KTrader::OfferListIterator ptr = offers.begin(); ptr!=offers.end() ; ++ptr ) + for( TDETrader::OfferListIterator ptr = offers.begin(); ptr!=offers.end() ; ++ptr ) { result += (*ptr)->property("X-TDE-Export").toStringList(); } diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp index 509f98e6..e7b63736 100644 --- a/kbabel/common/importplugin.cpp +++ b/kbabel/common/importplugin.cpp @@ -171,9 +171,9 @@ TQStringList CatalogImportPlugin::availableImportMimeTypes() { TQStringList result; - KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "exist [X-TDE-Import]"); + TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "exist [X-TDE-Import]"); - for( KTrader::OfferListIterator ptr = offers.begin(); ptr!=offers.end() ; ++ptr ) + for( TDETrader::OfferListIterator ptr = offers.begin(); ptr!=offers.end() ; ++ptr ) { result += (*ptr)->property("X-TDE-Import").toStringList(); } -- cgit v1.2.1