diff options
author | Thiago Macieira <thiago@kde.org> | 2006-02-15 16:25:12 +0000 |
---|---|---|
committer | Thiago Macieira <thiago@kde.org> | 2006-02-15 16:25:12 +0000 |
commit | c2432800b1d387c5512e605ba92060d4827b7606 (patch) | |
tree | 859ad5945d12efbfecdbd0fb1244642de6ae51c6 /qt/qdbusmarshall.h | |
parent | 120d4ae484acde0d8684a2ba72874bd1c3017b97 (diff) |
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.
Diffstat (limited to 'qt/qdbusmarshall.h')
-rw-r--r-- | qt/qdbusmarshall.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/qt/qdbusmarshall.h b/qt/qdbusmarshall.h index 4fc1a1ab..6ec8caec 100644 --- a/qt/qdbusmarshall.h +++ b/qt/qdbusmarshall.h @@ -1,6 +1,8 @@ /* qdbusmarshall.h QDBusMarshall object * * Copyright (C) 2005 Harald Fernengel <harry@kdevelop.org> + * Copyright (C) 2006 Trolltech AS. All rights reserved. + * Author: Thiago Macieira <thiago.macieira@trolltech.com> * * Licensed under the Academic Free License version 2.1 * @@ -15,8 +17,8 @@ * 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. * */ @@ -25,14 +27,15 @@ struct DBusMessage; +template <typename T> class QList; class QVariant; -template <typename T> -class QList; +class QString; class QDBusMarshall { public: - static void listToMessage(const QList<QVariant> &list, DBusMessage *message); + static void listToMessage(const QList<QVariant> &list, DBusMessage *message, + const QString& signature); static void messageToList(QList<QVariant> &list, DBusMessage *message); }; |