Decrease code duplication

Make isInactive(), isActive(), isCanceled(), and isFinished() a simple
convenience accessors to state(), like they ought to be.

Change-Id: Idd72ed7bda9041b8d58095f2813a78a012c4ce2e
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

4 files changed, 57 insertions, 76 deletions

diff --git a/src/contacts/qcontactabstractrequest.cpp b/src/contacts/qcontactabstractrequest.cpp
index e3eac15e7..89683d1d7 100644
--- a/src/contacts/qcontactabstractrequest.cpp
+++ b/src/contacts/qcontactabstractrequest.cpp
@@ -203,48 +203,40 @@ QContactAbstractRequest::~QContactAbstractRequest()
 }
 
 /*!
-  Returns true if the request is in the \c QContactAbstractRequest::InactiveState state; otherwise, returns false
+    \fn bool QContactAbstractRequest::isInactive() const
 
-  \sa state()
- */
-bool QContactAbstractRequest::isInactive() const
-{
-    QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QContactAbstractRequest::InactiveState);
-}
+    Returns true if the request is in the \l QContactAbstractRequest::InactiveState state;
+    returns false otherwise.
+
+    \sa state(), isActive(), isCanceled(), isFinished()
+*/
 
 /*!
-  Returns true if the request is in the \c QContactAbstractRequest::ActiveState state; otherwise, returns false
+    \fn bool QContactAbstractRequest::isActive() const
 
-  \sa state()
- */
-bool QContactAbstractRequest::isActive() const
-{
-    QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QContactAbstractRequest::ActiveState);
-}
+    Returns true if the request is in the \l QContactAbstractRequest::ActiveState state;
+    returns false otherwise.
+
+    \sa state(), isInactive(), isCanceled(), isFinished()
+*/
 
 /*!
-  Returns true if the request is in the \c QContactAbstractRequest::FinishedState; otherwise, returns false
+    \fn bool QContactAbstractRequest::isFinished() const
 
-  \sa state()
- */
-bool QContactAbstractRequest::isFinished() const
-{
-    QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QContactAbstractRequest::FinishedState);
-}
+    Returns true if the request is in the \l QContactAbstractRequest::FinishedState;
+    returns false otherwise.
+
+    \sa state(), isActive(), isInactive(), isCanceled()
+*/
 
 /*!
-  Returns true if the request is in the \c QContactAbstractRequest::CanceledState; otherwise, returns false
+    \fn bool QContactAbstractRequest::isCanceled() const
 
-  \sa state()
- */
-bool QContactAbstractRequest::isCanceled() const
-{
-    QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QContactAbstractRequest::CanceledState);
-}
+    Returns true if the request is in the \l QContactAbstractRequest::CanceledState;
+    returns false otherwise.
+
+    \sa state(), isActive(), isInactive(), isFinished()
+*/
 
 /*! Returns the overall error of the most recent asynchronous operation
 */
diff --git a/src/contacts/qcontactabstractrequest.h b/src/contacts/qcontactabstractrequest.h
index 52d87a5f4..9826747d0 100644
--- a/src/contacts/qcontactabstractrequest.h
+++ b/src/contacts/qcontactabstractrequest.h
@@ -67,10 +67,11 @@ public:
     };
 
     State state() const; // replaces status()
-    bool isInactive() const;
-    bool isActive() const;
-    bool isFinished() const;
-    bool isCanceled() const;
+    inline bool isInactive() const { return state() == QContactAbstractRequest::InactiveState; }
+    inline bool isActive() const { return state() == QContactAbstractRequest::ActiveState; }
+    inline bool isFinished() const { return state() == QContactAbstractRequest::FinishedState; }
+    inline bool isCanceled() const { return state() == QContactAbstractRequest::CanceledState; }
+
     QContactManager::Error error() const;
 
     Q_ENUMS(RequestType)
diff --git a/src/organizer/qorganizerabstractrequest.cpp b/src/organizer/qorganizerabstractrequest.cpp
index e7b0f77a0..a6df991b8 100644
--- a/src/organizer/qorganizerabstractrequest.cpp
+++ b/src/organizer/qorganizerabstractrequest.cpp
@@ -149,52 +149,40 @@ QOrganizerAbstractRequest::~QOrganizerAbstractRequest()
 }
 
 /*!
-    Returns true if the request is in the QOrganizerAbstractRequest::InactiveState state; otherwise,
-    returns false.
+    \fn bool QOrganizerAbstractRequest::isInactive() const
 
-    \sa state()
- */
-bool QOrganizerAbstractRequest::isInactive() const
-{
-    QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QOrganizerAbstractRequest::InactiveState);
-}
+    Returns true if the request is in the \l QOrganizerAbstractRequest::InactiveState state;
+    returns false otherwise.
+
+    \sa state(), isActive(), isCanceled(), isFinished()
+*/
 
 /*!
-    Returns true if the request is in the QOrganizerAbstractRequest::ActiveState state; otherwise,
-    returns false.
+    \fn bool QOrganizerAbstractRequest::isActive() const
 
-    \sa state()
- */
-bool QOrganizerAbstractRequest::isActive() const
-{
-    QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QOrganizerAbstractRequest::ActiveState);
-}
+    Returns true if the request is in the \l QOrganizerAbstractRequest::ActiveState state;
+    returns false otherwise.
+
+    \sa state(), isInactive(), isCanceled(), isFinished()
+*/
 
 /*!
-    Returns true if the request is in the QOrganizerAbstractRequest::FinishedState; otherwise,
-    returns false.
+    \fn bool QOrganizerAbstractRequest::isFinished() const
 
-    \sa state()
- */
-bool QOrganizerAbstractRequest::isFinished() const
-{
-    QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QOrganizerAbstractRequest::FinishedState);
-}
+    Returns true if the request is in the \l QOrganizerAbstractRequest::FinishedState;
+    returns false otherwise.
+
+    \sa state(), isActive(), isInactive(), isCanceled()
+*/
 
 /*!
-    Returns true if the request is in the QOrganizerAbstractRequest::CanceledState; otherwise,
-    returns false.
+    \fn bool QOrganizerAbstractRequest::isCanceled() const
 
-    \sa state()
- */
-bool QOrganizerAbstractRequest::isCanceled() const
-{
-    QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QOrganizerAbstractRequest::CanceledState);
-}
+    Returns true if the request is in the \l QOrganizerAbstractRequest::CanceledState;
+    returns false otherwise.
+
+    \sa state(), isActive(), isInactive(), isFinished()
+*/
 
 /*!
     Returns the overall error of the most recent asynchronous operation.
diff --git a/src/organizer/qorganizerabstractrequest.h b/src/organizer/qorganizerabstractrequest.h
index 05076c437..82ce4eff5 100644
--- a/src/organizer/qorganizerabstractrequest.h
+++ b/src/organizer/qorganizerabstractrequest.h
@@ -64,10 +64,10 @@ public:
     };
 
     State state() const;
-    bool isInactive() const;
-    bool isActive() const;
-    bool isFinished() const;
-    bool isCanceled() const;
+    inline bool isInactive() const { return state() == QOrganizerAbstractRequest::InactiveState; }
+    inline bool isActive() const { return state() == QOrganizerAbstractRequest::ActiveState; }
+    inline bool isCanceled() const { return state() == QOrganizerAbstractRequest::CanceledState; }
+    inline bool isFinished() const { return state() == QOrganizerAbstractRequest::FinishedState; }
 
     QOrganizerManager::Error error() const;