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

List:       kde-commits
Subject:    [kdepim/akregator_port] akregator2/src: Remove code using "feed auto-discovery"
From:       Frank Osterfeld <osterfeld () kde ! org>
Date:       2013-03-02 11:35:01
Message-ID: 20130302113501.BA10CA604F () git ! kde ! org
[Download RAW message or body]

Git commit e9f84b9a02cce15da0f54afeb3e6fccf16888ced by Frank Osterfeld.
Committed on 02/03/2013 at 12:34.
Pushed by osterfeld into branch 'akregator_port'.

Remove code using "feed auto-discovery"
(Trying to find feeds from web page URLs). That feature is gone for now.

M  +0    -49   akregator2/src/addfeeddialog.cpp
M  +0    -7    akregator2/src/addfeeddialog.h

http://commits.kde.org/kdepim/e9f84b9a02cce15da0f54afeb3e6fccf16888ced

diff --git a/akregator2/src/addfeeddialog.cpp b/akregator2/src/addfeeddialog.cpp
index 98238eb..e21f1c8 100644
--- a/akregator2/src/addfeeddialog.cpp
+++ b/akregator2/src/addfeeddialog.cpp
@@ -89,55 +89,6 @@ void AddFeedDialog::textChanged(const QString& text)
     enableButtonOk(!text.isEmpty());
 }
 
-#ifdef KRSS_PORT_DISABLED
-
-void AddFeedDialog::accept()
-{
-    enableButtonOk(false);
-    feedUrl = widget->urlEdit->text().trimmed();
-
-    delete m_feed;
-    m_feed = new Feed( Kernel::self()->storage() );
-
-    // HACK: make weird wordpress links ("feed:http://foobar/rss") work
-    if (feedUrl.startsWith(QLatin1String("feed:")))
-        feedUrl = feedUrl.right( feedUrl.length() - 5 );
-
-    if (feedUrl.indexOf(":/") == -1)
-        feedUrl.prepend("http://");
-    m_feed->setXmlUrl(feedUrl);
-
-    widget->statusLabel->setText( i18n("Downloading %1", feedUrl) );
-
-    connect( m_feed, SIGNAL(fetched(Akregator2::Feed*)),
-             this, SLOT(fetchCompleted(Akregator2::Feed*)) );
-    connect( m_feed, SIGNAL(fetchError(Akregator2::Feed*)),
-             this, SLOT(fetchError(Akregator2::Feed*)) );
-    connect( m_feed, SIGNAL(fetchDiscovery(Akregator2::Feed*)),
-             this, SLOT(fetchDiscovery(Akregator2::Feed*)) );
-
-    m_feed->fetch(true);
-}
-
-void AddFeedDialog::fetchCompleted(Feed * /*f*/)
-{
-    KDialog::accept();
-}
-
-void AddFeedDialog::fetchError(Feed *)
-{
-    KMessageBox::error(this, i18n("Feed not found from %1.", feedUrl));
-    KDialog::reject();
-}
-
-void AddFeedDialog::fetchDiscovery(Feed *f)
-{
-    widget->statusLabel->setText( i18n("Feed found, downloading...") );
-    feedUrl=f->xmlUrl();
-}
-
-#endif // KRSS_PORT_DISABLED
-
 } // namespace Akregator2
 
 #include "addfeeddialog.moc"
diff --git a/akregator2/src/addfeeddialog.h b/akregator2/src/addfeeddialog.h
index e391028..b11d415 100644
--- a/akregator2/src/addfeeddialog.h
+++ b/akregator2/src/addfeeddialog.h
@@ -54,13 +54,6 @@ class AddFeedDialog : public KDialog
         void setUrl( const QString& url );
         QString url() const;
 
-#ifdef KRSS_PORT_DISABLED
-    public slots:
-        void fetchCompleted(Akregator2::Feed *);
-        void fetchDiscovery(Akregator2::Feed *);
-        void fetchError(Akregator2::Feed *);
-#endif // KRSS_PORT_DISABLED
-
     private slots:
         void textChanged(const QString&);
 
[prev in list] [next in list] [prev in thread] [next in thread]