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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/clients/akonadiconsole
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2006-08-25 14:59:16
Message-ID: 1156517956.950594.21678.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 577092 by tokoe:

Adapt to PIM::AgentManager and PIM::ProfileManager


 M  +0 -5      CMakeLists.txt  
 M  +2 -2      agentwidget.cpp  
 M  +2 -3      agentwidget.h  
 M  +0 -3      mainwidget.cpp  
 M  +0 -5      mainwidget.h  
 M  +2 -2      profilewidget.cpp  
 M  +2 -3      profilewidget.h  


--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/CMakeLists.txt #577091:577092
@@ -8,11 +8,6 @@
   profilewidget.cpp
 )
 
-qt4_add_dbus_interfaces( akonadiconsole_bin_SRCS
-  ${CMAKE_SOURCE_DIR}/akonadi/server/interfaces/org.kde.Akonadi.AgentManager.xml
-  ${CMAKE_SOURCE_DIR}/akonadi/server/interfaces/org.kde.Akonadi.ProfileManager.xml
-)
-
 kde4_automoc(${akonadiconsole_bin_SRCS})
 
 kde4_add_executable(akonadiconsole_bin ${akonadiconsole_bin_SRCS})
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/agentwidget.cpp #577091:577092
@@ -19,7 +19,6 @@
     USA.
 */
 
-#include <QtDBus/QDBusConnection>
 #include <QtGui/QDialog>
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QGridLayout>
@@ -28,6 +27,7 @@
 
 #include "libakonadi/components/agenttypeview.h"
 #include "libakonadi/components/agentinstanceview.h"
+#include "libakonadi/agentmanager.h"
 
 #include "agentwidget.h"
 
@@ -78,7 +78,7 @@
 AgentWidget::AgentWidget( QWidget *parent )
   : QWidget( parent )
 {
-  mManager = new org::kde::Akonadi::AgentManager( "org.kde.Akonadi.Control", \
"/AgentManager", QDBusConnection::sessionBus(), this ); +  mManager = new \
PIM::AgentManager( this );  
   QGridLayout *layout = new QGridLayout( this );
 
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/agentwidget.h #577091:577092
@@ -24,10 +24,9 @@
 
 #include <QtGui/QWidget>
 
-#include "agentmanagerinterface.h"
-
 namespace PIM {
 class AgentInstanceView;
+class AgentManager;
 }
 
 class AgentWidget : public QWidget
@@ -43,7 +42,7 @@
 
   private:
     PIM::AgentInstanceView *mView;
-    org::kde::Akonadi::AgentManager *mManager;
+    PIM::AgentManager *mManager;
 };
 
 #endif
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/mainwidget.cpp #577091:577092
@@ -19,7 +19,6 @@
     USA.
 */
 
-#include <QtDBus/QDBusConnection>
 #include <QtGui/QGridLayout>
 
 #include "agentwidget.h"
@@ -30,8 +29,6 @@
 MainWidget::MainWidget( QWidget *parent )
   : QWidget( parent )
 {
-  mAgentManager = new org::kde::Akonadi::AgentManager( "org.kde.Akonadi.Control", \
                "/AgentManager", QDBusConnection::sessionBus(), this );
-
   QGridLayout *layout = new QGridLayout( this );
 
   ProfileWidget *profileWidget = new ProfileWidget( this );
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/mainwidget.h #577091:577092
@@ -24,15 +24,10 @@
 
 #include <QtGui/QWidget>
 
-#include "agentmanagerinterface.h"
-
 class MainWidget : public QWidget
 {
   public:
     MainWidget( QWidget *parent = 0 );
-
-  private:
-    org::kde::Akonadi::AgentManager *mAgentManager;
 };
 
 #endif
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/profilewidget.cpp #577091:577092
@@ -19,19 +19,19 @@
     USA.
 */
 
-#include <QtDBus/QDBusConnection>
 #include <QtGui/QGridLayout>
 #include <QtGui/QInputDialog>
 #include <QtGui/QPushButton>
 
 #include "libakonadi/components/profileview.h"
+#include "libakonadi/profilemanager.h"
 
 #include "profilewidget.h"
 
 ProfileWidget::ProfileWidget( QWidget *parent )
   : QWidget( parent )
 {
-  mManager = new org::kde::Akonadi::ProfileManager( "org.kde.Akonadi.Control", \
"/ProfileManager", QDBusConnection::sessionBus(), this ); +  mManager = new \
PIM::ProfileManager( this );  
   QGridLayout *layout = new QGridLayout( this );
 
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/profilewidget.h #577091:577092
@@ -24,10 +24,9 @@
 
 #include <QtGui/QWidget>
 
-#include "profilemanagerinterface.h"
-
 namespace PIM {
 class ProfileView;
+class ProfileManager;
 }
 
 class ProfileWidget : public QWidget
@@ -43,7 +42,7 @@
 
   private:
     PIM::ProfileView *mView;
-    org::kde::Akonadi::ProfileManager *mManager;
+    PIM::ProfileManager *mManager;
 };
 
 #endif


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