QPID-3858: WIP - tidy-up: protected to private in classes except where required in jrnl2 dir

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1348205 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 13 insertions, 14 deletions

diff --git a/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h b/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h
index 845d131a49..0cb1a5ed00 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h
@@ -224,7 +224,7 @@ public:
      */
     void processCompletedAioWriteEvents(const double timeout = 0.0);
 
-protected:
+private:
     std::string m_jrnlId;                       ///< Identifier for this journal instance (JID), typically queue name.
     JournalDirectory m_jrnlDir;                 ///< Directory in which this journal is deployed.
     std::string m_baseFileName;                 ///< Base file name used for all journal files belonging to this instance.
diff --git a/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h b/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h
index 207bbc68f2..3177b7ea36 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h
@@ -143,7 +143,7 @@ public:
         return m_cnt < rhs;
     }
 
-protected:
+private:
     T m_cnt;                ///< Internal count value
     ScopedMutex m_mutex;    ///< Internal lock used to increment the counter
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
index 79d1133cf6..fc7946de5a 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
@@ -82,7 +82,7 @@ DataOpState::s_toStr(const opState_t s)
     }
 }
 
-// protected
+// private
 void
 DataOpState::set(const opState_t s)
 {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h
index 492f0b3f6b..5316c90d69 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h
@@ -111,7 +111,7 @@ public:
      */
     static const char* s_toStr(const opState_t s);
 
-protected:
+private:
     /**
      * \brief Set (or change) the value of m_state. This function implements the state machine checks for
      * legal state change transitions, and throw an exception if an illegal state transition is requested.
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataToken.h b/cpp/src/qpid/asyncStore/jrnl2/DataToken.h
index 2058cc75ad..3aed38bc42 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataToken.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataToken.h
@@ -156,7 +156,7 @@ public:
      */
     virtual void toStream(std::ostream& os) const;
 
-protected:
+private:
     DataOpState m_dataOpState;                  ///< Data operational state (none, enqueued, dequeued)
     DataWrComplState m_dataWrComplState;        ///< Data write completion state (none, part, complete)
     bool m_transientFlag;                       ///< True if the data record is transient (eg for Flow-To-Disk)
@@ -166,7 +166,6 @@ protected:
     bool m_externalRecordIdFlag;                ///< True if the record id was set through this token
     recordId_t m_dequeueRecordId;               ///< Record Id of the dequeue record for this data record
 
-private:
     static RecordIdCounter_t s_recordIdCounter; ///< Static instance keeps record Ids unique across system
 
 };
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h
index 691b9c7b82..355180ec87 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h
@@ -112,7 +112,7 @@ public:
      */
     static const char* s_toStr(const wrComplState_t s);
 
-protected:
+private:
     /**
      * \brief Set (or change) the value of m_state. This function implements the state machine checks for
      * legal state change transitions, and throw an exception if an illegal state transition is requested.
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.h b/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.h
index 444094ccb4..3bca212f88 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.h
@@ -257,7 +257,7 @@ public:
      */
     bool isVerified() const;
 
-protected:
+private:
     std::string m_fqName;   ///< Name of directory (fully qualified name)
     bool m_verified;        ///< True when verified that it exists or is created
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalError.h b/cpp/src/qpid/asyncStore/jrnl2/JournalError.h
index 42f64ef794..44e289df43 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalError.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalError.h
@@ -219,7 +219,7 @@ public:
      */
     static const char* s_errorMessage(const uint32_t err_no) throw ();
 
-protected:
+private:
     uint32_t m_errorCode;            ///< Error or failure code, taken from JournalErrors.
     std::string m_additionalInfo;       ///< Additional information pertaining to the error or failure.
     std::string m_throwingClass;        ///< Name of the class throwing the error.
@@ -243,7 +243,6 @@ protected:
     static errorMap_t s_errorMap;                       ///< Map of error messages
     static errorMapCitr_t s_errorMapIterator;           ///< Const iterator
 
-private:
     static const char* s_className;                     ///< Name of this class, used in formatting error messages.
     static bool s_initializedFlag;                      ///< Dummy flag, used to initialize map.
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
index 067ed12adf..fcc6a57528 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
@@ -114,7 +114,7 @@ JournalRunState::s_toStr(const journalState_t s)
     }
 }
 
-// protected
+// private
 void
 JournalRunState::set(const journalState_t s)
 {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h
index 85141d8e18..4f3a64a009 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h
@@ -156,7 +156,7 @@ public:
      */
     static const char* s_toStr(const journalState_t s);
 
-protected:
+private:
     /**
      * \brief Set (or change) the value of m_state. This function implements the state machine checks for
      * legal state change transitions, and throw an exception if an illegal state transition is requested.
diff --git a/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.h b/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.h
index a420850c0b..da339ad3dd 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.h
@@ -36,7 +36,7 @@ public:
     ScopedMutex();
     virtual ~ScopedMutex();
     ::pthread_mutex_t* get() const;
-protected:
+private:
     mutable ::pthread_mutex_t m_mutex;
 };
 
@@ -68,7 +68,7 @@ public:
     ScopedTryLock(const ScopedMutex& sm);
     virtual ~ScopedTryLock();
     bool isLocked() const;
-protected:
+private:
     bool m_lockedFlag;
 };
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/State.h b/cpp/src/qpid/asyncStore/jrnl2/State.h
index 3a4354760a..5d7c8d6fe9 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/State.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/State.h
@@ -136,6 +136,7 @@ public:
 protected:
     E m_state;  ///< Local state of this state machine instance.
 
+private:
     /**
      * \brief Set (or change) the value of m_state. This function must implement the state machine checks for
      * legal state change transitions, and throw an exception if an illegal state transition is requested.