Add a timeout error code to contacts and organizer.

Change-Id: Ifa0663c2396d5b92596fcd89d3b16b78712d81f1
Task-number: MOBILITY-2189
Reviewed-by: Kevin Wu Won

4 files changed, 6 insertions, 3 deletions

diff --git a/src/contacts/qcontactmanager.cpp b/src/contacts/qcontactmanager.cpp
index 27605ca6d3..61bbf2a233 100644
--- a/src/contacts/qcontactmanager.cpp
+++ b/src/contacts/qcontactmanager.cpp
@@ -411,6 +411,7 @@ Q_DEFINE_LATIN1_CONSTANT(QContactManager::ParameterValueOnlyOtherProcesses, "Onl
   \value LimitReachedError The most recent operation failed because the limit for that type of object has been reached
   \value NotSupportedError The most recent operation failed because the requested operation is not supported in the specified store
   \value BadArgumentError The most recent operation failed because one or more of the parameters to the operation were invalid
+  \value TimeoutError The most recent operation failed because it took longer than expected.  It may be possible to try again.
   \value UnspecifiedError The most recent operation failed for an undocumented reason
  */
 
diff --git a/src/contacts/qcontactmanager.h b/src/contacts/qcontactmanager.h
index 4b74583bb6..ee5e481485 100644
--- a/src/contacts/qcontactmanager.h
+++ b/src/contacts/qcontactmanager.h
@@ -103,7 +103,6 @@ public:
     static bool parseUri(const QString& uri, QString* managerName, QMap<QString, QString>* params);
     static QString buildUri(const QString& managerName, const QMap<QString, QString>& params, int implementationVersion = -1);
 
-    /* The values of the Error enum are still to be decided! */
     enum Error {
         NoError = 0,
         DoesNotExistError,
@@ -119,7 +118,8 @@ public:
         UnspecifiedError,
         VersionMismatchError,
         LimitReachedError,
-        InvalidContactTypeError
+        InvalidContactTypeError,
+        TimeoutError
     };
 
     /* Error reporting */
diff --git a/src/organizer/qorganizermanager.cpp b/src/organizer/qorganizermanager.cpp
index 3fc10aba59..9ddc848335 100644
--- a/src/organizer/qorganizermanager.cpp
+++ b/src/organizer/qorganizermanager.cpp
@@ -332,6 +332,7 @@ QOrganizerManager::~QOrganizerManager()
   \value InvalidItemTypeError The most recent operation failed because the item given was of an invalid type for the operation
   \value InvalidCollectionError The most recent operation failed because the collection is invalid
   \value InvalidOccurrenceError The most recent operation failed because it was an attempt to save an occurrence without a correct InstanceOrigin detail
+  \value TimeoutError The most recent operation failed because it took longer than expected.  It may be possible to try again.
  */
 
 /*! Return the error code of the most recent operation */
diff --git a/src/organizer/qorganizermanager.h b/src/organizer/qorganizermanager.h
index b483384880..c2fb0fb725 100644
--- a/src/organizer/qorganizermanager.h
+++ b/src/organizer/qorganizermanager.h
@@ -106,7 +106,8 @@ public:
         LimitReachedError,
         InvalidItemTypeError,
         InvalidCollectionError,
-        InvalidOccurrenceError
+        InvalidOccurrenceError,
+        TimeoutError
     };
 
     /* Error reporting */