move SvTreeList::*Sibling to SvTreeListEntry

since they don't depend on SvTreeList at all

Change-Id: If48c83976a95943e5cfa92490d68f74281cf4b5f
Reviewed-on: https://gerrit.libreoffice.org/56819
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 17 insertions, 16 deletions

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 3c02548df87f..7216fc949575 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -116,7 +116,7 @@ namespace
                 }
             }
             else
-                pEntry = SvTreeListBox::NextSibling(pEntry);
+                pEntry = pEntry->NextSibling();
         }
         return pReturn;
     }
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index ade472fe704a..44fcb8688a07 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1369,7 +1369,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const css::lang::EventObject& _rS
                         break;
                     }
 
-                    pDSLoop = SvTreeList::NextSibling(pDSLoop);
+                    pDSLoop = pDSLoop->NextSibling();
                 }
             }
             else
@@ -2697,7 +2697,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNa
         if ( pTablesData && pTablesData->xContainer == _rxNameAccess )
             break;
 
-        pDSLoop     = SvTreeList::NextSibling(pDSLoop);
+        pDSLoop     = pDSLoop->NextSibling();
         pContainer  = nullptr;
     }
     return pContainer;
@@ -2789,7 +2789,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven
                     m_pTreeModel->Remove(pChild);
                     break;
                 }
-                pChild = SvTreeList::NextSibling(pChild);
+                pChild = pChild->NextSibling();
             }
         }
 
@@ -2854,7 +2854,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
                     }
                     break;
                 }
-                pChild = SvTreeList::NextSibling(pChild);
+                pChild = pChild->NextSibling();
             }
         }
 
@@ -2921,7 +2921,7 @@ void SbaTableQueryBrowser::closeConnection(SvTreeListEntry* _pDSEntry, bool _bDi
         unloadAndCleanup(_bDisposeConnection);
 
     // collapse the query/table container
-    for (SvTreeListEntry* pContainers = m_pTreeModel->FirstChild(_pDSEntry); pContainers; pContainers = SvTreeList::NextSibling(pContainers))
+    for (SvTreeListEntry* pContainers = m_pTreeModel->FirstChild(_pDSEntry); pContainers; pContainers = pContainers->NextSibling())
     {
         SvTreeListEntry* pElements = m_pTreeModel->FirstChild(pContainers);
         if ( pElements )
@@ -2931,7 +2931,7 @@ void SbaTableQueryBrowser::closeConnection(SvTreeListEntry* _pDSEntry, bool _bDi
         for (; pElements; )
         {
             SvTreeListEntry* pRemove = pElements;
-            pElements = SvTreeList::NextSibling(pElements);
+            pElements = pElements->NextSibling();
             DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pRemove->GetUserData());
             pRemove->SetUserData(nullptr);
             delete pData;
@@ -3700,7 +3700,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSo
         if ( m_pTreeView->getListBox().GetEntryText( pDataSourceEntry ) == _rDataSourceName )
             break;
 
-        pDataSourceEntry = SvTreeList::NextSibling( pDataSourceEntry );
+        pDataSourceEntry = pDataSourceEntry->NextSibling();
     }
 
     OSL_ENSURE( pDataSourceEntry, "SbaTableQueryBrowser::impl_cleanupDataSourceEntry: do not know this data source!" );
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 1893985aa6fa..073ce1586d2e 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <marktree.hxx>
+#include <svtools/treelistentry.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -114,7 +115,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvTreeListEntry* _pEntry)
             ++nCheckedChildren;
         ++nChildrenOverall;
 
-        pChildLoop = SvTreeList::NextSibling(pChildLoop);
+        pChildLoop = pChildLoop->NextSibling();
     }
 
     if (pChildLoop)
@@ -128,7 +129,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvTreeListEntry* _pEntry)
         while (pChildLoop)
         {
             implDetermineState(pChildLoop);
-            pChildLoop = SvTreeList::NextSibling(pChildLoop);
+            pChildLoop = pChildLoop->NextSibling();
         }
     }
     else
@@ -157,7 +158,7 @@ void OMarkableTreeListBox::CheckButtons()
     while (pEntry)
     {
         implDetermineState(pEntry);
-        pEntry = SvTreeList::NextSibling(pEntry);
+        pEntry = pEntry->NextSibling();
     }
 }
 
@@ -173,7 +174,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry)
     if (GetModel()->HasChildren(_pEntry)) // if it has children, check those too
     {
         SvTreeListEntry* pChildEntry = GetModel()->Next(_pEntry);
-        SvTreeListEntry* pSiblingEntry = SvTreeList::NextSibling(_pEntry);
+        SvTreeListEntry* pSiblingEntry = _pEntry->NextSibling();
         while(pChildEntry && pChildEntry != pSiblingEntry)
         {
             SetCheckButtonState(pChildEntry, eState);
@@ -188,7 +189,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry)
         if(GetModel()->HasChildren(pEntry))   // if it has children, check those too
         {
             SvTreeListEntry* pChildEntry = GetModel()->Next(pEntry);
-            SvTreeListEntry* pSiblingEntry = SvTreeList::NextSibling(pEntry);
+            SvTreeListEntry* pSiblingEntry = pEntry->NextSibling();
             while(pChildEntry && pChildEntry != pSiblingEntry)
             {
                 SetCheckButtonState(pChildEntry,eState);
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index a285b7f9675a..f9c21a7c8f45 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -368,7 +368,7 @@ void OTableTreeListBox::implEmphasize(SvTreeListEntry* _pEntry, bool _bChecked,
         {
             if (GetModel()->HasChildren(pChildLoop))
                 implEmphasize(pChildLoop, false, true, false);
-            pChildLoop = NextSibling(pChildLoop);
+            pChildLoop = pChildLoop->NextSibling();
         }
     }
 
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 2f4b76e46db6..431db3828481 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -357,7 +357,7 @@ namespace dbaui
         {
             m_pTablesList->Expand(pExpand);
             pExpand = m_pTablesList->FirstChild(pExpand);
-            if (pExpand && SvTreeList::NextSibling(pExpand))
+            if (pExpand && pExpand->NextSibling())
                 pExpand = nullptr;
         }
 
@@ -526,7 +526,7 @@ namespace dbaui
         SvTreeListEntry* pReturn = nullptr;
         if (_pEntry)
         {
-            pReturn = SvTreeList::NextSibling(_pEntry);
+            pReturn = _pEntry->NextSibling();
             if (!pReturn)
                 pReturn = implNextSibling(m_pTablesList->GetParent(_pEntry));
         }