From 76d86dde4d9e5801ccbdce66f8ccaa86ccbd77d0 Mon Sep 17 00:00:00 2001
From: Domrachev Alexandr <alexandr.domrachev@gmail.com>
Date: Fri, 19 Jun 2009 01:18:23 +0400
Subject: Application::icon() changed to static

---
 src/application.cpp | 2 +-
 src/application.h   | 2 +-
 src/history.cpp     | 2 +-
 src/mainview.cpp    | 4 ++--
 src/mainwindow.cpp  | 2 +-
 src/urlbar.cpp      | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 94821653..6f479d62 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -184,7 +184,7 @@ BookmarkProvider *Application::bookmarkProvider()
 }
 
 
-KIcon Application::icon(const KUrl &url) const
+KIcon Application::icon(const KUrl &url)
 {
     KIcon icon = KIcon(QWebSettings::iconForUrl(url));
     if (icon.isNull())
diff --git a/src/application.h b/src/application.h
index a5658703..7f3e6f3b 100644
--- a/src/application.h
+++ b/src/application.h
@@ -77,7 +77,7 @@ public:
     MainWindow *mainWindow();
     WebView *newWebView(Rekonq::OpenType type = Rekonq::Default);
 
-    KIcon icon(const KUrl &url) const;
+    static KIcon icon(const KUrl &url);
 
     static KUrl guessUrlFromString(const QString &url);
 
diff --git a/src/history.cpp b/src/history.cpp
index dcfe4c21..9ed479a2 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -500,7 +500,7 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
     case Qt::DecorationRole:
         if (index.column() == 0)
         {
-            return Application::instance()->icon(item.url);
+            return Application::icon(item.url);
         }
     }
     return QVariant();
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 8862ee47..d15444ab 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -593,7 +593,7 @@ void MainView::webViewIconChanged()
     int index = webViewIndex(webView);
     if (-1 != index)
     {
-        QIcon icon = Application::instance()->icon(webView->url());
+        QIcon icon = Application::icon(webView->url());
         QLabel *label = animatedLoading(index, false);
         QMovie *movie = label->movie();
         delete movie;
@@ -643,7 +643,7 @@ void MainView::aboutToShowRecentTabsMenu()
     {
         KAction *action = new KAction(m_recentlyClosedTabsMenu);
         action->setData(m_recentlyClosedTabs.at(i));
-        QIcon icon = Application::instance()->icon(m_recentlyClosedTabs.at(i));
+        QIcon icon = Application::icon(m_recentlyClosedTabs.at(i));
         action->setIcon(icon);
         action->setText(m_recentlyClosedTabs.at(i).prettyUrl());
         m_recentlyClosedTabsMenu->addAction(action);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index aed1ef9c..b60e3469 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -766,7 +766,7 @@ void MainWindow::slotAboutToShowBackMenu()
         QWebHistoryItem item = history->backItems(history->count()).at(i);
         KAction *action = new KAction(this);
         action->setData(-1*(historyCount - i - 1));
-        QIcon icon = Application::instance()->icon(item.url());
+        QIcon icon = Application::icon(item.url());
         action->setIcon(icon);
         action->setText(item.title());
         m_historyBackMenu->addAction(action);
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 0204d321..d107ba1a 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -137,11 +137,11 @@ void UrlBar::slotUpdateUrl()
 {
     if (count())
     {
-        changeUrl(0, Application::instance()->icon(m_currentUrl), m_currentUrl);
+        changeUrl(0, Application::icon(m_currentUrl), m_currentUrl);
     }
     else
     {
-        insertUrl(0, Application::instance()->icon(m_currentUrl), m_currentUrl);
+        insertUrl(0, Application::icon(m_currentUrl), m_currentUrl);
     }
 
     setCurrentIndex(0);
-- 
cgit v1.2.1