Some changes ported for merge to mainline (bookmarks & links handling related)

Added author: me :)
Bookmark owner: openFolderinTabs implemented
Links handling ported from Pawel branch
Issue #1 fixed

1 files changed, 12 insertions, 11 deletions

diff --git a/src/mainview.h b/src/mainview.h
index facd865f..35f887fd 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -26,6 +26,7 @@
 
 // Local Includes
 #include "webview.h"
+#include "application.h"
 
 // KDE Includes
 #include <KTabWidget>
@@ -48,7 +49,7 @@ class UrlBar;
 
 
 /**
- *  This class represent rekonq Main View. It contains all WebViews and a stack widget 
+ *  This class represent rekonq Main View. It contains all WebViews and a stack widget
  *  of associated line edits.
  *
  */
@@ -64,7 +65,6 @@ public:
 
 signals:
     // tab widget signals
-    void loadUrlPage(const KUrl &url);
     void tabsChanged();
     void lastTabClosed();
 
@@ -73,7 +73,7 @@ signals:
     void showStatusBarMessage(const QString &message);
     void linkHovered(const QString &link);
     void loadProgress(int progress);
-    
+
     void geometryChangeRequested(const QRect &geometry);
     void menuBarVisibilityChangeRequested(bool visible);
     void statusBarVisibilityChangeRequested(bool visible);
@@ -82,19 +82,19 @@ signals:
 
 public:
 //     void setupTabButtons();
-    
+
     UrlBar *urlBar(int index) const;
     UrlBar *currentUrlBar() const { return urlBar(-1); }
     WebView *webView(int index) const;
     QList<WebView *> tabs();    // ?
-    
+
     // inlines
     TabBar *tabBar() const { return m_tabBar; }
     StackedUrlBar *urlBarStack() const { return m_urlBars; }
     WebView *currentWebView() const { return webView(currentIndex()); }
     int webViewIndex(WebView *webView) const { return indexOf(webView); }
     KAction *recentlyClosedTabsAction() const { return m_recentlyClosedTabsAction; }
-    
+
     /**
      * show and hide TabBar if user doesn't choose
      * "Always Show TabBar" option
@@ -111,7 +111,6 @@ public slots:
      * @return a pointer to the new WebView
      */
     WebView *newWebView(bool makeCurrent = true);
-    void loadUrlInCurrentTab(const KUrl &url);
     void slotCloneTab(int index = -1);
     void slotCloseTab(int index = -1);
     void slotCloseOtherTabs(int index);
@@ -119,6 +118,7 @@ public slots:
     void slotReloadAllTabs();
     void nextTab();
     void previousTab();
+    void openUrl(const KUrl& url, Rekonq::OpenType type=Rekonq::Current);
 
     // WEB slot actions
     void slotWebReload();
@@ -132,6 +132,7 @@ public slots:
     void slotWebPaste();
 
 private slots:
+    KDE_DEPRECATED void loadUrlInCurrentTab(const KUrl &url);
     void slotCurrentChanged(int index);
     void aboutToShowRecentTabsMenu();
     void aboutToShowRecentTriggeredAction(QAction *action); // need QAction!
@@ -146,7 +147,7 @@ private slots:
     void windowCloseRequested();
 
     /**
-     * This functions move tab informations "from index to index" 
+     * This functions move tab informations "from index to index"
      *
      * @param fromIndex the index from which we move
      *
@@ -157,12 +158,12 @@ private slots:
 private:
 
     /**
-     * This function creates (if not exists) and returns a QLabel 
+     * This function creates (if not exists) and returns a QLabel
      * with a loading QMovie.
-     * Imported from Arora's code. 
+     * Imported from Arora's code.
      *
      * @param index the tab index where inserting the animated label
-     * @param addMovie creates or not a loading movie 
+     * @param addMovie creates or not a loading movie
      *
      * @return animated label's pointer
      */