From 50baf7e925d09f6ea0011d6c571c06dd1e2b0c77 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 7 Aug 2013 00:57:09 +0200 Subject: Remove support for "unsupported" Google Reader. Bye bye ;) --- src/urlbar/rsswidget.cpp | 22 ++++++++-------------- src/urlbar/rsswidget.h | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp index aeed6218..0c38fc3d 100644 --- a/src/urlbar/rsswidget.cpp +++ b/src/urlbar/rsswidget.cpp @@ -28,12 +28,6 @@ #include "rsswidget.h" #include "rsswidget.moc" -// Local includes -#include "application.h" -#include "rekonqwindow.h" - -#include "iconmanager.h" - // KDE Includes #include #include @@ -76,7 +70,7 @@ RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent) m_agregators->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); m_agregators->addItem(KIcon("akregator"), QString("Akregator")); - m_agregators->addItem(IconManager::self()->iconForUrl(KUrl("http://google.com/reader")), i18n("Google Reader")); +// m_agregators->addItem(IconManager::self()->iconForUrl(KUrl("http://google.com/reader")), i18n("Google Reader")); layout->addRow(agregator, m_agregators); @@ -123,18 +117,18 @@ void RSSWidget::accept() if (m_agregators->currentIndex() == 0) addWithAkregator(url); - else - addWithGoogleReader(url); +// else +// addWithGoogleReader(url); close(); } -void RSSWidget::addWithGoogleReader(const QString &url) -{ - KUrl toLoad = KUrl("http://www.google.com/ig/add?feedurl=" + url); - rApp->rekonqWindow()->loadUrl(toLoad); -} +// void RSSWidget::addWithGoogleReader(const QString &url) +// { +// KUrl toLoad = KUrl("http://www.google.com/ig/add?feedurl=" + url); +// rApp->rekonqWindow()->loadUrl(toLoad); +// } void RSSWidget::addWithAkregator(const QString &url) diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h index eaa3de7d..95eb4d8e 100644 --- a/src/urlbar/rsswidget.h +++ b/src/urlbar/rsswidget.h @@ -50,7 +50,7 @@ private Q_SLOTS: private: void addWithAkregator(const QString &url); - void addWithGoogleReader(const QString &url); +// void addWithGoogleReader(const QString &url); QMap m_map; -- cgit v1.2.1