summaryrefslogtreecommitdiffstats
path: root/karbon
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 /karbon
parent0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (diff)
downloadkoffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.tar.gz
koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'karbon')
-rw-r--r--karbon/karbon_factory.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index f7e3dc07..9edc8b37 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -49,10 +49,10 @@ KarbonFactory::KarbonFactory( TQObject* parent, const char* name )
KarbonToolRegistry::instance();
// Load plugins
- KTrader::OfferList offers = KTrader::self() -> query(TQString::fromLatin1("Karbon/CoreModule"),
+ TDETrader::OfferList offers = TDETrader::self() -> query(TQString::fromLatin1("Karbon/CoreModule"),
TQString::fromLatin1("Type == 'Service'"));
- KTrader::OfferList::ConstIterator iter;
+ TDETrader::OfferList::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter)
{