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

List:       kde-commits
Subject:    playground/base/nepomuk-kde/scribo/service
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-11-20 9:46:39
Message-ID: 20101120094639.84BE8AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1198980 by trueg:

Added dbus operators for TextOccurrence

 M  +1 -0      CMakeLists.txt  
 A             dbusoperators.cpp   [License: LGPL]
 A             dbusoperators.h   [License: LGPL]
 M  +8 -2      scriboservice.cpp  


--- trunk/playground/base/nepomuk-kde/scribo/service/CMakeLists.txt #1198979:1198980
@@ -11,6 +11,7 @@
 set(scriboservice_SRC
   scriboservice.cpp
   scribosession.cpp
+  dbusoperators.cpp
 )
 
 kde4_add_plugin(nepomukscriboservice ${scriboservice_SRC})
--- trunk/playground/base/nepomuk-kde/scribo/service/scriboservice.cpp \
#1198979:1198980 @@ -21,6 +21,7 @@
 
 #include "scriboservice.h"
 #include "scribosession.h"
+#include "dbusoperators.h"
 
 #include <KPluginFactory>
 #include <KDebug>
@@ -38,8 +39,13 @@
 
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusObjectPath>
+#include <QtDBus/QDBusMetaType>
 
 
+Q_DECLARE_METATYPE(Scribo::TextOccurrence)
+Q_DECLARE_METATYPE(QList<Scribo::TextOccurrence>)
+
+
 /**
  * this marco creates a service factory which can then be found by the Qt/KDE
  * plugin system in the Nepomuk server.
@@ -51,6 +57,8 @@
     : Service( parent ),
       m_sessionCnt(0)
 {
+    qDBusRegisterMetaType<Scribo::TextOccurrence>();
+    qDBusRegisterMetaType<QList<Scribo::TextOccurrence> >();
 }
 
 
@@ -66,8 +74,6 @@
     const QString dbusObjectPath = QString( "/nepomukscriboservice/scribosession%1" \
                ).arg( ++m_sessionCnt );
     QDBusConnection::sessionBus().registerObject( dbusObjectPath, session, \
QDBusConnection::ExportScriptableSignals|QDBusConnection::ExportScriptableSlots );  
-    QMetaObject::invokeMethod(session, "fireAndForget", Qt::QueuedConnection);
-
     return QDBusObjectPath(dbusObjectPath);
 }
 


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