summaryrefslogtreecommitdiffstats
path: root/chalk/ui/kis_view.cc
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 /chalk/ui/kis_view.cc
parent0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (diff)
downloadkoffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.tar.gz
koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'chalk/ui/kis_view.cc')
-rw-r--r--chalk/ui/kis_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index db24209b..6c8303d7 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -313,10 +313,10 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this);
// Load all plugins
- KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"),
+ TDETrader::OfferList offers = TDETrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"),
TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));
- KTrader::OfferList::ConstIterator iter;
+ TDETrader::OfferList::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter)
{
KService::Ptr service = *iter;