This commit fixes icons handling for "rekonq pages" (eg: about urls).

It also contains a cleaned version of the WebTab::url() method (the previous one was
not working on loading pages. And also immediately after the loadFinished signal)
This should also fix some "bad" handling on back/forward buttons.

Finally, it contains some unrelated QLatin1String --> QL1S changes.

Benjamin, I spoke too early about those.
I squashed merged my work and removed previous branch :(

1 files changed, 4 insertions, 21 deletions

diff --git a/src/webtab.cpp b/src/webtab.cpp
index 2289726c..9ed43d45 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -84,29 +84,12 @@ WebTab::~WebTab()
 }
 
 
-// TODO:
-// Import the "about" check and the one in protocolhandler
-// in some (static?) methods in NewTabPage
 KUrl WebTab::url()
 {
-    KUrl u = KUrl(view()->url());
-    if (u.scheme() == QL1S("about"))
-    {
-        QWebElement rootElement = page()->mainFrame()->documentElement();
-        if (rootElement.document().findAll("#rekonq-newtabpage").count() == 0)
-            return u;
-        if (rootElement.findAll(".favorites").count() > 0)
-            return KUrl("about:favorites");
-        if (rootElement.findAll(".closedTabs").count() > 0)
-            return KUrl("about:closedTabs");
-        if (rootElement.findAll(".history").count() > 0)
-            return KUrl("about:history");
-        if (rootElement.findAll(".bookmarks").count() > 0)
-            return KUrl("about:bookmarks");
-        if (rootElement.findAll(".downloads").count() > 0)
-            return KUrl("about:downloads");
-    }
-    return u;
+    if(page()->isOnRekonqPage())
+        return page()->loadingUrl();
+    
+    return view()->url();
 }