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

List:       kde-commits
Subject:    [kdepim/work/akonadi-ports] /: re-add registerAttributes() (was in
From:       Frank Osterfeld <frank.osterfeld () kdab ! com>
Date:       2011-09-24 18:15:09
Message-ID: 20110924181509.49303A607A () git ! kde ! org
[Download RAW message or body]

Git commit 19578efc20eea1f795ef19e95ee8a057ef8b4899 by Frank Osterfeld.
Committed on 24/09/2011 at 20:12.
Pushed by osterfeld into branch 'work/akonadi-ports'.

re-add registerAttributes() (was in ResourceManager before).
Always use displayName()

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

http://commits.kde.org/kdepim/19578efc20eea1f795ef19e95ee8a057ef8b4899

diff --git a/akregator/src/migratefeedscommand.cpp \
b/akregator/src/migratefeedscommand.cpp index 22b85f9..1d1268f 100644
--- a/akregator/src/migratefeedscommand.cpp
+++ b/akregator/src/migratefeedscommand.cpp
@@ -69,6 +69,8 @@ using namespace Akonadi;
 using namespace Akregator;
 using namespace KRss;
 
+
+
 StartPage::StartPage( const QStringList& resources, QWidget* parent ) : QWizardPage( \
parent ), m_resourceBox( 0 ) {  setTitle( i18n("Akonadi Data Migration" ) );
     QVBoxLayout* layout = new QVBoxLayout( this );
diff --git a/krss/krss/feedcollection.cpp b/krss/krss/feedcollection.cpp
index 6dcd89e..b2a3310 100644
--- a/krss/krss/feedcollection.cpp
+++ b/krss/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::FeedPropertiesCollectionAttribute>();
 +}
+
 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/krss/feedcollection.h b/krss/krss/feedcollection.h
index 0900f3e..7cea12e 100644
--- a/krss/krss/feedcollection.h
+++ b/krss/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]