Changeset 846 for trunk/src/dbus/qdbuspendingreply.h

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/qdbuspendingreply.h (modified) (5 diffs)

trunk/src/dbus/qdbuspendingreply.h

@@ -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])
@@ -48 +48 @@
 #include <QtDBus/qdbuspendingcall.h>
 
+
+
 QT_BEGIN_HEADER
 
@@ -54 +56 @@
 QT_MODULE(DBus)
 
-class QDBUS_EXPORT QDBusPendingReplyData: public QDBusPendingCall
+class QDBUS_EXPORT QDBusPendingReplyData: public QDBusPendingCall
 {
 protected:
@@ -84 +86 @@
     template<typename T1> inline int metaTypeFor(T1 * = 0)
     { return qMetaTypeId<T1>(); }
-    // specialise for QVariant, allowing it to be used in place of QDBusVariant
+    // specialie for QVariant, allowing it to be used in place of QDBusVariant
     template<> inline int metaTypeFor<QVariant>(QVariant *)
     { return qMetaTypeId<QDBusVariant>(); }
@@ -212 +214 @@
 QT_END_HEADER
 
-#endif
+#endif // QT_NO_DBUS
+#endif