diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:42:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:42:26 -0600 |
| commit | 786304c6211f35ddc4cdd54b7aa7985fef4a2e70 (patch) | |
| tree | c881806a53e2864b7e183f4930f0b20abf657c38 /chalk | |
| parent | 0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (diff) | |
| download | koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.tar.gz koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'chalk')
| -rw-r--r-- | chalk/chalkcolor/kis_colorspace_factory_registry.cc | 4 | ||||
| -rw-r--r-- | chalk/core/kis_filter_registry.cc | 4 | ||||
| -rw-r--r-- | chalk/core/kis_paintop_registry.cc | 4 | ||||
| -rw-r--r-- | chalk/ui/kis_tool_registry.cc | 4 | ||||
| -rw-r--r-- | chalk/ui/kis_view.cc | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc index a193bb31..8c579e32 100644 --- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc +++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc @@ -62,7 +62,7 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF */ // Load all colorspace modules - KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"), + TDETrader::OfferList offers = TDETrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"), TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); @@ -71,7 +71,7 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF abort(); } - KTrader::OfferList::ConstIterator iter; + TDETrader::OfferList::ConstIterator iter; for(iter = offers.begin(); iter != offers.end(); ++iter) { KService::Ptr service = *iter; diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc index 8cf324e1..2ba41d54 100644 --- a/chalk/core/kis_filter_registry.cc +++ b/chalk/core/kis_filter_registry.cc @@ -40,11 +40,11 @@ KisFilterRegistry::KisFilterRegistry() Q_ASSERT(KisFilterRegistry::m_singleton == 0); KisFilterRegistry::m_singleton = this; - KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"), + TDETrader::OfferList offers = TDETrader::self()->query(TQString::fromLatin1("Chalk/Filter"), 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) { diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc index 7b578750..7d31b79f 100644 --- a/chalk/core/kis_paintop_registry.cc +++ b/chalk/core/kis_paintop_registry.cc @@ -43,11 +43,11 @@ KisPaintOpRegistry::KisPaintOpRegistry() Q_ASSERT(KisPaintOpRegistry::m_singleton == 0); KisPaintOpRegistry::m_singleton = this; - KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"), + TDETrader::OfferList offers = TDETrader::self()->query(TQString::fromLatin1("Chalk/Paintop"), 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) { diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc index 2469a328..d96f8ef4 100644 --- a/chalk/ui/kis_tool_registry.cc +++ b/chalk/ui/kis_tool_registry.cc @@ -37,11 +37,11 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0; KisToolRegistry::KisToolRegistry() { // Load all modules: color models, paintops, filters - KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Tool"), + TDETrader::OfferList offers = TDETrader::self()->query(TQString::fromLatin1("Chalk/Tool"), 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) { 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; |