[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/runners/webshortcuts
From:       Laurent Montel <montel () kde ! org>
Date:       2007-07-31 22:04:26
Message-ID: 1185919466.357320.9756.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 694845 by mlaurent:

Add ref
create interface on stack


 M  +3 -4      webshortcutrunner.cpp  
 M  +1 -5      webshortcutrunner.h  


--- trunk/playground/base/plasma/runners/webshortcuts/webshortcutrunner.cpp #694844:694845
@@ -43,8 +43,6 @@
     // query ktrader for all available searchproviders and preload the default icon
     m_offers = KServiceTypeTrader::self()->query("SearchProvider");
     m_icon = QIcon(KIconLoader::global()->loadIcon("konqueror", K3Icon::Small));
-    // and a connection to the faviconmanager
-    m_favicons = new QDBusInterface("org.kde.kded", "/modules/favicons", "org.kde.FavIcon");
 }
 
 WebshortcutRunner::~WebshortcutRunner() {}
@@ -92,9 +90,10 @@
     return KUrl();
 }
 
-QIcon WebshortcutRunner::getFavicon(const KUrl url) {
+QIcon WebshortcutRunner::getFavicon(const KUrl &url) {
     // query the favicons module
-    QDBusReply<QString> reply = m_favicons->call("iconForUrl", url.url());
+    QDBusInterface favicon("org.kde.kded", "/modules/favicons", "org.kde.FavIcon");
+    QDBusReply<QString> reply = favicon.call("iconForUrl", url.url());
 
     if(!reply.isValid())
         return QIcon();
--- trunk/playground/base/plasma/runners/webshortcuts/webshortcutrunner.h #694844:694845
@@ -24,8 +24,6 @@
 #include <KGenericFactory>
 
 class QAction;
-//class QIcon;
-class QDBusInterface;
 
 class WebshortcutRunner : public Plasma::AbstractRunner {
     Q_OBJECT
@@ -40,14 +38,12 @@
 
     private:
         KUrl getSearchQuery(const QString &query, const QString &searchWord);
-        QIcon getFavicon(const KUrl url);
+        QIcon getFavicon(const KUrl& url);
 
     private:
         KService::List m_offers;
         KUrl m_url;
         QIcon m_icon;
-        QDBusInterface *m_favicons;
-
 };
 
 K_EXPORT_KRUNNER_RUNNER( webshortcuts, WebshortcutRunner )
[prev in list] [next in list] [prev in thread] [next in thread]