From 060909220bad6842828f2583213dc96c285b5fd9 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Feb 2010 12:37:46 +0100
Subject: change setHtml( string ) to setHtml( string, url ) to let webviews
 return an url on webview->url() calls

---
 src/protocolhandler.cpp       | 4 ++--
 src/rekonqpage/newtabpage.cpp | 2 +-
 src/webpage.h                 | 1 +
 src/webtab.cpp                | 8 ++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index a80f0a46..1a533a6e 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -110,7 +110,7 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     {
         if( _url == KUrl("about:blank") )
         {
-            frame->setHtml( QString() );
+            frame->setHtml( QString() , _url );
             return true;
         }
         
@@ -288,7 +288,7 @@ void ProtocolHandler::showResults(const KFileItemList &list)
     }
     
     QString html = dirHandling(list);
-    _frame->setHtml(html);
+    _frame->setHtml( html, _url );
 
     Application::instance()->mainWindow()->currentTab()->setFocus();
     Application::instance()->mainWindow()->mainView()->urlBar()->setUrl(_url);
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index f7ebcdbf..cc8aa1fb 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -95,7 +95,7 @@ void NewTabPage::generate(KUrl url)
     }
     
     QWebPage *page = m_root.webFrame()->page();
-    page->mainFrame()->setHtml(m_html);
+    page->mainFrame()->setHtml(m_html,m_url);
 
     m_root = page->mainFrame()->documentElement().findFirst("#content");
     
diff --git a/src/webpage.h b/src/webpage.h
index c9c5bb8c..bbaa0f63 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -60,6 +60,7 @@ public slots:
     void manageNetworkErrors(QNetworkReply *reply);
     virtual void downloadRequest(const QNetworkRequest &request);
     void downloadAllContentsWithKGet();
+
 protected:
     WebPage *createWindow(WebWindowType type);
     
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 9dea9a72..4172103b 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -60,7 +60,7 @@
 #include <QVBoxLayout>
 
 
-WebTab::WebTab(QWidget* parent)
+WebTab::WebTab(QWidget *parent)
     : QWidget(parent)
     , m_view( new WebView(this) )
     , m_progress(0)
@@ -68,15 +68,15 @@ WebTab::WebTab(QWidget* parent)
     // fix focus handling
     setFocusProxy( m_view );
     
-    QVBoxLayout* l = new QVBoxLayout(this);
+    QVBoxLayout *l = new QVBoxLayout(this);
     l->setMargin(0);
     l->setSpacing(0);
 
-    QWidget* messageBar = new QWidget(this);
+    QWidget *messageBar = new QWidget(this);
     l->addWidget(messageBar);
     messageBar->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum);
 
-    QVBoxLayout* l2 = new QVBoxLayout(messageBar);
+    QVBoxLayout *l2 = new QVBoxLayout(messageBar);
     l2->setMargin(0);
     l2->setSpacing(0);
 
-- 
cgit v1.2.1