dbus/qt qdbusintegrator.cpp, 1.10, 1.11 qdbusmessage.cpp, 1.5, 1.6 qdbustypehelper_p.h, 1.2, 1.3

Thiago J. Macieira thiago at kemper.freedesktop.org
Sat May 6 03:38:01 PDT 2006


Update of /cvs/dbus/dbus/qt
In directory kemper:/tmp/cvs-serv29367/qt

Modified Files:
	qdbusintegrator.cpp qdbusmessage.cpp qdbustypehelper_p.h 
Log Message:
	* 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


Index: qdbusintegrator.cpp
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusintegrator.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- qdbusintegrator.cpp	29 Apr 2006 12:44:31 -0000	1.10
+++ qdbusintegrator.cpp	6 May 2006 10:37:59 -0000	1.11
@@ -1097,7 +1097,7 @@
                 return true;
             }
 
-            const QObjectList &children = obj->children();
+            const QObjectList children = obj->children();
 
             // find a child with the proper name
             QObject *next = 0;

Index: qdbusmessage.cpp
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusmessage.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qdbusmessage.cpp	28 Mar 2006 18:56:08 -0000	1.5
+++ qdbusmessage.cpp	6 May 2006 10:37:59 -0000	1.6
@@ -665,7 +665,7 @@
     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) {

Index: qdbustypehelper_p.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbustypehelper_p.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qdbustypehelper_p.h	23 Apr 2006 15:17:28 -0000	1.2
+++ qdbustypehelper_p.h	6 May 2006 10:37:59 -0000	1.3
@@ -119,7 +119,7 @@
         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 @@
         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)



More information about the dbus-commit mailing list