diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-05-06 10:37:59 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-05-06 10:37:59 +0000 |
| commit | c7f3c89ee94925a65466a140841695094fd23bd7 (patch) | |
| tree | 102c0d928a09eddead14ca702e6d45a906316955 | |
| parent | 50266d4190c2a9e9f8a58ff2a117103e6183726b (diff) | |
* qt/qdbusmessage.cpp:
* qt/qdbustypehelper_p.h:
* qt/qdbusintegrator.cpp: gcc 3.4 doesn't like Q_FOREACH when
the list is a const-reference
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | qt/qdbusintegrator.cpp | 2 | ||||
| -rw-r--r-- | qt/qdbusmessage.cpp | 2 | ||||
| -rw-r--r-- | qt/qdbustypehelper_p.h | 4 |
4 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2006-05-06 Thiago Macieira <thiago.macieira@trolltech.com> + + * qt/qdbusmessage.cpp: + * qt/qdbustypehelper_p.h: + * qt/qdbusintegrator.cpp: gcc 3.4 doesn't like Q_FOREACH when + the list is a const-reference + 2006-05-03 John (J5) Palmieri <johnp@redhat.com> * Adding old doc patch that never got applied diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp index 3f907256..dc038abb 100644 --- a/qt/qdbusintegrator.cpp +++ b/qt/qdbusintegrator.cpp @@ -1097,7 +1097,7 @@ static bool applyForObject(QDBusConnectionPrivate::ObjectTreeNode *root, const Q return true; } - const QObjectList &children = obj->children(); + const QObjectList children = obj->children(); // find a child with the proper name QObject *next = 0; diff --git a/qt/qdbusmessage.cpp b/qt/qdbusmessage.cpp index 308ad773..456c1d2e 100644 --- a/qt/qdbusmessage.cpp +++ b/qt/qdbusmessage.cpp @@ -665,7 +665,7 @@ static void debugVariant(QDebug dbg, const QVariant &v) dbg.nospace() << ")"; } -static void debugVariantList(QDebug dbg, const QVariantList &list) +static void debugVariantList(QDebug dbg, const QVariantList list) { bool first = true; foreach (const QVariant &v, list) { diff --git a/qt/qdbustypehelper_p.h b/qt/qdbustypehelper_p.h index 72d5bbe1..7ebd7f3e 100644 --- a/qt/qdbustypehelper_p.h +++ b/qt/qdbustypehelper_p.h @@ -119,7 +119,7 @@ struct QDBusTypeHelper return Type(); } - static inline QVariantList toVariantList(const List &list) + static inline QVariantList toVariantList(const List list) { QVariantList tmp; Q_FOREACH (const Type &t, list) @@ -132,7 +132,7 @@ struct QDBusTypeHelper return toVariantList(QDBusTypeHelper<List>::fromVariant(v)); } - static inline List fromVariantList(const QVariantList &list) + static inline List fromVariantList(const QVariantList list) { List tmp; Q_FOREACH (const QVariant &v, list) |