summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:39:09 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:39:09 -0600
commit901142271552ba0db82154c8e59f99d507b3062d (patch)
treed025404395afe53006938646c604132b3ec45e55
parent35073c91a5e9a834c2bf06fc0a227116c657d855 (diff)
downloaddigikam-901142271552ba0db82154c8e59f99d507b3062d.tar.gz
digikam-901142271552ba0db82154c8e59f99d507b3062d.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--digikam/digikam/albumiconview.cpp6
-rw-r--r--digikam/digikam/imagepreviewview.cpp4
-rw-r--r--digikam/tdeioslave/digikamthumbnail.cpp4
-rw-r--r--digikam/utilities/imageeditor/canvas/imagepluginloader.cpp16
-rw-r--r--digikam/utilities/lighttable/lighttablepreview.cpp4
5 files changed, 17 insertions, 17 deletions
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index aa1f70f..5b0d0bc 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -549,11 +549,11 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
KMimeType::Ptr mimePtr = KMimeType::findByURL(iconItem->imageInfo()->kurl(), 0, true, true);
TQValueVector<KService::Ptr> serviceVector;
- KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'");
+ TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(), "Type == 'Application'");
TQPopupMenu openWithMenu;
- KTrader::OfferList::Iterator iter;
+ TDETrader::OfferList::Iterator iter;
KService::Ptr ptr;
int index = 100;
@@ -1120,7 +1120,7 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item)
{
KMimeType::Ptr mimePtr = KMimeType::findByURL(item->imageInfo()->kurl(),
0, true, true);
- KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(),
+ TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(),
"Type == 'Application'");
if (offers.isEmpty())
diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp
index ceb2976..ebbbf6e 100644
--- a/digikam/digikam/imagepreviewview.cpp
+++ b/digikam/digikam/imagepreviewview.cpp
@@ -342,11 +342,11 @@ void ImagePreviewView::slotContextMenu()
KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true);
TQValueVector<KService::Ptr> serviceVector;
- KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'");
+ TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(), "Type == 'Application'");
TQPopupMenu openWithMenu;
- KTrader::OfferList::Iterator iter;
+ TDETrader::OfferList::Iterator iter;
KService::Ptr ptr;
int index = 100;
diff --git a/digikam/tdeioslave/digikamthumbnail.cpp b/digikam/tdeioslave/digikamthumbnail.cpp
index c78b362..781fe0b 100644
--- a/digikam/tdeioslave/digikamthumbnail.cpp
+++ b/digikam/tdeioslave/digikamthumbnail.cpp
@@ -545,8 +545,8 @@ bool tdeio_digikamthumbnailProtocol::loadKDEThumbCreator(TQImage& image, const T
TQString plugin;
- KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
- for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+ TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
+ for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
{
TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
index ca76d7c..49a1b11 100644
--- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
+++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
@@ -92,8 +92,8 @@ ImagePluginLoader::ImagePluginLoader(TQObject *parent, SplashScreen *splash)
TQStringList imagePluginsList2Load;
- KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin");
- KTrader::OfferList::ConstIterator iter;
+ TDETrader::OfferList offers = TDETrader::self()->query("Digikam/ImagePlugin");
+ TDETrader::OfferList::ConstIterator iter;
for (iter = offers.begin() ; iter != offers.end() ; ++iter)
{
@@ -116,8 +116,8 @@ void ImagePluginLoader::loadPluginsFromList(const TQStringList& list)
if (d->splash)
d->splash->message(i18n("Loading Image Plugins"));
- KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin");
- KTrader::OfferList::ConstIterator iter;
+ TDETrader::OfferList offers = TDETrader::self()->query("Digikam/ImagePlugin");
+ TDETrader::OfferList::ConstIterator iter;
int cpt = 0;
@@ -227,8 +227,8 @@ ImagePlugin* ImagePluginLoader::pluginIsLoaded(const TQString& name)
ImagePlugin* ImagePluginLoader::pluginInstance(const TQString& libraryName)
{
- KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin");
- KTrader::OfferList::ConstIterator iter;
+ TDETrader::OfferList offers = TDETrader::self()->query("Digikam/ImagePlugin");
+ TDETrader::OfferList::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter)
{
@@ -245,8 +245,8 @@ ImagePlugin* ImagePluginLoader::pluginInstance(const TQString& libraryName)
bool ImagePluginLoader::pluginLibraryIsLoaded(const TQString& libraryName)
{
- KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin");
- KTrader::OfferList::ConstIterator iter;
+ TDETrader::OfferList offers = TDETrader::self()->query("Digikam/ImagePlugin");
+ TDETrader::OfferList::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter)
{
diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp
index d163590..8387fa3 100644
--- a/digikam/utilities/lighttable/lighttablepreview.cpp
+++ b/digikam/utilities/lighttable/lighttablepreview.cpp
@@ -356,11 +356,11 @@ void LightTablePreview::slotContextMenu()
KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true);
TQValueVector<KService::Ptr> serviceVector;
- KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'");
+ TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(), "Type == 'Application'");
TQPopupMenu openWithMenu;
- KTrader::OfferList::Iterator iter;
+ TDETrader::OfferList::Iterator iter;
KService::Ptr ptr;
int index = 100;