diff options
| author | Thiago Macieira <thiago.macieira@trolltech.com> | 2006-05-06 10:37:59 +0000 |
|---|---|---|
| committer | John Palmieri <johnp@remedyz.boston.redhat.com> | 2006-06-28 08:15:16 -0400 |
| commit | 6ed09e4d7cb4012295db707eceabd1b3f68b24e8 (patch) | |
| tree | 98e20a48a5a2e86e9962fafb7dcd2a7aca5222d5 | |
| parent | 7cd46084a0912a6dde285995ab1b0f2e7f297356 (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-- | qt/qdbusintegrator.cpp | 2 | ||||
| -rw-r--r-- | qt/qdbusmessage.cpp | 2 | ||||
| -rw-r--r-- | qt/qdbustypehelper_p.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp index 3f90725..dc038ab 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 308ad77..456c1d2 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 72d5bbe..7ebd7f3 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) |