1) switching d-pointer names to just Private

2) starting workin on the connection binding
3) trying to find clean socks,
committing the first two, the third one is hopeless

diff --git a/qt/connection.h b/qt/connection.h
new file mode 100644 (file)
index 0000000..d75ca55
--- /dev/null
+++ b/qt/connection.h
@@ -0,0 +1,57 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* connection.h: Qt wrapper for DBusConnection
+ *
+ * Copyright (C) 2003  Zack Rusin <zack@kde.org>
+ *
+ * Licensed under the Academic Free License version 1.2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef DBUS_QT_CONNECTION_H
+#define DBUS_QT_CONNECTION_H
+
+#include <qobject.h>
+
+#include "dbus/dbus.h"
+
+namespace DBusQt {
+
+  class Connection : public QObject
+  {
+    Q_OBJECT
+  public:
+    Connection();
+
+    bool isConnected();
+    bool isAuthenticated();
+
+  public slots:
+    bool connect( const QString& );
+    bool disconnect();
+    void flush();
+
+  protected:
+    virtual void* virtual_hook( int id, void* data );
+
+  private:
+    struct Private;
+    Private *d;
+  };
+
+}
+
+
+#endif

diff --git a/qt/message.cpp b/qt/message.cpp
index f439acc..ca6783b 100644 (file)
--- a/qt/message.cpp
+++ b/qt/message.cpp
@@ -205,7 +205,7 @@ Message::iterator::var() const
   return d->var;
 }
 
-struct Message::MessagePrivate {
+struct Message::Private {
   DBusMessage *msg;
 };
 
@@ -214,7 +214,7 @@ struct Message::MessagePrivate {
  */
 Message::Message( int messageType )
 {
-  d = new MessagePrivate;
+  d = new Private;
   d->msg = dbus_message_new( messageType );
 }
 
@@ -226,7 +226,7 @@ Message::Message( int messageType )
 Message::Message( const QString& service, const QString& path,
                   const QString& interface, const QString& method )
 {
-  d = new MessagePrivate;
+  d = new Private;
   d->msg = dbus_message_new_method_call( service.latin1(), path.latin1(),
                                          interface.latin1(), method.latin1() );
 }
@@ -240,14 +240,14 @@ Message::Message( const QString& service, const QString& path,
  */
 Message::Message( const Message& replayingTo )
 {
-  d = new MessagePrivate;
+  d = new Private;
   d->msg = dbus_message_new_method_return( replayingTo.d->msg );
 }
 
 Message:: Message( const QString& path, const QString& interface,
                    const QString& name )
 {
-  d = new MessagePrivate;
+  d = new Private;
   d->msg = dbus_message_new_signal( path.ascii(), interface.ascii(),
                                     name.ascii() );
 }
@@ -255,7 +255,7 @@ Message:: Message( const QString& path, const QString& interface,
 Message::Message( const Message& replayingTo, const QString& errorName,
                   const QString& errorMessage )
 {
-  d = new MessagePrivate;
+  d = new Private;
   d->msg = dbus_message_new_error( replayingTo.d->msg, errorName.utf8(),
                                    errorMessage.utf8() );
 }

diff --git a/qt/message.h b/qt/message.h
index 4763cf1..5baf9e5 100644 (file)
--- a/qt/message.h
+++ b/qt/message.h
@@ -116,8 +116,8 @@ namespace DBus {
     DBusMessage* message() const;
 
   private:
-    struct MessagePrivate;
-    MessagePrivate *d;
+    struct Private;
+    Private *d;
   };
 
 }