From f6cc2c5c13fbc219a6bc3391994b6cdeca44dd10 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 13 Mar 2012 00:23:00 +0100
Subject: Get sure urlbar(s) are deleted when related webtab is

Heinz, Paul. Please test actual master before backporting this to
0.9 series. Many thanks for your help and for this bug report.
I'm crossing fingers to hear good news from your tests ;)

CCBUG:295301
---
 src/webtab.h | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/webtab.h')

diff --git a/src/webtab.h b/src/webtab.h
index 954db13c..5c04b683 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -58,18 +58,13 @@ public:
     explicit WebTab(QWidget *parent = 0);
     ~WebTab();
 
-    WebView *view() const
-    {
-        return m_webView;
-    }
-    UrlBar *urlBar() const
+    WebView *view();
+    WebPage *page();
+    
+    inline UrlBar *urlBar() const
     {
         return m_urlBar;
     }
-    WebPage *page() const
-    {
-        return view()->page();
-    }
 
     inline int progress() const
     {
@@ -105,15 +100,17 @@ private Q_SLOTS:
 
     void showMessageBar();
 
+private:
+    KUrl extractOpensearchUrl(QWebElement e);
+
 Q_SIGNALS:
     void loadProgressing();
     void titleChanged(const QString &);
 
 private:
-    KUrl extractOpensearchUrl(QWebElement e);
+    WebView *m_webView;
 
-    WebView *const m_webView;
-    UrlBar *const m_urlBar;
+    UrlBar *m_urlBar;
 
     int m_progress;
 
-- 
cgit v1.2.1