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

List:       kde-commits
Subject:    KDE/kdesdk/kbabel/catalogmanager
From:       Laurent Montel <montel () kde ! org>
Date:       2007-01-07 10:28:09
Message-ID: 1168165689.949366.22277.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 620778 by mlaurent:

Register catalogmanager


 M  +1 -1      CMakeLists.txt  
 M  +2 -1      catalogmanagerapp.h  
 M  +4 -1      main.cpp  


--- trunk/KDE/kdesdk/kbabel/catalogmanager/CMakeLists.txt #620777:620778
@@ -38,7 +38,7 @@
 ########### next target ###############
 
 set(catalogmanager_SRCS main.cpp ${libcatalogmanagercvs_SRCS} \
                ${libcatalogmanagersvn_SRCS} ${libcatalogmanager_SRCS} )
-qt4_add_dbus_adaptor( catalogmanager_SRCS org.kde.kbabel.catalogmanager.xml \
catalogmanager.h CatalogManager ) +qt4_add_dbus_adaptor( catalogmanager_SRCS \
org.kde.kbabel.catalogmanager.xml catalogmanagerapp.h CatalogManagerInterface )  \
qt4_add_dbus_adaptor( catalogmanager_SRCS \
${CMAKE_SOURCE_DIR}/kbabel//kbabeldict/org.kde.kbabel.kbabeldict.xml \
${CMAKE_SOURCE_DIR}/kbabel//kbabeldict/kbabeldictbox.h KBabelDictBox)  
 QT4_ADD_DBUS_INTERFACE(catalogmanager_SRCS \
                ${CMAKE_SOURCE_DIR}/kbabel/kbabel/org.kde.kbabel.kbabel.xml \
                kbabel_interface )
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanagerapp.h #620777:620778
@@ -43,9 +43,10 @@
 #include <kwin.h>
 //Added by qt3to4:
 
-class CatalogManagerInterface 
+class CatalogManagerInterface : public  QObject 
 //: public CatalogManagerIface
 {
+    Q_OBJECT
 public:
     CatalogManagerInterface();
     virtual ~CatalogManagerInterface() {}
--- trunk/KDE/kdesdk/kbabel/catalogmanager/main.cpp #620777:620778
@@ -35,6 +35,8 @@
 #include "catalogmanager.h"
 #include "catalog.h"
 #include "catalogmanagerapp.h"
+#include "catalogmanagerapp.moc"
+#include "catalogmanageradaptor.h"
 #include "poinfo.h"
 
 #include "version.h"
@@ -154,8 +156,9 @@
 }
 
 CatalogManagerInterface::CatalogManagerInterface()
-    //: DCOPObject("CatalogManagerIFace")
 {
+      (void) new CatalogmanagerAdaptor( this );
+      QDBusConnection::sessionBus().registerObject( "/CatalogManager", this );
 }
 
 void CatalogManagerInterface::setPreferredWindow( WId id )


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