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

List:       kde-commits
Subject:    playground/base/nepomuk-kde/backupsync3/gui/common
From:       Vishesh Handa <handa.vish () gmail ! com>
Date:       2010-11-10 20:01:45
Message-ID: 20101110200145.298CFAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195314 by vhanda:

Port back to old Identifier Merger interface


 M  +6 -3      CMakeLists.txt  
 M  +10 -11    identifierwidget.cpp  
 M  +3 -3      identifierwidget.h  
 M  +5 -5      mergerwidget.cpp  
 M  +3 -3      mergerwidget.h  


--- trunk/playground/base/nepomuk-kde/backupsync3/gui/common/CMakeLists.txt \
#1195313:1195314 @@ -26,12 +26,15 @@
 )
 
 set_source_files_properties(
-  ../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.controller.xml
+  ../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.identifier.xml
   PROPERTIES INCLUDE "../../service/dbusoperators.h")
 
 qt4_add_dbus_interface( NEPOMUK_BACKUPSYNC_GUI_COMMON_SRCS
-                        \
                ../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.controller.xml
                
-                        controllerinterface )
+                        \
../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.identifier.xml +          \
identifierinterface ) +qt4_add_dbus_interface( NEPOMUK_BACKUPSYNC_GUI_COMMON_SRCS
+                        \
../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.merger.xml +              \
mergerinterface )  
 kde4_add_ui_files( NEPOMUK_BACKUPSYNC_GUI_COMMON_SRCS
   mergerwidget.ui)
--- trunk/playground/base/nepomuk-kde/backupsync3/gui/common/identifierwidget.cpp \
#1195313:1195314 @@ -20,7 +20,7 @@
 #include "identifierwidget.h"
 #include "identifiermodel.h"
 #include "identifiermodeltree.h"
-#include "controllerinterface.h"
+#include "identifierinterface.h"
 #include "../../service/dbusoperators.h"
 
 #include <QtGui/QLabel>
@@ -34,8 +34,7 @@
 #include <Soprano/StatementIterator>
 
 
-Nepomuk::IdentifierWidget::IdentifierWidget(QWidget* parent)
-    : QWidget(parent)
+Nepomuk::IdentifierWidget::IdentifierWidget(QWidget* parent): QWidget(parent)
 {
     registerMetaTypes();
     
@@ -76,15 +75,15 @@
     connect( m_ignoreSubTree, SIGNAL(clicked(bool)), this, SLOT(ignoreSubTree()) );
     connect( m_identify, SIGNAL(clicked(bool)), this,SLOT(identify()) );
 
-    m_controller = new Controller( \
                QLatin1String("org.kde.nepomuk.services.nepomukbackupsync"),
-                                   QLatin1String("/controller"),
+    m_identifier = new Identifier( \
QLatin1String("org.kde.nepomuk.services.nepomukbackupsync"), +                        \
QLatin1String("/identifier"),  QDBusConnection::sessionBus() );
     
-    if( m_controller->isValid() ) {
+    if( m_identifier->isValid() ) {
         kDebug() << "Valid : Connecting identified signals";
-        Q_ASSERT(connect( m_controller, SIGNAL(notIdentified(int,QString)),
+        Q_ASSERT(connect( m_identifier, SIGNAL(notIdentified(int,QString)),
                           this, SLOT(notIdentified(int,QString)) ));
-        connect( m_controller, SIGNAL(identified(int,QString,QString)),
+        connect( m_identifier, SIGNAL(identified(int,QString,QString)),
                  m_model, SLOT(identified(int,QString,QString)) );
     }
 }
@@ -115,7 +114,7 @@
     
     IdentifierModelTreeItem * treeItem = static_cast<IdentifierModelTreeItem*>( \
index.internalPointer() );  
-    m_controller->ignore( treeItem->id(), treeItem->resUri(), false);
+    m_identifier->ignore( treeItem->id(), treeItem->resUri(), false);
 }
 
 void Nepomuk::IdentifierWidget::ignoreSubTree()
@@ -126,7 +125,7 @@
     
     IdentifierModelTreeItem * treeItem = static_cast<IdentifierModelTreeItem*>( \
index.internalPointer() );  
-    m_controller->ignore( treeItem->id(), treeItem->resUri(), true);
+    m_identifier->ignore( treeItem->id(), treeItem->resUri(), true);
 }
 
 void Nepomuk::IdentifierWidget::identify()
@@ -144,7 +143,7 @@
         newUrl = KFileDialog::getOpenUrl();
     
    if( !newUrl.isEmpty() )
-        m_controller->identify( treeItem->id(), treeItem->resUri(), newUrl.url() );
+        m_identifier->identify( treeItem->id(), treeItem->resUri(), newUrl.url() );
 }
 
 void Nepomuk::IdentifierWidget::notIdentified(int id, const QString& string)
--- trunk/playground/base/nepomuk-kde/backupsync3/gui/common/identifierwidget.h \
#1195313:1195314 @@ -24,7 +24,7 @@
 #include <QTreeView>
 #include <QPushButton>
 
-class OrgKdeNepomukServicesNepomukbackupsyncControllerInterface;
+class OrgKdeNepomukServicesNepomukbackupsyncIdentifierInterface;
 
 namespace Nepomuk {
 
@@ -55,8 +55,8 @@
         QPushButton * m_ignoreSubTree;
         QPushButton * m_identify;
         
-        typedef OrgKdeNepomukServicesNepomukbackupsyncControllerInterface \
                Controller;
-        Controller * m_controller;
+        typedef OrgKdeNepomukServicesNepomukbackupsyncIdentifierInterface \
Identifier; +        Identifier * m_identifier;
     };
 
 }
--- trunk/playground/base/nepomuk-kde/backupsync3/gui/common/mergerwidget.cpp \
#1195313:1195314 @@ -20,7 +20,7 @@
 #include "mergerwidget.h"
 #include "mergermodel.h"
 #include "resolutiondialog.h"
-#include "controllerinterface.h"
+#include "mergerinterface.h"
 
 Nepomuk::MergerWidget::MergerWidget(QWidget* parent)
     : QWidget( parent )
@@ -31,11 +31,11 @@
     m_view->setModel( m_model );
 
     // DBus
-    m_controller = new Controller( \
                QLatin1String("org.kde.nepomuk.services.nepomukbackupsync"),
-                                   QLatin1String("/controller"),
+    m_merger = new Merger( \
QLatin1String("org.kde.nepomuk.services.nepomukbackupsync"), +                        \
QLatin1String("/merger"),  QDBusConnection::sessionBus() );
-    if( m_controller->isValid() ) {
-        connect( m_controller, SIGNAL(multipleMerge(QString,QString)),
+    if( m_merger->isValid() ) {
+        connect( m_merger, SIGNAL(multipleMerge(QString,QString)),
                  m_model, SLOT(multipleMerge(QString,QString)) );
     }
 
--- trunk/playground/base/nepomuk-kde/backupsync3/gui/common/mergerwidget.h \
#1195313:1195314 @@ -25,7 +25,7 @@
 #include <QtGui/QWidget>
 #include <QtGui/QListView>
 
-class OrgKdeNepomukServicesNepomukbackupsyncControllerInterface;
+class OrgKdeNepomukServicesNepomukbackupsyncMergerInterface;
 
 namespace Nepomuk {
 
@@ -46,8 +46,8 @@
     private:
         MergerModel * m_model;
 
-        typedef OrgKdeNepomukServicesNepomukbackupsyncControllerInterface \
                Controller;
-        Controller * m_controller;
+        typedef OrgKdeNepomukServicesNepomukbackupsyncMergerInterface Merger;
+        Merger * m_merger;
     };
 
 }


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