Changeset 846 for trunk/src/dbus/qdbusmessage.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/qdbusmessage.cpp (modified) (9 diffs)

trunk/src/dbus/qdbusmessage.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])
@@ -54 +54 @@
 #include "qdbusutil_p.h"
 
+
+
 QT_BEGIN_NAMESPACE
 
@@ -64 +66 @@
     : msg(0), reply(0), type(DBUS_MESSAGE_TYPE_INVALID),
       timeout(-1), localReply(0), ref(1), delayedReply(false), localMessage(false),
-      parametersValidated(false)
+      parametersValidated(false)
 {
 }
@@ -130 +132 @@
         msg = q_dbus_message_new_method_call(data(d_ptr->service.toUtf8()), d_ptr->path.toUtf8(),
                                              data(d_ptr->interface.toUtf8()), d_ptr->name.toUtf8());
+
         break;
     case DBUS_MESSAGE_TYPE_METHOD_RETURN:
@@ -290 +293 @@
 
     // no complex types seen
-    // optimise by using the variant list itself
+    // optimie by using the variant list itself
     QDBusMessage retval;
     QDBusMessagePrivate *d = retval.d_ptr;
@@ -450 +453 @@
     }
 
-    // the reply must have a msg or be a local-loop optimisation
+    // the reply must have a msg or be a local-loop optimiation
     Q_ASSERT(reply.d_ptr->reply || reply.d_ptr->localMessage);
     return reply;
@@ -469 +472 @@
     }
 
-    // the reply must have a msg or be a local-loop optimisation
+    // the reply must have a msg or be a local-loop optimiation
     Q_ASSERT(reply.d_ptr->reply || reply.d_ptr->localMessage);
     return reply;
@@ -642 +645 @@
 {
     return d_ptr->delayedReply;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -760 +802 @@
 QT_END_NAMESPACE
 
+