1 files changed, 8 insertions, 26 deletions

diff --git a/src/mainview.h b/src/mainview.h
index 3e6b9efb..ae6019b7 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -45,8 +45,6 @@ class QUrl;
 class QWebFrame;
 class QLabel;
 
-
-class StackedUrlBar;
 class TabBar;
 class UrlBar;
 
@@ -67,14 +65,11 @@ public:
 
 public:
 
-    UrlBar *urlBar(int index) const;
-    UrlBar *currentUrlBar() const;
+    UrlBar *urlBar() const;
     WebView *webView(int index) const;
     QToolButton *addTabButton() const;
 
-    // inlines
     TabBar *tabBar() const;
-    StackedUrlBar *urlBarStack() const;
     WebView *currentWebView() const;
     int webViewIndex(WebView *webView) const;
 
@@ -86,7 +81,8 @@ public:
     void showTabBar();
     void clear();
 
-
+    WebView *newWebView(bool focused = true);
+    
 signals:
     // tab widget signals
     void tabsChanged();
@@ -105,9 +101,8 @@ public slots:
      * Core browser slot. This create a new tab with a WebView inside
      * for browsing.
      *
-     * @return a pointer to the new WebView
      */
-    WebView *newTab(bool focused = true);
+    void newTab();
 
     void slotCloneTab(int index = -1);
     void slotCloseTab(int index = -1);
@@ -120,13 +115,7 @@ public slots:
     // WEB slot actions
     void slotWebReload();
     void slotWebStop();
-    void slotWebBack();
-    void slotWebForward();
-    void slotWebUndo();
-    void slotWebRedo();
-    void slotWebCut();
-    void slotWebCopy();
-    void slotWebPaste();
+
 
 private slots:
     void slotCurrentChanged(int index);
@@ -139,15 +128,6 @@ private slots:
 
     void windowCloseRequested();
 
-    /**
-     * This functions move tab info "from index to index"
-     *
-     * @param fromIndex the index from which we move
-     *
-     * @param toIndex the index to which we move
-     */
-    void moveTab(int fromIndex, int toIndex);
-
     void postLaunch();
 
 protected:
@@ -171,12 +151,14 @@ private:
      */
     QLabel *animatedLoading(int index, bool addMovie);
 
-    StackedUrlBar *m_urlBars;
+    UrlBar *m_urlBar;
     TabBar *m_tabBar;
 
     QString m_loadingGitPath;
 
     QToolButton *m_addTabButton;
+    
+    int m_currentTabIndex;
 };
 
 #endif // MAINVIEW_H