[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/pim/krss/resource
From: Dmitry Ivanov <vonami () gmail ! com>
Date: 2008-06-22 20:03:53
Message-ID: 1214165033.551276.18973.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 823205 by divanov:
Coding style fixes
M +47 -50 rssresource.cpp
M +7 -7 rssresource.h
--- trunk/playground/pim/krss/resource/rssresource.cpp #823204:823205
@@ -42,78 +42,77 @@
using namespace Akonadi;
// helper functions
-static inline KFeed::Item convertToKFeedItem(const Syndication::ItemPtr &syndItem)
+static inline KFeed::Item convertToKFeedItem( const Syndication::ItemPtr &syndItem )
{
KFeed::Item kfeedItem;
kfeedItem.setStatus( KFeed::New );
//kfeedItem.setHash() // do i need to calc \
the hash value?
- kfeedItem.setIdIsHash(syndItem->id().startsWith("hash:"));
+ kfeedItem.setIdIsHash( syndItem->id().startsWith("hash:") );
//kfeedItem.setSourceFeedId(currentCollection().remoteId().toInt()); \
// kfeed supports only integer ids
- kfeedItem.setTitle(syndItem->title());
- kfeedItem.setLink(syndItem->link());
- kfeedItem.setDescription(syndItem->description());
- kfeedItem.setContent(syndItem->content());
+ kfeedItem.setTitle( syndItem->title() );
+ kfeedItem.setLink( syndItem->link() );
+ kfeedItem.setDescription( syndItem->description() );
+ kfeedItem.setContent( syndItem->content() );
KDateTime dt;
if ( syndItem->datePublished() > 0 ) {
- dt.setTime_t(syndItem->datePublished());
- kfeedItem.setDatePublished(dt);
+ dt.setTime_t( syndItem->datePublished() );
+ kfeedItem.setDatePublished( dt );
}
else {
- \
kfeedItem.setDatePublished(KDateTime::currentLocalDateTime()); + \
kfeedItem.setDatePublished( KDateTime::currentLocalDateTime() ); }
- dt.setTime_t(syndItem->dateUpdated());
- kfeedItem.setDateUpdated(dt);
- kfeedItem.setId(syndItem->id());
- kfeedItem.setLanguage(syndItem->language());
- kfeedItem.setCommentsCount(syndItem->commentsCount());
- kfeedItem.setCommentsLink(syndItem->commentsLink());
- kfeedItem.setCommentsFeed(syndItem->commentsFeed());
- kfeedItem.setCommentPostUri(syndItem->commentPostUri());
+ dt.setTime_t( syndItem->dateUpdated() );
+ kfeedItem.setDateUpdated( dt );
+ kfeedItem.setId( syndItem->id() );
+ kfeedItem.setLanguage( syndItem->language() );
+ kfeedItem.setCommentsCount( syndItem->commentsCount() );
+ kfeedItem.setCommentsLink( syndItem->commentsLink() );
+ kfeedItem.setCommentsFeed( syndItem->commentsFeed() );
+ kfeedItem.setCommentPostUri( syndItem->commentPostUri() );
// Authors
QList<KFeed::Person> kfeedPersons;
- Q_FOREACH(const Syndication::PersonPtr &pers, syndItem->authors()) {
+ Q_FOREACH( const Syndication::PersonPtr &pers, syndItem->authors() ) \
{ if ( !pers->isNull() ) {
KFeed::Person kfeedPerson;
- kfeedPerson.setName(pers->name());
- kfeedPerson.setUri(pers->uri());
- kfeedPerson.setEmail(pers->email());
+ kfeedPerson.setName( pers->name() );
+ kfeedPerson.setUri( pers->uri() );
+ kfeedPerson.setEmail( pers->email() );
kfeedPersons << kfeedPerson;
}
}
- kfeedItem.setAuthors(kfeedPersons);
+ kfeedItem.setAuthors( kfeedPersons );
// Enclosures
QList<KFeed::Enclosure> kfeedEnclosures;
- Q_FOREACH(const Syndication::EnclosurePtr &encl, \
syndItem->enclosures()) { + Q_FOREACH( const Syndication::EnclosurePtr \
&encl, syndItem->enclosures() ) { if ( !encl->isNull() ) {
KFeed::Enclosure kfeedEnclosure;
- kfeedEnclosure.setUrl(encl->url());
+ kfeedEnclosure.setUrl( encl->url() );
kfeedEnclosure.setTitle(encl->title());
- kfeedEnclosure.setType(encl->type());
- kfeedEnclosure.setLength(encl->length());
- kfeedEnclosure.setDuration(encl->duration());
+ kfeedEnclosure.setType( encl->type() );
+ kfeedEnclosure.setLength( encl->length() );
+ kfeedEnclosure.setDuration( encl->duration() );
kfeedEnclosures << kfeedEnclosure;
}
}
- kfeedItem.setEnclosures(kfeedEnclosures);
+ kfeedItem.setEnclosures( kfeedEnclosures );
// Categories
QList<KFeed::Category> kfeedCategories;
- Q_FOREACH(const Syndication::CategoryPtr &cat, \
syndItem->categories()) { + Q_FOREACH( const Syndication::CategoryPtr \
&cat, syndItem->categories() ) { if ( !cat->isNull() ) {
KFeed::Category kfeedCategory;
- kfeedCategory.setTerm(cat->term());
- kfeedCategory.setScheme(cat->scheme());
- kfeedCategory.setLabel(cat->label());
+ kfeedCategory.setTerm( cat->term() );
+ kfeedCategory.setScheme( cat->scheme() );
+ kfeedCategory.setLabel( cat->label() );
kfeedCategories << kfeedCategory;
}
}
- kfeedItem.setCategories(kfeedCategories);
+ kfeedItem.setCategories( kfeedCategories );
// TODO: custom properties
-
return kfeedItem;
}
@@ -129,8 +128,8 @@
}
// member functions
-RssResource::RssResource(const QString &id)
- :ResourceBase(id), m_fetchTries(0)
+RssResource::RssResource( const QString &id )
+ :ResourceBase( id ), m_fetchTries( 0 )
{
AttributeFactory::registerAttribute<TagsCollectionAttribute>();
AttributeFactory::registerAttribute<SubscriptionLabelsCollectionAttribute>();
@@ -326,10 +325,10 @@
fetchFeedProperties( copy.name() );
}*/
-bool RssResource::retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> \
&parts) +bool RssResource::retrieveItem( const Akonadi::Item &item, const \
QSet<QByteArray> &parts ) {
- Q_UNUSED(item)
- Q_UNUSED(parts)
+ Q_UNUSED( item )
+ Q_UNUSED( parts )
// what should i do?
// no way to retrieve a single item from an RSS feed other than
@@ -338,12 +337,12 @@
return false;
}
-void RssResource::configure(WId windowId)
+void RssResource::configure( WId windowId )
{
// note: this WId trick doesn't work
QString path = KFileDialog::getOpenFileNameWId( KUrl::fromPath( \
QDir::homePath() ),
- "*.opml|" + i18n("OPML Document \
(*.opml)"),
- windowId, i18n("Select an OPML \
Document")); + "*.opml|" + \
i18n( "OPML Document (*.opml)" ), + \
windowId, i18n( "Select an OPML Document" ) );
importOpml( path, QString() );
}
@@ -353,7 +352,7 @@
collectionsRetrieved( m_collections.values() );
}
-void RssResource::retrieveItems(const Akonadi::Collection &col)
+void RssResource::retrieveItems( const Akonadi::Collection &col )
{
kDebug() << "Retrieving items for" << col.name();
@@ -362,7 +361,7 @@
return;
}
- if ( col.contentMimeTypes().contains(Collection::mimeType()) ) {
+ if ( col.contentMimeTypes().contains( Collection::mimeType() ) ) {
kDebug() << "Collection" << col.name() << "is a folder";
return;
}
@@ -373,7 +372,7 @@
else {
kDebug() << "Collection doesn't have \'FeedProperties\' attribute \
set"; Item::List itemList;
- itemsRetrieved(itemList);
+ itemsRetrieved( itemList );
}
}
@@ -643,12 +642,12 @@
void RssResource::loadOpml( const QString &path, const QString &defaultTag )
{
QFile file( path );
- if ( !file.open(QFile::ReadOnly | QFile::Text) ) {
+ if ( !file.open( QFile::ReadOnly | QFile::Text ) ) {
kWarning() << "Couldn't open the OPML document";
return;
}
- m_reader.setDevice(&file);
+ m_reader.setDevice( &file );
while ( !m_reader.atEnd() ) {
m_reader.readNext();
@@ -669,7 +668,7 @@
void RssResource::readUnknownElement()
{
- Q_ASSERT(m_reader.isStartElement());
+ Q_ASSERT( m_reader.isStartElement() );
while ( !m_reader.atEnd() ) {
m_reader.readNext();
@@ -731,8 +730,6 @@
}
}
-
-
void RssResource::readOutline( QStringList &tags )
{
Q_ASSERT( m_reader.isStartElement() && m_reader.name().toString().toLower() \
== "outline" );
--- trunk/playground/pim/krss/resource/rssresource.h #823204:823205
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef AKONADI_RSS_RESOURCE
-#define AKONADI_RSS_RESOURCE
+#ifndef KRSS_RSSRESOURCE
+#define KRSS_RSSRESOURCE
#include <kfeed/item.h>
#include <syndication/syndication.h>
@@ -34,7 +34,7 @@
public:
- RssResource(const QString &id);
+ RssResource( const QString &id );
protected:
@@ -42,7 +42,7 @@
public Q_SLOTS:
- void configure(WId windowId);
+ void configure( WId windowId );
// D-Bus interface
QString addFeed( const QString &xmlUrl, const QString &subscriptionLabel );
@@ -60,8 +60,8 @@
protected Q_SLOTS:
void retrieveCollections();
- void retrieveItems(const Akonadi::Collection &col);
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts);
+ void retrieveItems( const Akonadi::Collection &col );
+ bool retrieveItem( const Akonadi::Item &item, const QSet<QByteArray> &parts \
);
private Q_SLOTS:
@@ -104,4 +104,4 @@
QDBusMessage m_replyMessage;
};
-#endif /* AKONADI_RSS_RESOURCE */
+#endif /* KRSS_RSSRESOURCE */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic