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

List:       kde-commits
Subject:    KDE/kdepimlibs/kresources
From:       Laurent Montel <montel () kde ! org>
Date:       2007-01-17 17:52:39
Message-ID: 1169056359.913077.16904.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 624679 by mlaurent:

DCOP->D-Bus


 M  +16 -16    managerimpl.cpp  
 M  +4 -4      managerimpl.h  


--- trunk/KDE/kdepimlibs/kresources/managerimpl.cpp #624678:624679
@@ -50,15 +50,15 @@
 
   mId = KRandom::randomString( 8 );
 
-  // Register with DCOP
+  // Register with D-Bus
   QDBusConnection::sessionBus().registerService("org.kde.KResourcesManager");
 
   QDBusConnection::sessionBus().connect("", dBusPath, "org.kde.KResourcesManager", "signalKResourceAdded",
-      this, SLOT(dcopKResourceAdded(QString,QString)));
+      this, SLOT(dbusKResourceAdded(QString,QString)));
   QDBusConnection::sessionBus().connect("", dBusPath, "org.kde.KResourcesManager", "signalKResourceModified",
-      this, SLOT(dcopKResourceModified(QString,QString)));
+      this, SLOT(dbusKResourceModified(QString,QString)));
   QDBusConnection::sessionBus().connect("", dBusPath, "org.kde.KResourcesManager", "signalKResourceDeleted",
-      this, SLOT(dcopKResourceDeleted(QString,QString)));
+      this, SLOT(dbusKResourceDeleted(QString,QString)));
 }
 
 ManagerImpl::~ManagerImpl()
@@ -204,14 +204,14 @@
 
 // DCOP asynchronous functions
 
-void ManagerImpl::dcopKResourceAdded( const QString& managerId,
+void ManagerImpl::dbusKResourceAdded( const QString& managerId,
                                       const QString& resourceId )
 {
   if ( managerId == mId ) {
-    kDebug(5650) << "Ignore DCOP notification to myself" << endl;
+    kDebug(5650) << "Ignore D-Bus notification to myself" << endl;
     return;
   }
-  kDebug(5650) << "Receive DCOP call: added resource " << resourceId << endl;
+  kDebug(5650) << "Receive D-Bus call: added resource " << resourceId << endl;
 
   if ( getResource( resourceId ) ) {
     kDebug(5650) << "This resource is already known to me." << endl;
@@ -225,35 +225,35 @@
   if ( resource ) {
     mNotifier->notifyResourceAdded( resource );
   } else
-    kError() << "Received DCOP: resource added for unknown resource "
+    kError() << "Received D-Bus: resource added for unknown resource "
               << resourceId << endl;
 }
 
-void ManagerImpl::dcopKResourceModified( const QString& managerId,
+void ManagerImpl::dbusKResourceModified( const QString& managerId,
                                          const QString& resourceId )
 {
   if ( managerId == mId ) {
-    kDebug(5650) << "Ignore DCOP notification to myself" << endl;
+    kDebug(5650) << "Ignore D-Bus notification to myself" << endl;
     return;
   }
-  kDebug(5650) << "Receive DCOP call: modified resource " << resourceId << endl;
+  kDebug(5650) << "Receive D-Bus call: modified resource " << resourceId << endl;
 
   Resource *resource = getResource( resourceId );
   if ( resource ) {
     mNotifier->notifyResourceModified( resource );
   } else
-    kError() << "Received DCOP: resource modified for unknown resource "
+    kError() << "Received D-Bus: resource modified for unknown resource "
               << resourceId << endl;
 }
 
-void ManagerImpl::dcopKResourceDeleted( const QString& managerId,
+void ManagerImpl::dbusKResourceDeleted( const QString& managerId,
                                         const QString& resourceId )
 {
   if ( managerId == mId ) {
-    kDebug(5650) << "Ignore DCOP notification to myself" << endl;
+    kDebug(5650) << "Ignore D-Bus notification to myself" << endl;
     return;
   }
-  kDebug(5650) << "Receive DCOP call: deleted resource " << resourceId << endl;
+  kDebug(5650) << "Receive D-Bus call: deleted resource " << resourceId << endl;
 
   Resource *resource = getResource( resourceId );
   if ( resource ) {
@@ -265,7 +265,7 @@
       mStandard = 0;
     mResources.removeAll( resource );
   } else
-    kError() << "Received DCOP: resource deleted for unknown resource "
+    kError() << "Received D-Bus: resource deleted for unknown resource "
               << resourceId << endl;
 }
 
--- trunk/KDE/kdepimlibs/kresources/managerimpl.h #624678:624679
@@ -76,12 +76,12 @@
     void signalKResourceDeleted( QString managerId, QString resourceId );
 
   private Q_SLOTS:
-    // dcop calls
-    void dcopKResourceAdded( const QString& managerId,
+    // dbus calls
+    void dbusKResourceAdded( const QString& managerId,
                              const QString& resourceId );
-    void dcopKResourceModified( const QString& managerId,
+    void dbusKResourceModified( const QString& managerId,
                                 const QString& resourceId );
-    void dcopKResourceDeleted( const QString& managerId,
+    void dbusKResourceDeleted( const QString& managerId,
                                const QString& resourceId );
 
   private:
[prev in list] [next in list] [prev in thread] [next in thread]