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

List:       kde-commits
Subject:    [plasmoid-eventlist] src: use id instead url for tracking items
From:       Gerd Fleischer <gerdfleischer () web ! de>
Date:       2013-10-06 13:00:24
Message-ID: E1VSnwe-0005SQ-DQ () scm ! kde ! org
[Download RAW message or body]

Git commit 07fd1368591ad8132a11227e119e548a0ec77d8b by Gerd Fleischer.
Committed on 06/10/2013 at 12:55.
Pushed by geflei into branch 'master'.

use id instead url for tracking items

M  +8    -8    src/eventmodel.cpp
M  +1    -1    src/eventmodel.h

http://commits.kde.org/plasmoid-eventlist/07fd1368591ad8132a11227e119e548a0ec77d8b

diff --git a/src/eventmodel.cpp b/src/eventmodel.cpp
index fe19f30..0713e95 100644
--- a/src/eventmodel.cpp
+++ b/src/eventmodel.cpp
@@ -104,7 +104,7 @@ void EventModel::initialItemFetchFinished(KJob *job)
         Akonadi::ItemFetchJob *iJob = qobject_cast<Akonadi::ItemFetchJob *>(job);
         Akonadi::Item::List items = iJob->items();
         foreach (const Akonadi::Item &item, items) {
-            if (itemURLs.contains(item.url())) {
+            if (itemIds.contains(item.id())) {
                 removeItem(item);
             }
 
@@ -112,13 +112,13 @@ void EventModel::initialItemFetchFinished(KJob *job)
                 KCalCore::Event::Ptr event = item.payload <KCalCore::Event::Ptr>();
                 if (event) {
                     addEventItem(eventDetails(item, event));
-                    itemURLs.append(item.url());
+                    itemIds.append(item.id());
                 } // if event
             } else if (item.hasPayload <KCalCore::Todo::Ptr>()) {
                 KCalCore::Todo::Ptr todo = item.payload<KCalCore::Todo::Ptr>();
                 if (todo) {
                     addTodoItem(todoDetails(item, todo));
-                    itemURLs.append(item.url());
+                    itemIds.append(item.id());
                 }
             } // if hasPayload
         } // foreach
@@ -174,7 +174,7 @@ void EventModel::resetModel()
     m_sectionItemsMap.clear();
     m_collections.clear();
     m_usedCollections.clear();
-    itemURLs.clear();
+    itemIds.clear();
     parentItem = invisibleRootItem();
     delete m_monitor;
     m_monitor = 0;
@@ -251,7 +251,7 @@ void EventModel::removeItem(const Akonadi::Item &item)
         if (r != -1 && !i->hasChildren()) {
             takeItem(r);
             removeRow(r);
-            itemURLs.removeAll(item.url());
+            itemIds.removeAll(item.id());
             emit modelNeedsExpanding();
         }
     }
@@ -275,7 +275,7 @@ void EventModel::addItem(const Akonadi::Item &item, const Akonadi::Collection &c
 {
     Q_UNUSED(collection);
     
-    if (itemURLs.contains(item.url())) {
+    if (itemIds.contains(item.id())) {
         removeItem(item);
     }
 
@@ -283,13 +283,13 @@ void EventModel::addItem(const Akonadi::Item &item, const Akonadi::Collection &c
         KCalCore::Event::Ptr event = item.payload <KCalCore::Event::Ptr>();
         if (event) {
             addEventItem(eventDetails(item, event));
-            itemURLs.append(item.url());
+            itemIds.append(item.id());
         } // if event
     } else if (item.hasPayload <KCalCore::Todo::Ptr>()) {
         KCalCore::Todo::Ptr todo = item.payload<KCalCore::Todo::Ptr>();
         if (todo) {
             addTodoItem(todoDetails(item, todo));
-            itemURLs.append(item.url());
+            itemIds.append(item.id());
         }
     }
 }
diff --git a/src/eventmodel.h b/src/eventmodel.h
index c2d7596..533708e 100644
--- a/src/eventmodel.h
+++ b/src/eventmodel.h
@@ -112,7 +112,7 @@ private:
     QColor urgentBg, passedFg, todoBg, finishedTodoBg;
     QHash<QString, QColor> m_categoryColors;
     QHash<Akonadi::Entity::Id, Akonadi::Collection> m_collections;
-    KUrl::List itemURLs;
+    QList<Akonadi::Entity::Id> itemIds;
     Akonadi::Monitor *m_monitor;
     bool useAutoGroupHeader;
 

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