Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 9dbe63f2 authored by Laurent Montel's avatar Laurent Montel 😁

Adapt to new kdelibs api

svn path=/trunk/koffice/; revision=543582
parent 3c3ed838
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include <klocale.h> #include <klocale.h>
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kservice.h> #include <kservice.h>
#include <ktrader.h> #include <kservicetypetrader.h>
#include <kparts/componentfactory.h> #include <kparts/componentfactory.h>
#include "kis_debug_areas.h" #include "kis_debug_areas.h"
#include <math.h> #include <math.h>
...@@ -39,11 +40,11 @@ KisFilterRegistry::KisFilterRegistry() ...@@ -39,11 +40,11 @@ KisFilterRegistry::KisFilterRegistry()
Q_ASSERT(KisFilterRegistry::m_singleton == 0); Q_ASSERT(KisFilterRegistry::m_singleton == 0);
KisFilterRegistry::m_singleton = this; KisFilterRegistry::m_singleton = this;
KTrader::OfferList offers = KTrader::self()->query(QString::fromLatin1("Krita/Filter"), KService::List offers = KServiceTypeTrader::self()->query(QString::fromLatin1("Krita/Filter"),
QString::fromLatin1("(Type == 'Service') and " QString::fromLatin1("(Type == 'Service') and "
"([X-Krita-Version] == 2)")); "([X-Krita-Version] == 2)"));
KTrader::OfferList::ConstIterator iter; KService::List::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter) for(iter = offers.begin(); iter != offers.end(); ++iter)
{ {
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kservice.h> #include <kservice.h>
#include <ktrader.h>
#include <kparts/componentfactory.h> #include <kparts/componentfactory.h>
#include <kservicetypetrader.h>
#include "kis_generic_registry.h" #include "kis_generic_registry.h"
#include "kis_types.h" #include "kis_types.h"
...@@ -43,11 +43,11 @@ KisPaintOpRegistry::KisPaintOpRegistry() ...@@ -43,11 +43,11 @@ KisPaintOpRegistry::KisPaintOpRegistry()
Q_ASSERT(KisPaintOpRegistry::m_singleton == 0); Q_ASSERT(KisPaintOpRegistry::m_singleton == 0);
KisPaintOpRegistry::m_singleton = this; KisPaintOpRegistry::m_singleton = this;
KTrader::OfferList offers = KTrader::self()->query(QString::fromLatin1("Krita/Paintop"), KService::List offers = KServiceTypeTrader::self()->query(QString::fromLatin1("Krita/Paintop"),
QString::fromLatin1("(Type == 'Service') and " QString::fromLatin1("(Type == 'Service') and "
"([X-Krita-Version] == 2)")); "([X-Krita-Version] == 2)"));
KTrader::OfferList::ConstIterator iter; KService::List::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter) for(iter = offers.begin(); iter != offers.end(); ++iter)
{ {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <kaction.h> #include <kaction.h>
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kservice.h> #include <kservice.h>
#include <ktrader.h> #include <kservicetypetrader.h>
#include <kparts/componentfactory.h> #include <kparts/componentfactory.h>
#include "kis_generic_registry.h" #include "kis_generic_registry.h"
...@@ -37,11 +37,11 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0; ...@@ -37,11 +37,11 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0;
KisToolRegistry::KisToolRegistry() KisToolRegistry::KisToolRegistry()
{ {
// Load all modules: color models, paintops, filters // Load all modules: color models, paintops, filters
KTrader::OfferList offers = KTrader::self()->query(QString::fromLatin1("Krita/Tool"), KService::List offers = KServiceTypeTrader::self()->query(QString::fromLatin1("Krita/Tool"),
QString::fromLatin1("(Type == 'Service') and " QString::fromLatin1("(Type == 'Service') and "
"([X-Krita-Version] == 2)")); "([X-Krita-Version] == 2)"));
KTrader::OfferList::ConstIterator iter; KService::List::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter) for(iter = offers.begin(); iter != offers.end(); ++iter)
{ {
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
#include <ktoolbar.h> #include <ktoolbar.h>
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kservice.h> #include <kservice.h>
#include <ktrader.h> #include <kservicetypetrader.h>
#include <kparts/componentfactory.h> #include <kparts/componentfactory.h>
#include <kparts/event.h> #include <kparts/event.h>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
...@@ -332,10 +332,10 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, QWidget *parent, const ch ...@@ -332,10 +332,10 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, QWidget *parent, const ch
m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this); m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this);
// Load all plugins // Load all plugins
KTrader::OfferList offers = KTrader::self()->query(QString::fromLatin1("Krita/ViewPlugin"), KService::List offers = KServiceTypeTrader::self()->query(QString::fromLatin1("Krita/ViewPlugin"),
QString::fromLatin1("(Type == 'Service') and " QString::fromLatin1("(Type == 'Service') and "
"([X-Krita-Version] == 2)")); "([X-Krita-Version] == 2)"));
KTrader::OfferList::ConstIterator iter; KService::List::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter) for(iter = offers.begin(); iter != offers.end(); ++iter)
{ {
KService::Ptr service = *iter; KService::Ptr service = *iter;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment