From c2432800b1d387c5512e605ba92060d4827b7606 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 15 Feb 2006 16:25:12 +0000 Subject: Merge the changes to the bindings from the KDE Subversion server. This is a major change: library is source- and binary-incompatible to what it used to be. All testcases are green, functionality is preserved. It is not feature-complete. Development will continue in the branch in the Subversion server for a while. --- qt/qdbusvariant.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'qt/qdbusvariant.h') diff --git a/qt/qdbusvariant.h b/qt/qdbusvariant.h index bd18beff..eb7e3aac 100644 --- a/qt/qdbusvariant.h +++ b/qt/qdbusvariant.h @@ -1,6 +1,8 @@ /* qdbusvariant.h DBUS variant struct * * Copyright (C) 2005 Harald Fernengel + * Copyright (C) 2006 Trolltech AS. All rights reserved. + * Author: Thiago Macieira * * Licensed under the Academic Free License version 2.1 * @@ -15,23 +17,21 @@ * 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 + * along with this program; if not, write to the Free Software Foundation + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #ifndef QDBUSVARIANT_H #define QDBUSVARIANT_H -#include "dbus/qdbus.h" - -#include -#include -#include +#include "qdbusmacros.h" +#include "qdbustype.h" +#include struct QDBUS_EXPORT QDBusVariant { - QString signature; + QDBusType type; QVariant value; }; Q_DECLARE_METATYPE(QDBusVariant) -- cgit