From 43e3512afd7ef973026528a0444e04a85877eee5 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 8 Nov 2011 23:54:37 +0100
Subject: Remove mainWindow pointer from mainview class.

---
 src/mainview.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/mainview.cpp')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 80457252..15c78f5a 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -59,12 +59,11 @@
 //Hack:
 QString temporaryUglyHackString = "";
 
-MainView::MainView(MainWindow *parent)
+MainView::MainView(QWidget *parent)
     : KTabWidget(parent)
     , m_widgetBar(new StackedUrlBar(this))
     , m_addTabButton(0)
     , m_currentTabIndex(0)
-    , m_parentWindow(parent)
 {
     // setting tabbar
     TabBar *tabBar = new TabBar(this);
@@ -107,9 +106,9 @@ MainView::MainView(MainWindow *parent)
 }
 
 
-void MainView::addNewTabButton()
+void MainView::addNewTabButton(QAction *newTabAction)
 {
-    m_addTabButton->setDefaultAction(m_parentWindow->actionByName("new_tab"));
+    m_addTabButton->setDefaultAction(newTabAction);
 
     m_addTabButton->setAutoRaise(true);
     m_addTabButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
@@ -367,7 +366,8 @@ void MainView::windowCloseRequested()
     {
         if (count() == 1)
         {
-            m_parentWindow->close();
+            MainWindow *w = qobject_cast<MainWindow *>(parent());
+            w->close();
         }
         else
         {
@@ -423,7 +423,8 @@ void MainView::closeTab(int index, bool del)
         if (ReKonfig::lastTabClosesWindow())
         {
             // closing window...
-            m_parentWindow->close();
+            MainWindow *w = qobject_cast<MainWindow *>(parent());
+            w->close();
             return;
         }
 
-- 
cgit v1.2.1