[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/plugins/assistants/RulerAssistant
From:       Adrian Page <adrian () pagenet ! plus ! com>
Date:       2010-01-07 21:06:19
Message-ID: 1262898379.329400.24295.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1071325 by page:

Fix deprecated warnings by changing

typedef KGenericFactory<Plugin> PluginFactory;
K_EXPORT_COMPONENT_FACTORY(lib, PluginFactory("krita"))

to

K_PLUGIN_FACTORY(PluginFactory, registerPlugin<Plugin>();)
K_EXPORT_PLUGIN(PluginFactory("krita"))

Remove unneeded includes and parameter.

 M  +1 -1      kis_ruler_assistant_tool.h  
 M  +5 -20     ruler_assistant_tool.cc  
 M  +3 -2      ruler_assistant_tool.h  


--- trunk/koffice/krita/plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.h #1071324:1071325
@@ -60,7 +60,7 @@
 class KisRulerAssistantToolFactory : public KoToolFactory
 {
 public:
-    KisRulerAssistantToolFactory(QObject *parent, const QStringList&)
+    KisRulerAssistantToolFactory(QObject *parent)
             : KoToolFactory(parent, "KisRulerAssistantTool") {
         setToolTip(i18n("Ruler assistant editor tool"));
         setToolType(TOOL_TYPE_VIEW);
--- trunk/koffice/krita/plugins/assistants/RulerAssistant/ruler_assistant_tool.cc #1071324:1071325
@@ -17,34 +17,19 @@
 #include "ruler_assistant_tool.h"
 #include "kis_ruler_assistant_tool.h"
 
-#include <stdlib.h>
-#include <vector>
+#include <kpluginfactory.h>
 
-#include <qpoint.h>
-
-#include <klocale.h>
-#include <kiconloader.h>
-#include <kcomponentdata.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kis_debug.h>
-#include <kgenericfactory.h>
-
-#include <kis_global.h>
-#include <kis_types.h>
 #include <KoToolRegistry.h>
 
+K_PLUGIN_FACTORY(RulerAssistantToolFactory, registerPlugin<RulerAssistantToolPlugin>();)
+K_EXPORT_PLUGIN(RulerAssistantToolFactory("krita"))
 
 
-typedef KGenericFactory<RulerAssistantToolPlugin> RulerAssistantToolFactory;
-K_EXPORT_COMPONENT_FACTORY(kritarulerassistanttool, RulerAssistantToolFactory("krita"))
-
-
-RulerAssistantToolPlugin::RulerAssistantToolPlugin(QObject *parent, const QStringList &)
+RulerAssistantToolPlugin::RulerAssistantToolPlugin(QObject *parent, const QVariantList &)
         : QObject(parent)
 {
     KoToolRegistry * r = KoToolRegistry::instance();
-    r->add(new KisRulerAssistantToolFactory(r, QStringList()));
+    r->add(new KisRulerAssistantToolFactory(r));
 }
 
 RulerAssistantToolPlugin::~RulerAssistantToolPlugin()
--- trunk/koffice/krita/plugins/assistants/RulerAssistant/ruler_assistant_tool.h #1071324:1071325
@@ -18,7 +18,8 @@
 #ifndef _RULERASSISTANTTOOL_H_
 #define _RULERASSISTANTTOOL_H_
 
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
 
 class KisView;
 
@@ -26,7 +27,7 @@
 {
     Q_OBJECT
 public:
-    RulerAssistantToolPlugin(QObject *parent, const QStringList &);
+    RulerAssistantToolPlugin(QObject *parent, const QVariantList &);
     virtual ~RulerAssistantToolPlugin();
 
 private:
[prev in list] [next in list] [prev in thread] [next in thread]