Changeset 561 for trunk/src/dbus/qdbuserror.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/dbus/qdbuserror.cpp (modified) (9 diffs)

trunk/src/dbus/qdbuserror.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtDBus module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #include <qvarlengtharray.h>
 
-#include <qdbus_symbols_p.h>
+#include "qdbus_symbols_p.h"
 #include "qdbusmessage.h"
 #include "qdbusmessage_p.h"
@@ -92 +92 @@
 com.trolltech.QtDBus.Error.InternalError
 org.freedesktop.DBus.Error.UnknownObject
+com.trolltech.QtDBus.Error.InvalidService
+com.trolltech.QtDBus.Error.InvalidObjectPath
+com.trolltech.QtDBus.Error.InvalidInterface
+com.trolltech.QtDBus.Error.InvalidMember
 */
 
@@ -117 +121 @@
     "com.trolltech.QtDBus.Error.InternalError\0"
     "org.freedesktop.DBus.Error.UnknownObject\0"
+    "com.trolltech.QtDBus.Error.InvalidService\0"
+    "com.trolltech.QtDBus.Error.InvalidObjectPath\0"
+    "com.trolltech.QtDBus.Error.InvalidInterface\0"
+    "com.trolltech.QtDBus.Error.InvalidMember\0"
     "\0";
 
@@ -122 +130 @@
        0,    6,   40,   76,  118,  153,  191,  231,
      273,  313,  349,  384,  421,  461,  501,  540,
-     581,  617,  661,  705,  746,    0
+     581,  617,  661,  705,  746,  787,  829,  874,
+     918,    0
 };
 
@@ -217 +226 @@
     \value InternalError        An internal error occurred
                                 (\c com.trolltech.QtDBus.Error.InternalError)
+
+    \value InvalidObjectPath    The object path provided is invalid.
+
+    \value InvalidService       The service requested is invalid.
+
+    \value InvalidMember        The member is invalid.
+
+    \value InvalidInterface     The interface is invalid.
+
     \value UnknownObject        The remote object could not be found.
-
 */
 
@@ -340 +357 @@
 QDebug operator<<(QDebug dbg, const QDBusError &msg)
 {
-    dbg.nospace() << "QDBusError(" << msg.name() << ", " << msg.message() << ")";
+    dbg.nospace() << "QDBusError(" << msg.name() << ", " << msg.message() << ')';
     return dbg.space();
 }