WARNING COMMIT --> FIRST REKONQ 2 IMPORT

Preparing repo to merge rekonq2 code...

1 files changed, 0 insertions, 353 deletions

diff --git a/src/bookmarks/bookmarkmanager.cpp b/src/bookmarks/bookmarkmanager.cpp
deleted file mode 100644
index 33f3c662..00000000
--- a/src/bookmarks/bookmarkmanager.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
-* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy
-* defined in Section 14 of version 3 of the license.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Self Includes
-#include "bookmarkmanager.h"
-#include "bookmarkmanager.moc"
-
-// Local Includes
-#include "application.h"
-#include "bookmarkspanel.h"
-#include "bookmarkstoolbar.h"
-#include "bookmarkowner.h"
-#include "iconmanager.h"
-#include "mainwindow.h"
-#include "webtab.h"
-
-// KDE Includes
-#include <KActionCollection>
-#include <KStandardDirs>
-
-// Qt Includes
-#include <QtCore/QFile>
-
-
-BookmarkManager::BookmarkManager(QObject *parent)
-    : QObject(parent)
-    , m_manager(0)
-    , m_owner(0)
-    , m_actionCollection(new KActionCollection(this))
-{
-    m_manager = KBookmarkManager::userBookmarksManager();
-    const QString bookmarksFile = KStandardDirs::locateLocal("data", QString::fromLatin1("konqueror/bookmarks.xml"));
-
-    if (!QFile::exists(bookmarksFile))
-    {
-        kDebug() << "copying of defaultbookmarks.xbel ...";
-
-        QString bookmarksDefaultPath = KStandardDirs::locate("appdata" , "defaultbookmarks.xbel");
-        KBookmarkManager *tempManager = KBookmarkManager::managerForExternalFile(bookmarksDefaultPath);
-
-        copyBookmarkGroup(tempManager->root(), rootGroup());
-        m_manager->emitChanged();
-        delete tempManager;
-    }
-
-    connect(m_manager, SIGNAL(changed(QString, QString)), this, SLOT(slotBookmarksChanged()));
-
-    // setup menu
-    m_owner = new BookmarkOwner(m_manager, this);
-    connect(m_owner, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
-            this, SIGNAL(openUrl(KUrl, Rekonq::OpenType)));
-
-    // bookmarks loading
-    connect(this, SIGNAL(openUrl(KUrl, Rekonq::OpenType)), rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
-}
-
-
-BookmarkManager::~BookmarkManager()
-{
-    delete m_manager;
-}
-
-
-KActionMenu* BookmarkManager::bookmarkActionMenu(QWidget *parent)
-{
-    KMenu *menu = new KMenu(parent);
-    KActionMenu *bookmarkActionMenu = new KActionMenu(menu);
-    bookmarkActionMenu->setMenu(menu);
-    bookmarkActionMenu->setText(i18n("&Bookmarks"));
-    BookmarkMenu *bMenu = new BookmarkMenu(m_manager, m_owner, menu, m_actionCollection);
-    bMenu->setParent(menu);
-
-    return bookmarkActionMenu;
-}
-
-
-void BookmarkManager::registerBookmarkBar(BookmarkToolBar *toolbar)
-{
-    if (m_bookmarkToolBars.contains(toolbar))
-        return;
-
-    m_bookmarkToolBars.append(toolbar);
-}
-
-
-void BookmarkManager::removeBookmarkBar(BookmarkToolBar *toolbar)
-{
-    m_bookmarkToolBars.removeOne(toolbar);
-}
-
-
-void BookmarkManager::registerBookmarkPanel(BookmarksPanel *panel)
-{
-    if (panel && !m_bookmarkPanels.contains(panel))
-    {
-        m_bookmarkPanels.append(panel);
-        connect(panel, SIGNAL(expansionChanged()), this, SLOT(slotPanelChanged()));
-    }
-}
-
-
-void BookmarkManager::removeBookmarkPanel(BookmarksPanel *panel)
-{
-    if (!panel)
-        return;
-
-    m_bookmarkPanels.removeOne(panel);
-    panel->disconnect(this);
-
-    if (m_bookmarkPanels.isEmpty())
-        emitChanged();
-}
-
-
-QAction* BookmarkManager::actionByName(const QString &name)
-{
-    QAction *action = m_actionCollection->action(name);
-    if (action)
-        return action;
-    return new QAction(this);
-}
-
-
-KBookmarkGroup BookmarkManager::rootGroup()
-{
-    return m_manager->root();
-}
-
-
-QList<KBookmark> BookmarkManager::find(const QString &text)
-{
-    QList<KBookmark> list;
-
-    KBookmarkGroup root = rootGroup();
-    if (!root.isNull())
-        for (KBookmark bookmark = root.first(); !bookmark.isNull(); bookmark = root.next(bookmark))
-            find(&list, bookmark, text);
-
-    return list;
-}
-
-
-KBookmark BookmarkManager::bookmarkForUrl(const KUrl &url)
-{
-    KBookmarkGroup root = rootGroup();
-    if (root.isNull())
-        return KBookmark();
-
-    return bookmarkForUrl(root, url);
-}
-
-
-void BookmarkManager::slotBookmarksChanged()
-{
-    Q_FOREACH(BookmarkToolBar * bookmarkToolBar, m_bookmarkToolBars)
-    {
-        if (bookmarkToolBar)
-        {
-            bookmarkToolBar->toolBar()->clear();
-            fillBookmarkBar(bookmarkToolBar);
-        }
-    }
-
-    // this update about:bookmarks page...
-    if (rApp->mainWindow()
-            && rApp->mainWindow()->currentTab()
-            && rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")
-       )
-        rApp->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab);
-
-    emit bookmarksUpdated();
-}
-
-
-void BookmarkManager::fillBookmarkBar(BookmarkToolBar *toolBar)
-{
-    KBookmarkGroup root = m_manager->toolbar();
-    if (root.isNull())
-        return;
-
-    for (KBookmark bookmark = root.first(); !bookmark.isNull(); bookmark = root.next(bookmark))
-    {
-        if (bookmark.isGroup())
-        {
-            KBookmarkActionMenu *menuAction = new KBookmarkActionMenu(bookmark.toGroup(), this);
-            menuAction->setDelayed(false);
-            BookmarkMenu *bMenu = new BookmarkMenu(m_manager, m_owner, menuAction->menu(), bookmark.address());
-            bMenu->setParent(menuAction->menu());
-
-            connect(menuAction->menu(), SIGNAL(aboutToShow()), toolBar, SLOT(menuDisplayed()));
-            connect(menuAction->menu(), SIGNAL(aboutToHide()), toolBar, SLOT(menuHidden()));
-
-            toolBar->toolBar()->addAction(menuAction);
-            toolBar->toolBar()->widgetForAction(menuAction)->installEventFilter(toolBar);
-        }
-        else if (bookmark.isSeparator())
-        {
-            toolBar->toolBar()->addSeparator();
-        }
-        else
-        {
-            KBookmarkAction *action = new KBookmarkAction(bookmark, m_owner, this);
-            action->setIcon(rApp->iconManager()->iconForUrl(KUrl(bookmark.url())));
-            connect(action, SIGNAL(hovered()), toolBar, SLOT(actionHovered()));
-            toolBar->toolBar()->addAction(action);
-            toolBar->toolBar()->widgetForAction(action)->installEventFilter(toolBar);
-        }
-    }
-}
-
-
-void BookmarkManager::slotPanelChanged()
-{
-    Q_FOREACH(BookmarksPanel * panel, m_bookmarkPanels)
-    {
-        if (panel && panel != sender())
-            panel->loadFoldedState();
-    }
-    if (rApp->mainWindow()
-            && rApp->mainWindow()->currentTab()
-            && rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")
-       )
-        rApp->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab);
-}
-
-
-void BookmarkManager::find(QList<KBookmark> *list, const KBookmark &bookmark, const QString &text)
-{
-    if (bookmark.isGroup())
-    {
-        KBookmarkGroup group = bookmark.toGroup();
-        for (KBookmark bm = group.first(); !bm.isNull(); bm = group.next(bm))
-            find(list, bm, text);
-    }
-    else
-    {
-        QStringList words = text.split(' ');
-        bool matches = true;
-        Q_FOREACH(const QString & word, words)
-        {
-            if (!bookmark.url().url().contains(word, Qt::CaseInsensitive)
-                    && !bookmark.fullText().contains(word, Qt::CaseInsensitive))
-            {
-                matches = false;
-                break;
-            }
-        }
-        if (matches)
-            *list << bookmark;
-    }
-}
-
-
-KBookmark BookmarkManager::bookmarkForUrl(const KBookmark &bookmark, const KUrl &url)
-{
-    KBookmark found;
-
-    if (bookmark.isGroup())
-    {
-        KBookmarkGroup group = bookmark.toGroup();
-        KBookmark bookmark = group.first();
-
-        while (!bookmark.isNull() && found.isNull())
-        {
-            found = bookmarkForUrl(bookmark, url);
-            bookmark = group.next(bookmark);
-        }
-    }
-    else if (!bookmark.isSeparator() && bookmark.url() == url)
-    {
-        found = bookmark;
-    }
-
-    return found;
-}
-
-
-void BookmarkManager::copyBookmarkGroup(const KBookmarkGroup &groupToCopy, KBookmarkGroup destGroup)
-{
-    KBookmark bookmark = groupToCopy.first();
-    while (!bookmark.isNull())
-    {
-        if (bookmark.isGroup())
-        {
-            KBookmarkGroup newDestGroup = destGroup.createNewFolder(bookmark.text());
-            if (bookmark.toGroup().isToolbarGroup())
-            {
-                newDestGroup.internalElement().setAttribute("toolbar", "yes");
-                newDestGroup.setIcon("bookmark-toolbar");
-            }
-            copyBookmarkGroup(bookmark.toGroup(), newDestGroup);
-        }
-        else if (bookmark.isSeparator())
-        {
-            destGroup.createNewSeparator();
-        }
-        else
-        {
-            destGroup.addBookmark(bookmark.text(), bookmark.url());
-        }
-        bookmark = groupToCopy.next(bookmark);
-    }
-}
-
-
-void BookmarkManager::slotEditBookmarks()
-{
-    m_manager->slotEditBookmarks();
-}
-
-
-KBookmark BookmarkManager::findByAddress(const QString &address)
-{
-    return m_manager->findByAddress(address);
-}
-
-
-void BookmarkManager::openFolderinTabs(const KBookmarkGroup &bm)
-{
-    m_owner->openFolderinTabs(bm);
-}
-
-
-void BookmarkManager::emitChanged()
-{
-    m_manager->emitChanged();
-}