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

List:       kde-commits
Subject:    branches/work/kde4/playground/libs/qt-dbus
From:       Thiago Macieira <thiago () kde ! org>
Date:       2006-04-27 18:17:02
Message-ID: 1146161822.272569.5313.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 534746 by thiago:

s/QDBusRef/QDBusInterfacePtr/

 M  +4 -4      examples/dbus.cpp  
 M  +0 -1      qdbusconnection_p.h  
 M  +3 -3      qdbusinterface.cpp  
 M  +8 -7      qdbusinterface.h  


--- branches/work/kde4/playground/libs/qt-dbus/examples/dbus.cpp #534745:534746
@@ -33,7 +33,7 @@
 
 void listObjects(const QString &service, const QString &path)
 {
-    QDBusRef iface(*connection, service, path.isEmpty() ? "/" : path,
+    QDBusInterfacePtr iface(*connection, service, path.isEmpty() ? "/" : path,
                    "org.freedesktop.DBus.Introspectable");
     if (!iface->isValid()) {
         QDBusError err(iface->lastError());
@@ -63,7 +63,7 @@
 
 void listInterface(const QString &service, const QString &path, const QString \
&interface)  {
-    QDBusRef iface(*connection, service, path, interface);
+    QDBusInterfacePtr iface(*connection, service, path, interface);
     if (!iface->isValid()) {
         QDBusError err(iface->lastError());
         fprintf(stderr, "Interface '%s' not available in object %s at %s:\n%s \
(%s)\n", @@ -117,7 +117,7 @@
 
 void listAllInterfaces(const QString &service, const QString &path)
 {
-    QDBusRef iface(*connection, service, path, \
"org.freedesktop.DBus.Introspectable"); +    QDBusInterfacePtr iface(*connection, \
service, path, "org.freedesktop.DBus.Introspectable");  if (!iface->isValid()) {
         QDBusError err(iface->lastError());
         fprintf(stderr, "Cannot introspect object %s at %s:\n%s (%s)\n",
@@ -157,7 +157,7 @@
 void placeCall(const QString &service, const QString &path, const QString \
&interface,  const QString &member, int argc, const char *const *argv)
 {
-    QDBusRef iface(*connection, service, path, interface);
+    QDBusInterfacePtr iface(*connection, service, path, interface);
     if (!iface->isValid()) {
         QDBusError err(iface->lastError());
         fprintf(stderr, "Interface '%s' not available in object %s at %s:\n%s \
                (%s)\n",
--- branches/work/kde4/playground/libs/qt-dbus/qdbusconnection_p.h #534745:534746
@@ -46,7 +46,6 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qreadwritelock.h>
-#include <QtCore/qset.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qvector.h>
 
--- branches/work/kde4/playground/libs/qt-dbus/qdbusinterface.cpp #534745:534746
@@ -63,7 +63,7 @@
     application does not exist).
 
     Note: when dealing with remote objects, it is not always possible to determine \
                if it
-    exists when creating a QDBusInterface or QDBusRef object.
+    exists when creating a QDBusInterface or QDBusInterfacePtr object.
 */
 bool QDBusInterface::isValid() const
 {
@@ -251,13 +251,13 @@
     return id;
 }
 
-QDBusRef::QDBusRef(QDBusConnection &conn, const QString &service, const QString \
&path, +QDBusInterfacePtr::QDBusInterfacePtr(QDBusConnection &conn, const QString \
&service, const QString &path,  const QString &interface)
     : d(conn.findInterface(service, path, interface))
 {
 }
 
-QDBusRef::QDBusRef(const QString &service, const QString &path, const QString \
&interface) +QDBusInterfacePtr::QDBusInterfacePtr(const QString &service, const \
QString &path, const QString &interface)  : \
d(QDBus::sessionBus().findInterface(service, path, interface))  {
 }
--- branches/work/kde4/playground/libs/qt-dbus/qdbusinterface.h #534745:534746
@@ -45,18 +45,19 @@
     Q_DECLARE_PRIVATE(QDBusInterface);
 };
 
-struct QDBUS_EXPORT QDBusRef
+struct QDBUS_EXPORT QDBusInterfacePtr
 {
-    QDBusRef(QDBusInterface *iface) : d(iface) { }
-    QDBusRef(QDBusConnection &conn, const QString &service, const QString &path,
+    QDBusInterfacePtr(QDBusInterface *iface) : d(iface) { }
+    QDBusInterfacePtr(QDBusConnection &conn, const QString &service, const QString \
&path,  const QString &interface = QString());
-    QDBusRef(const QString &service, const QString &path, const QString &interface = \
                QString());
-    ~QDBusRef() { delete d; }
+    QDBusInterfacePtr(const QString &service, const QString &path, const QString \
&interface = QString()); +    ~QDBusInterfacePtr() { delete d; }
 
-    QDBusInterface* operator->() const { return d; }
+    QDBusInterface *interface() { return d; }
+    QDBusInterface *operator->() { return d; }
 private:
     QDBusInterface *const d;
-    Q_DISABLE_COPY(QDBusRef)
+    Q_DISABLE_COPY(QDBusInterfacePtr)
 };
 
 #endif


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