From 6bd18f891b4bbc265e5ddd18ba57095886b36e38 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Mon, 29 Jun 2009 15:32:26 +0200
Subject: Add some new error codes for indicating invalid D-Bus parameters.

I'm wondering if I should be adding com.trolltech.QtDBus stuff
now. But since there's already one there, I don't see why not...

Reviewed-By: Harald Fernengel
---
 src/dbus/qdbuserror.cpp | 11 ++++++++++-
 src/dbus/qdbuserror.h   |  6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp
index 817356d..7509ded 100644
--- a/src/dbus/qdbuserror.cpp
+++ b/src/dbus/qdbuserror.cpp
@@ -91,6 +91,10 @@ org.freedesktop.DBus.Error.InvalidSignature
 org.freedesktop.DBus.Error.UnknownInterface
 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
 */
 
 // in the same order as KnownErrors!
@@ -116,12 +120,17 @@ static const char errorMessages_string[] =
     "org.freedesktop.DBus.Error.UnknownInterface\0"
     "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";
 
 static const int errorMessages_indices[] = {
        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
 };
 
 static const int errorMessages_count = sizeof errorMessages_indices /
diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h
index 7b77fd5..4e348dd 100644
--- a/src/dbus/qdbuserror.h
+++ b/src/dbus/qdbuserror.h
@@ -81,10 +81,14 @@ public:
         UnknownInterface,
         InternalError,
         UnknownObject,
+        InvalidService,
+        InvalidObjectPath,
+        InvalidInterface,
+        InvalidMember,
 
 #ifndef Q_QDOC
         // don't use this one!
-        LastErrorType = UnknownObject
+        LastErrorType = InvalidMember
 #endif
     };
 
-- 
cgit v0.12