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

List:       kde-commits
Subject:    [kdepimlibs/akregator_port] krss: re-add registerAttributes() (was in ResourceManager before).
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2012-03-31 15:16:24
Message-ID: 20120331151624.42721A611B () git ! kde ! org
[Download RAW message or body]

Git commit 62c6cc4a0ce678bf548403544d157736e8253444 by Christophe Giboudeau=
x, on behalf of Frank Osterfeld.
Committed on 24/09/2011 at 20:12.
Pushed by osterfeld into branch 'akregator_port'.

re-add registerAttributes() (was in ResourceManager before).
Always use displayName()
(cherry picked from commit 19578efc20eea1f795ef19e95ee8a057ef8b4899)

Conflicts:

	akregator/src/migratefeedscommand.cpp

M  +6    -1    krss/feedcollection.cpp
M  +2    -0    krss/feedcollection.h

http://commits.kde.org/kdepimlibs/62c6cc4a0ce678bf548403544d157736e8253444

diff --git a/krss/feedcollection.cpp b/krss/feedcollection.cpp
index 6dcd89e..b2a3310 100644
--- a/krss/feedcollection.cpp
+++ b/krss/feedcollection.cpp
@@ -19,6 +19,7 @@
 #include "feedpropertiescollectionattribute.h"
 #include <Akonadi/EntityDisplayAttribute>
 #include <akonadi/cachepolicy.h>
+#include <Akonadi/AttributeFactory>
 =

 using namespace Akonadi;
 using namespace KRss;
@@ -28,6 +29,10 @@ FeedCollection::FeedCollection()
 {
 }
 =

+void FeedCollection::registerAttributes() {
+    Akonadi::AttributeFactory::registerAttribute<KRss::FeedPropertiesColle=
ctionAttribute>();
+}
+
 FeedCollection::FeedCollection( const Akonadi::Collection &collection )
     : Collection( collection )
 {
@@ -64,7 +69,7 @@ QString FeedCollection::title() const {
     if ( attr )
         return attr->displayName();
     else
-        return name();
+        return QString();
 }
 =

 void FeedCollection::setTitle( const QString& t ) {
diff --git a/krss/feedcollection.h b/krss/feedcollection.h
index 0900f3e..7cea12e 100644
--- a/krss/feedcollection.h
+++ b/krss/feedcollection.h
@@ -27,6 +27,8 @@ namespace KRss {
 class KRSS_EXPORT FeedCollection : public Akonadi::Collection
 {
 public:
+
+    static void registerAttributes();
     FeedCollection();
     FeedCollection( const Akonadi::Collection &collection );
 =


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