move Ring to sw::Ring

Change-Id: I3109185f747b821ee94aae5c58f86768ca30713a

sw/inc/pam.hxx

@@ -155,7 +155,7 @@ void _InitPam();
 
 class SwPaM;
 /// PaM is Point and Mark: a selection of the document model.
-class SW_DLLPUBLIC SwPaM : public Ring<SwPaM>
+class SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM>
 {
     SwPosition   m_Bound1;
     SwPosition   m_Bound2;

sw/inc/ring.hxx

@@ -24,12 +24,14 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/intrusive/circular_list_algorithms.hpp>
 
-class Ring_node_traits;
-template <class T> class RingIterator;
-
-template <class T>
-class SW_DLLPUBLIC Ring
+namespace sw
 {
+    class Ring_node_traits;
+    template <class T> class RingIterator;
+
+    template <class T>
+    class SW_DLLPUBLIC Ring
+    {
         struct Ring_node_traits
         {
             typedef T node;
@@ -45,11 +47,11 @@ class SW_DLLPUBLIC Ring
         T* pNext;
         T* pPrev;    ///< In order to speed up inserting and deleting.
 
-protected:
+    protected:
         Ring()
             { algo::init_header(static_cast< T* >(this)); }
         Ring( T* );
-public:
+    public:
         typedef RingIterator<T> iterator;
         typedef RingIterator<T> const_iterator;
         virtual ~Ring()
@@ -66,21 +68,21 @@ public:
 
         sal_uInt32 numberOf() const
             { return algo::count(static_cast< const T* >(this)); }
-};
+    };
 
-template <class T>
-inline Ring<T>::Ring( T* pObj )
-{
+    template <class T>
+    inline Ring<T>::Ring( T* pObj )
+    {
         T* pThis = static_cast< T* >(this);
         if( !pObj )
             algo::init_header(pThis);
         else
             algo::link_before(pObj, pThis);
-}
+    }
 
-template <class T>
-inline void Ring<T>::MoveTo(T* pDestRing)
-{
+    template <class T>
+    inline void Ring<T>::MoveTo(T* pDestRing)
+    {
         T* pThis = static_cast< T* >(this);
         // insert into "new"
         if( pDestRing )
@@ -92,22 +94,22 @@ inline void Ring<T>::MoveTo(T* pDestRing)
         }
         else
             algo::unlink(pThis);
-}
+    }
 
-template <class T>
-inline void Ring<T>::MoveRingTo(T* pDestRing)
-{
+    template <class T>
+    inline void Ring<T>::MoveRingTo(T* pDestRing)
+    {
         std::swap(*(&pPrev->pNext), *(&pDestRing->pPrev->pNext));
         std::swap(*(&pPrev), *(&pDestRing->pPrev));
-}
+    }
 
-template <class T>
-class RingIterator : public boost::iterator_facade<
+    template <class T>
+    class RingIterator : public boost::iterator_facade<
           RingIterator<T>
         , T
         , boost::forward_traversal_tag
         >
-{
+    {
         public:
             RingIterator()
                 : m_pCurrent(nullptr)
@@ -130,16 +132,17 @@ class RingIterator : public boost::iterator_facade<
                 { return m_pCurrent ? *m_pCurrent : * m_pStart; }
             T* m_pCurrent;
             T* m_pStart;
-};
+    };
 
-template <class T>
-inline typename Ring<T>::iterator Ring<T>::beginRing()
+    template <class T>
+    inline typename Ring<T>::iterator Ring<T>::beginRing()
         { return Ring<T>::iterator(static_cast< T* >(this)); };
 
-template <class T>
-inline typename Ring<T>::iterator Ring<T>::endRing()
+    template <class T>
+    inline typename Ring<T>::iterator Ring<T>::endRing()
         { return Ring<T>::iterator(static_cast< T* >(this), false); };
 
+}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/inc/viewsh.hxx

@@ -95,7 +95,7 @@ enum FrameControlType
 typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr;
 
 class SwViewShell;
-class SW_DLLPUBLIC SwViewShell : public Ring<SwViewShell>
+class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
 {
     friend void SetOutDev( SwViewShell *pSh, OutputDevice *pOut );
     friend void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pOut,

sw/qa/core/uwriter.cxx

@@ -1275,9 +1275,9 @@ void SwDocTest::testMarkMove()
 
 namespace
 {
-    struct TestRing : public Ring<TestRing>
+    struct TestRing : public sw::Ring<TestRing>
     {
-        TestRing() : Ring<TestRing>() {};
+        TestRing() : sw::Ring<TestRing>() {};
         void debug()
         {
             SAL_DEBUG("TestRing at: " << this << " prev: " << GetPrev() << " next: " << GetNext());

sw/source/core/doc/doccomp.cxx

@@ -1828,7 +1828,7 @@ long SwDoc::CompareDoc( const SwDoc& rDoc )
 }
 
 class _SaveMergeRedlines;
-class _SaveMergeRedlines : public Ring<_SaveMergeRedlines>
+class _SaveMergeRedlines : public sw::Ring<_SaveMergeRedlines>
 {
     const SwRangeRedline* pSrcRedl;
     SwRangeRedline* pDestRedl;