Changeset 846 for trunk/src/dbus/qdbusmarshaller.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/dbus/qdbusmarshaller.cpp (modified) (5 diffs)

trunk/src/dbus/qdbusmarshaller.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -43 +43 @@
 #include "qdbusmetatype_p.h"
 #include "qdbusutil_p.h"
+
+
 
 QT_BEGIN_NAMESPACE
@@ -506 +508 @@
         int element = q_dbus_message_iter_get_element_type(&demarshaller->iterator);
         if (q_dbus_type_is_fixed(element)) {
-            // another optimisation: fixed size arrays
+            // another optimiation: fixed size arrays
             // code is exactly like QDBusDemarshaller::toByteArray
             DBusMessageIter sub;
@@ -515 +517 @@
             q_dbus_message_iter_get_fixed_array(&sub,&data,&len);
 
-            char signature[2] = { element, 0 };
+            char signature[2] = { , 0 };
             q_dbus_message_iter_open_container(&iterator, DBUS_TYPE_ARRAY, signature, &sub);
             q_dbus_message_iter_append_fixed_array(&sub, element, &data, len);
@@ -549 +551 @@
 
 QT_END_NAMESPACE
+
+