summaryrefslogtreecommitdiffstats
path: root/filters
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:42:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:42:26 -0600
commit786304c6211f35ddc4cdd54b7aa7985fef4a2e70 (patch)
treec881806a53e2864b7e183f4930f0b20abf657c38 /filters
parent0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (diff)
downloadkoffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.tar.gz
koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'filters')
-rw-r--r--filters/generic_wrapper/generic_filter.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc
index d380ba09..e5664696 100644
--- a/filters/generic_wrapper/generic_filter.cc
+++ b/filters/generic_wrapper/generic_filter.cc
@@ -45,13 +45,13 @@ KoFilter::ConversionStatus GenericFilter::convert( const TQCString &from, const
{
//find the right script to use
- KTrader::OfferList offers = KTrader::self()->query("KOfficeGenericFilter",
+ TDETrader::OfferList offers = TDETrader::self()->query("KOfficeGenericFilter",
"(Type == 'Service') and ('KOfficeGenericFilter' in ServiceTypes) and (exist Exec)");
if (offers.isEmpty())
return KoFilter::NotImplemented;
- KTrader::OfferList::ConstIterator it;
+ TDETrader::OfferList::ConstIterator it;
for (it=offers.begin(); it!=offers.end(); ++it)
{
kdDebug() << "Got a filter script, exec: " << (*it)->exec() <<