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/bookmarkstreemodel.cpp | 112 +++++++++++++++++------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

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

diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 5bf1f769..8e95a615 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -250,6 +250,62 @@ QVariant BookmarksTreeModel::data(const QModelIndex &index, int role) const
 }
 
 
+QStringList BookmarksTreeModel::mimeTypes() const
+{
+    return KBookmark::List::mimeDataTypes();
+}
+
+
+bool BookmarksTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
+{
+    if (action != Qt::MoveAction || !data->hasFormat("application/rekonq-bookmark"))
+        return false;
+
+    QByteArray addresses = data->data("application/rekonq-bookmark");
+    KBookmark bookmark = Application::bookmarkProvider()->bookmarkManager()->findByAddress(QString::fromLatin1(addresses.data()));
+
+    KBookmarkGroup root;
+    if (parent.isValid())
+        root = bookmarkForIndex(parent).toGroup();
+    else
+        root = Application::bookmarkProvider()->rootGroup();
+
+    QModelIndex destIndex = index(row, column, parent);
+
+    if (destIndex.isValid() && row != -1)
+    {
+        root.moveBookmark(bookmark, root.previous(bookmarkForIndex(destIndex)));
+    }
+    else
+    {
+        root.deleteBookmark(bookmark);
+        root.addBookmark(bookmark);
+    }
+
+    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+
+    return true;
+}
+
+
+Qt::DropActions BookmarksTreeModel::supportedDropActions() const
+{
+    return Qt::MoveAction;
+}
+
+
+QMimeData* BookmarksTreeModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData;
+
+    QByteArray address = bookmarkForIndex(indexes.first()).address().toLatin1();
+    mimeData->setData("application/rekonq-bookmark", address);
+    bookmarkForIndex(indexes.first()).populateMimeData(mimeData);
+
+    return mimeData;
+}
+
+
 void BookmarksTreeModel::bookmarksChanged(const QString &groupAddress)
 {
     if (groupAddress.isEmpty())
@@ -325,59 +381,3 @@ KBookmark BookmarksTreeModel::bookmarkForIndex(const QModelIndex &index) const
 {
     return static_cast<BtmItem*>(index.internalPointer())->getBkm();
 }
-
-
-Qt::DropActions BookmarksTreeModel::supportedDropActions() const
-{
-    return Qt::MoveAction;
-}
-
-
-QStringList BookmarksTreeModel::mimeTypes() const
-{
-    return KBookmark::List::mimeDataTypes();
-}
-
-
-QMimeData* BookmarksTreeModel::mimeData(const QModelIndexList &indexes) const
-{
-    QMimeData *mimeData = new QMimeData;
-
-    QByteArray address = bookmarkForIndex(indexes.first()).address().toLatin1();
-    mimeData->setData("application/rekonq-bookmark", address);
-    bookmarkForIndex(indexes.first()).populateMimeData(mimeData);
-
-    return mimeData;
-}
-
-
-bool BookmarksTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
-{
-    if (action != Qt::MoveAction || !data->hasFormat("application/rekonq-bookmark"))
-        return false;
-
-    QByteArray addresses = data->data("application/rekonq-bookmark");
-    KBookmark bookmark = Application::bookmarkProvider()->bookmarkManager()->findByAddress(QString::fromLatin1(addresses.data()));
-
-    KBookmarkGroup root;
-    if (parent.isValid())
-        root = bookmarkForIndex(parent).toGroup();
-    else
-        root = Application::bookmarkProvider()->rootGroup();
-
-    QModelIndex destIndex = index(row, column, parent);
-
-    if (destIndex.isValid() && row != -1)
-    {
-        root.moveBookmark(bookmark, root.previous(bookmarkForIndex(destIndex)));
-    }
-    else
-    {
-        root.deleteBookmark(bookmark);
-        root.addBookmark(bookmark);
-    }
-
-    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
-
-    return true;
-}
-- 
cgit v1.2.1