From b9f8ccd9099fa48406203ad5c5389266b3318d88 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Dec 2008 00:27:23 +0100
Subject: QUrl --> KUrl!

---
 src/browserapplication.cpp | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'src/browserapplication.cpp')

diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp
index 3099dfc2..a79f28b2 100644
--- a/src/browserapplication.cpp
+++ b/src/browserapplication.cpp
@@ -19,6 +19,7 @@
  * ============================================================ */
 
 
+// Local Includes
 #include "browserapplication.h"
 
 #include "browsermainwindow.h"
@@ -29,9 +30,12 @@
 #include "tabwidget.h"
 #include "webview.h"
 
+// KDE Includes
 #include <KCmdLineArgs>
 #include <KAboutData>
+#include <KConfig>
 
+// Qt Includes
 #include <QBuffer>
 #include <QDir>
 #include <QLibraryInfo>
@@ -259,18 +263,23 @@ void BrowserApplication::restoreLastSession()
     buffer.open(QIODevice::ReadOnly);
     int windowCount;
     stream >> windowCount;
-    for (int i = 0; i < windowCount; ++i) {
+    for (int i = 0; i < windowCount; ++i) 
+    {
         QByteArray windowState;
         stream >> windowState;
         windows.append(windowState);
     }
-    for (int i = 0; i < windows.count(); ++i) {
+    for (int i = 0; i < windows.count(); ++i) 
+    {
         BrowserMainWindow *newWindow = 0;
         if (m_mainWindows.count() == 1
             && mainWindow()->tabWidget()->count() == 1
-            && mainWindow()->currentTab()->url() == QUrl()) {
+            && mainWindow()->currentTab()->url() == QUrl()) 
+        {
             newWindow = mainWindow();
-        } else {
+        } 
+        else 
+        {
             newWindow = newMainWindow();
         }
         newWindow->restoreState(windows.at(i));
@@ -295,9 +304,9 @@ void BrowserApplication::installTranslator(const QString &name)
 
 
 
-void BrowserApplication::openUrl(const QUrl &url)
+void BrowserApplication::openUrl(const KUrl &url)
 {
-    mainWindow()->loadPage(url.toString());
+    mainWindow()->loadPage( url.url() );
 }
 
 
@@ -311,8 +320,6 @@ BrowserMainWindow *BrowserApplication::newMainWindow()
 }
 
 
-
-
 BrowserMainWindow *BrowserApplication::mainWindow()
 {
     clean();
@@ -322,8 +329,6 @@ BrowserMainWindow *BrowserApplication::mainWindow()
 }
 
 
-
-
 void BrowserApplication::newLocalSocketConnection()
 {
     QLocalSocket *socket = m_localServer->nextPendingConnection();
@@ -392,7 +397,7 @@ HistoryManager *BrowserApplication::historyManager()
 
 
 
-KIcon BrowserApplication::icon(const QUrl &url) const
+KIcon BrowserApplication::icon(const KUrl &url) const
 {
     KIcon icon = KIcon( QWebSettings::iconForUrl(url) );
     if (!icon.isNull())
-- 
cgit v1.2.1