[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/knewsticker
From: Frerich Raabe <raabe () kde ! org>
Date: 2007-10-31 23:54:46
Message-ID: 1193874886.760379.15378.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 731545 by raabe:
- Let's just give the NewsfeedManager a list of URLs we subscribed to
M +2 -3 knewsticker.cpp
M +3 -5 newsfeedmanager.cpp
M +3 -2 newsfeedmanager.h
--- trunk/KDE/kdenetwork/knewsticker/knewsticker.cpp #731544:731545
@@ -135,9 +135,7 @@
connect( NewsFeedManager::self(), SIGNAL( updateFinished() ),
this, SLOT( feedUpdateFinished() ) );
- foreach ( const QString &url, Settings::feedUrls() ) {
- NewsFeedManager::self()->subscribeTo( url );
- }
+ NewsFeedManager::self()->setSubscriptions( Settings::feedUrls() );
m_scrollTimer = new QTimer( this );
connect( m_scrollTimer, SIGNAL( timeout() ),
@@ -178,6 +176,7 @@
Settings::setFeedUrls( feedSettingsWidget->feedUrls() );
if ( Settings::feedUrls() != origFeedUrls ) {
+ NewsFeedManager::self()->setSubscriptions( Settings::feedUrls() );
updateFeeds();
}
--- trunk/KDE/kdenetwork/knewsticker/newsfeedmanager.cpp #731544:731545
@@ -28,17 +28,15 @@
{
}
-void NewsFeedManager::subscribeTo( const QUrl &url )
+void NewsFeedManager::setSubscriptions( const QStringList &urls )
{
- if ( !m_subscriptions.contains( url ) ) {
- m_subscriptions.append( url );
- }
+ m_subscriptions = urls;
}
void NewsFeedManager::update()
{
m_availableFeeds.clear();
- foreach ( const QUrl &url, m_subscriptions ) {
+ foreach ( const QString &url, m_subscriptions ) {
updateFeed( url );
}
}
--- trunk/KDE/kdenetwork/knewsticker/newsfeedmanager.h #731544:731545
@@ -14,6 +14,7 @@
#include <QMap>
#include <QObject>
#include <QUrl>
+#include <QStringList>
#include <syndication/loader.h>
@@ -23,7 +24,7 @@
public:
static NewsFeedManager *self();
- void subscribeTo( const QUrl &url );
+ void setSubscriptions( const QStringList &urls );
const QMap<QUrl, Syndication::FeedPtr> &availableFeeds() const;
@@ -46,7 +47,7 @@
static NewsFeedManager *s_instance;
- QList<QUrl> m_subscriptions;
+ QStringList m_subscriptions;
QMap<Syndication::Loader *, QUrl> m_activeLoaders;
QMap<QUrl, Syndication::FeedPtr> m_availableFeeds;
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic