From 8d48c62aaf14e023b49c4701c26552732e7c609b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Fri, 20 Aug 2010 12:03:14 +0200
Subject: Bookmarks panel code reordered

---
 src/bookmarks/bookmarkspanel.cpp | 150 +++++++++++++++++++--------------------
 1 file changed, 75 insertions(+), 75 deletions(-)

(limited to 'src/bookmarks/bookmarkspanel.cpp')

diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 557fabc2..22701baa 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -76,6 +76,81 @@ void BookmarksPanel::showing(bool b)
 }
 
 
+void BookmarksPanel::startLoadFoldedState()
+{
+    m_loadingState = true;
+    loadFoldedState(QModelIndex());
+    m_loadingState = false;
+}
+
+
+void BookmarksPanel::contextMenu(const QPoint &pos)
+{
+    if (m_loadingState)
+        return;
+
+    BookmarksContextMenu menu(bookmarkForIndex( m_treeView->indexAt(pos) ),
+                              Application::bookmarkProvider()->bookmarkManager(),
+                              Application::bookmarkProvider()->bookmarkOwner(),
+                              this
+                             );
+
+    menu.exec(m_treeView->mapToGlobal(pos));
+}
+
+
+void BookmarksPanel::deleteBookmark()
+{
+    QModelIndex index = m_treeView->currentIndex();
+    if (m_loadingState || !index.isValid())
+        return;
+
+    Application::bookmarkProvider()->bookmarkOwner()->bookmarkSelected(bookmarkForIndex(index));
+    Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark();
+}
+
+
+void BookmarksPanel::onCollapse(const QModelIndex &index)
+{
+    if (m_loadingState)
+        return;
+
+    bookmarkForIndex(index).internalElement().setAttribute("folded", "yes");
+    emit expansionChanged();
+}
+
+
+void BookmarksPanel::onExpand(const QModelIndex &index)
+{
+    if (m_loadingState)
+        return;
+
+    bookmarkForIndex(index).internalElement().setAttribute("folded", "no");
+    emit expansionChanged();
+}
+
+
+void BookmarksPanel::loadFoldedState(const QModelIndex &root)
+{
+    int count = m_treeView->model()->rowCount(root);
+    QModelIndex index;
+
+    for (int i = 0; i < count; ++i)
+    {
+        index = m_treeView->model()->index(i, 0, root);
+        if (index.isValid())
+        {
+            KBookmark bm = bookmarkForIndex(index);
+            if (bm.isGroup())
+            {
+                m_treeView->setExpanded(index, bm.toGroup().isOpen());
+                loadFoldedState(index);
+            }
+        }
+    }
+}
+
+
 void BookmarksPanel::setup()
 {
     kDebug() << "Loading bookmarks panel setup...";
@@ -143,78 +218,3 @@ KBookmark BookmarksPanel::bookmarkForIndex(const QModelIndex &index)
     BtmItem *node = static_cast<BtmItem*>(originalIndex.internalPointer());
     return node->getBkm();
 }
-
-
-void BookmarksPanel::onCollapse(const QModelIndex &index)
-{
-    if (m_loadingState)
-        return;
-
-    bookmarkForIndex(index).internalElement().setAttribute("folded", "yes");
-    emit expansionChanged();
-}
-
-
-void BookmarksPanel::onExpand(const QModelIndex &index)
-{
-    if (m_loadingState)
-        return;
-
-    bookmarkForIndex(index).internalElement().setAttribute("folded", "no");
-    emit expansionChanged();
-}
-
-
-void BookmarksPanel::startLoadFoldedState()
-{
-    m_loadingState = true;
-    loadFoldedState(QModelIndex());
-    m_loadingState = false;
-}
-
-
-void BookmarksPanel::loadFoldedState(const QModelIndex &root)
-{
-    int count = m_treeView->model()->rowCount(root);
-    QModelIndex index;
-
-    for (int i = 0; i < count; ++i)
-    {
-        index = m_treeView->model()->index(i, 0, root);
-        if (index.isValid())
-        {
-            KBookmark bm = bookmarkForIndex(index);
-            if (bm.isGroup())
-            {
-                m_treeView->setExpanded(index, bm.toGroup().isOpen());
-                loadFoldedState(index);
-            }
-        }
-    }
-}
-
-
-void BookmarksPanel::contextMenu(const QPoint &pos)
-{
-    if (m_loadingState)
-        return;
-
-    BookmarksContextMenu menu(bookmarkForIndex( m_treeView->indexAt(pos) ),
-                              Application::bookmarkProvider()->bookmarkManager(),
-                              Application::bookmarkProvider()->bookmarkOwner(),
-                              this
-                             );
-
-    menu.exec(m_treeView->mapToGlobal(pos));
-}
-
-
-void BookmarksPanel::deleteBookmark()
-{
-    QModelIndex index = m_treeView->currentIndex();
-    if (m_loadingState || !index.isValid())
-        return;
-
-    Application::bookmarkProvider()->bookmarkOwner()->bookmarkSelected(bookmarkForIndex(index));
-    Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark();
-}
-- 
cgit v1.2.1