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

List:       kde-commits
Subject:    KDE/kdesdk/kioslave/svn
From:       David Faure <faure () kde ! org>
Date:       2007-11-05 12:55:00
Message-ID: 1194267300.877512.12507.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 733080 by dfaure:

Ported to KPluginFactory; fixed messages script to look into the subdirs too


 M  +1 -1      Messages.sh  
 M  +9 -7      ksvnd/ksvnd.cpp  
 M  +0 -1      ksvnd/ksvnd.desktop  
 M  +2 -2      ksvnd/ksvnd.h  


--- trunk/KDE/kdesdk/kioslave/svn/Messages.sh #733079:733080
@@ -1,2 +1,2 @@
 #! /bin/sh
-$XGETTEXT *.cpp -o $podir/kio_svn.pot
+$XGETTEXT *.cpp */*.cpp -o $podir/kio_svn.pot
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp #733079:733080
@@ -29,14 +29,16 @@
 #include "ksvnd.h"
 #include "commitdlg.h"
 
-extern "C" {
-    KDE_EXPORT KDEDModule *create_ksvnd() {
-       return new KSvnd();
-    }
-}
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
 
-KSvnd::KSvnd()
- : KDEDModule() {
+K_PLUGIN_FACTORY(KSvndFactory,
+                 registerPlugin<KSvnd>();
+    )
+K_EXPORT_PLUGIN(KSvndFactory("kio_svn"))
+
+KSvnd::KSvnd(QObject* parent, const QList<QVariant>&)
+ : KDEDModule(parent) {
    new KsvndAdaptor(this);
 }
 
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.desktop #733079:733080
@@ -43,5 +43,4 @@
 ServiceTypes=KDEDModule
 X-KDE-ModuleType=Library
 X-KDE-Library=ksvnd
-X-KDE-FactoryName=ksvnd
 X-KDE-Kded-load-on-demand=true
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.h #733079:733080
@@ -29,11 +29,11 @@
 class KSvnd : public KDEDModule
 {
   Q_OBJECT
-      
+
   //note: InSVN means parent is added.  InRepos  means itself is added
   enum { SomeAreFiles = 1, SomeAreFolders = 2,  SomeAreInParentsEntries = 4, \
SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, \
AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, \
AllAreExternalToParent = 512, AllAreFolders = 1024 };  public:
-  KSvnd();
+  KSvnd(QObject* parent, const QList<QVariant>&);
   ~KSvnd();
 
   public Q_SLOTS: //dbus function for me KUrl::List must be changed


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