From f2fc94f76377e5ccfec9469862f02d5461798c6e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 20 Feb 2009 19:42:57 +0100
Subject: removed unuseful m_defaultIcon

---
 src/application.cpp | 31 +++++--------------------------
 src/application.h   |  1 -
 2 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index cc237823..53825411 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -172,27 +172,6 @@ WebView *Application::newTab()
 }
 
 
-// void Application::newLocalSocketConnection()
-// {
-//     QLocalSocket *socket = m_localServer->nextPendingConnection();
-//     if (!socket)
-//         return;
-//     socket->waitForReadyRead(1000);
-//     QTextStream stream(socket);
-//     QString url;
-//     stream >> url;
-//     if (!url.isEmpty()) 
-//     {
-//         mainWindow()->tabWidget()->newTab();
-//         openUrl(url);
-//     }
-//     delete socket;
-//     mainWindow()->raise();
-//     mainWindow()->activateWindow();
-// }
-
-
-
 CookieJar *Application::cookieJar()
 {
     return (CookieJar*)networkAccessManager()->cookieJar();
@@ -225,10 +204,10 @@ HistoryManager *Application::historyManager()
 KIcon Application::icon(const KUrl &url) const
 {
     KIcon icon = KIcon( QWebSettings::iconForUrl(url) );
-    if (!icon.isNull())
-        return icon;
-    if (m_defaultIcon.isNull())
-        m_defaultIcon = KIcon("kde");
-    return m_defaultIcon;
+    if (icon.isNull())
+    {
+        icon = KIcon("kde");
+    }
+    return icon;
 }
 
diff --git a/src/application.h b/src/application.h
index 73e800e9..0c29b72b 100644
--- a/src/application.h
+++ b/src/application.h
@@ -84,7 +84,6 @@ private:
     static NetworkAccessManager *s_networkAccessManager;
 
     MainWindow* m_mainWindow;
-    mutable KIcon m_defaultIcon;
 };
 
 #endif // REKONQ_APPLICATION_H
-- 
cgit v1.2.1