From d42c8663e8fd441838a238bfb845a7c80c37b253 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 28 Mar 2006 18:56:08 +0000 Subject: * qt/*: * dbus/qdbus.h: Sync with KDE Subversion revision 523647. Hopefully, this will be the last of the source-incompatible changes. Documentation has been improved; support for QList has been added; QDBusObject is gone; QDBus(Abstract)Interface is now a QObject with auto-generated meta-object; QDBusIntrospection is marked private, since QMetaObject can be used now; lots of bugfixes. --- qt/qdbusobject.h | 102 ------------------------------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 qt/qdbusobject.h (limited to 'qt/qdbusobject.h') diff --git a/qt/qdbusobject.h b/qt/qdbusobject.h deleted file mode 100644 index 584f3b28..00000000 --- a/qt/qdbusobject.h +++ /dev/null @@ -1,102 +0,0 @@ -/* -*- C++ -*- - * - * Copyright (C) 2005 Thiago Macieira - * Copyright (C) 2006 Trolltech AS. All rights reserved. - * Author: Thiago Macieira - * - * Licensed under the Academic Free License version 2.1 - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef QDBUSOBJECT_H -#define QDBUSOBJECT_H - -#include -#include -#include -#include - -#include "qdbusconnection.h" -#include "qdbusintrospection.h" - -class QDBusInterface; -class QDBusObject; - -template -inline Interface qdbus_cast(QDBusObject& obj, Interface * = 0); - -template -inline const Interface qdbus_cast(const QDBusObject& obj, Interface * = 0); - -class QDBusObjectPrivate; -class QDBUS_EXPORT QDBusObject -{ - friend class QDBusConnection; -public: - // public constructors - QDBusObject(const QDBusObject& other); - QDBusObject(const QDBusInterface& iface); - - // public destructors - ~QDBusObject(); - -public: - // public functions - QDBusObject& operator=(const QDBusObject&); - - QDBusConnection connection() const; - QString service() const; - QString path() const; - - QString introspect() const; - QSharedDataPointer introspectionData() const; - - QStringList interfaces() const; - QMap children() const; - - //bool exists() const; - bool isValid() const; - -#ifndef QT_NO_MEMBER_TEMPLATES - template - inline operator Interface() - { return qdbus_cast(*this); } - - template - inline operator const Interface() const - { return qdbus_cast(*this); } -#endif - -private: - QDBusObject(QDBusObjectPrivate*, const QDBusConnection& conn); - QSharedDataPointer d; - QDBusConnection m_conn; -}; - -template -inline Interface qdbus_cast(QDBusObject& obj, Interface *) -{ - return Interface(obj); -} - -template -inline const Interface qdbus_cast(const QDBusObject& obj, Interface *) -{ - return Interface(obj); -} - -#endif // QDBUSOBJECT_H -- cgit