[nemo-qml-plugin-calendar] Remove friends

sailfishos · Mar 28, 2014 · 38f7ab9 · 38f7ab9
1 parent 69ccf52
commit 38f7ab9
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 19 deletions.
diff --git a/src/calendaragendamodel.cpp b/src/calendaragendamodel.cpp
@@ -128,7 +128,7 @@ void NemoCalendarAgendaModel::doRefresh(mKCal::ExtendedCalendar::ExpandedInciden
 {
     // Filter out excluded notebooks
     for (int ii = 0; ii < newEvents.count(); ++ii) {
-        if (!NemoCalendarEventCache::instance()->mNotebooks.contains(NemoCalendarDb::calendar()->notebook(newEvents.at(ii).second))) {
+        if (!NemoCalendarEventCache::instance()->notebooks().contains(NemoCalendarDb::calendar()->notebook(newEvents.at(ii).second))) {
             newEvents.remove(ii);
             --ii;
         }

diff --git a/src/calendaragendamodel.h b/src/calendaragendamodel.h
@@ -67,6 +67,8 @@ class NemoCalendarAgendaModel : public QAbstractListModel, public QQmlParserStat
 
     int count() const;
 
+    void doRefresh(mKCal::ExtendedCalendar::ExpandedIncidenceList, bool reset = false);
+
     int rowCount(const QModelIndex &index) const;
     QVariant data(const QModelIndex &index, int role) const;
 
@@ -84,9 +86,6 @@ private slots:
     void refresh();
 
 private:
-    friend class NemoCalendarEventCache;
-    void doRefresh(mKCal::ExtendedCalendar::ExpandedIncidenceList, bool reset = false);
-
     QDate mStartDate;
     QDate mEndDate;
     QList<NemoCalendarEventOccurrence *> mEvents;

diff --git a/src/calendarapi.cpp b/src/calendarapi.cpp
@@ -80,7 +80,7 @@ QStringList NemoCalendarApi::excludedNotebooks() const
     QStringList rv;
 
     for (int ii = 0; ii < notebooks.count(); ++ii) {
-        if (!NemoCalendarEventCache::instance()->mNotebooks.contains(notebooks.at(ii)->uid()))
+        if (!NemoCalendarEventCache::instance()->notebooks().contains(notebooks.at(ii)->uid()))
             rv.append(notebooks.at(ii)->uid());
     }
 

diff --git a/src/calendarevent.cpp b/src/calendarevent.cpp
@@ -44,18 +44,18 @@
 NemoCalendarEvent::NemoCalendarEvent(QObject *parent)
 : QObject(parent), mNewEvent(true), mEvent(KCalCore::Event::Ptr(new KCalCore::Event))
 {
-    NemoCalendarEventCache::instance()->mEvents.insert(this);
+    NemoCalendarEventCache::instance()->addEvent(this);
 }
 
 NemoCalendarEvent::NemoCalendarEvent(const KCalCore::Event::Ptr &event, QObject *parent)
 : QObject(parent), mNewEvent(false), mEvent(event)
 {
-    NemoCalendarEventCache::instance()->mEvents.insert(this);
+    NemoCalendarEventCache::instance()->addEvent(this);
 }
 
 NemoCalendarEvent::~NemoCalendarEvent()
 {
-    NemoCalendarEventCache::instance()->mEvents.remove(this);
+    NemoCalendarEventCache::instance()->removeEvent(this);
 }
 
 QString NemoCalendarEvent::displayLabel() const
@@ -550,12 +550,12 @@ NemoCalendarEventOccurrence::NemoCalendarEventOccurrence(const mKCal::ExtendedCa
                                                          QObject *parent)
 : QObject(parent), mOccurrence(o), mEvent(0)
 {
-    NemoCalendarEventCache::instance()->mEventOccurrences.insert(this);
+    NemoCalendarEventCache::instance()->addEventOccurrence(this);
 }
 
 NemoCalendarEventOccurrence::~NemoCalendarEventOccurrence()
 {
-    NemoCalendarEventCache::instance()->mEventOccurrences.remove(this);
+    NemoCalendarEventCache::instance()->removeEventOccurrence(this);
 }
 
 QDateTime NemoCalendarEventOccurrence::startTime() const

diff --git a/src/calendarevent.h b/src/calendarevent.h
@@ -156,8 +156,6 @@ class NemoCalendarEvent : public QObject
     void locationChanged();
 
 private:
-    friend class NemoCalendarEventCache;
-
     bool mNewEvent:1;
     KCalCore::Event::Ptr mEvent;
 };

diff --git a/src/calendareventcache.cpp b/src/calendareventcache.cpp
@@ -153,6 +153,31 @@ void NemoCalendarEventCache::storageFinished(mKCal::ExtendedStorage *storage, bo
     Q_UNUSED(info)
 }
 
+void NemoCalendarEventCache::addEvent(NemoCalendarEvent *event)
+{
+    mEvents.insert(event);
+}
+
+void NemoCalendarEventCache::removeEvent(NemoCalendarEvent *event)
+{
+    mEvents.remove(event);
+}
+
+void NemoCalendarEventCache::addEventOccurrence(NemoCalendarEventOccurrence *eventOccurrence)
+{
+    mEventOccurrences.insert(eventOccurrence);
+}
+
+void NemoCalendarEventCache::removeEventOccurrence(NemoCalendarEventOccurrence *eventOccurrence)
+{
+    mEventOccurrences.remove(eventOccurrence);
+}
+
+QSet<QString> NemoCalendarEventCache::notebooks() const
+{
+    return mNotebooks;
+}
+
 QString NemoCalendarEventCache::notebookColor(const QString &notebook) const
 {
     return mNotebookColors.value(notebook, "black");

diff --git a/src/calendareventcache.h b/src/calendareventcache.h
@@ -59,25 +59,29 @@ class NemoCalendarEventCache : public QObject, public mKCal::ExtendedStorageObse
     void storageProgress(mKCal::ExtendedStorage *storage, const QString &info);
     void storageFinished(mKCal::ExtendedStorage *storage, bool error, const QString &info);
 
+    void addEvent(NemoCalendarEvent* event);
+    void removeEvent(NemoCalendarEvent* event);
+
+    void addEventOccurrence(NemoCalendarEventOccurrence* eventOccurrence);
+    void removeEventOccurrence(NemoCalendarEventOccurrence* eventOccurrence);
+
+    QSet<QString> notebooks() const;
+
     QString notebookColor(const QString &) const;
     void setNotebookColor(const QString &, const QString &);
 
     static QList<NemoCalendarEvent *> events(const KCalCore::Event::Ptr &event);
 
+    void scheduleAgendaRefresh(NemoCalendarAgendaModel *);
+    void cancelAgendaRefresh(NemoCalendarAgendaModel *);
+
 protected:
     virtual bool event(QEvent *);
 
 signals:
     void modelReset();
 
 private:
-    friend class NemoCalendarApi;
-    friend class NemoCalendarEvent;
-    friend class NemoCalendarAgendaModel;
-    friend class NemoCalendarEventOccurrence;
-
-    void scheduleAgendaRefresh(NemoCalendarAgendaModel *);
-    void cancelAgendaRefresh(NemoCalendarAgendaModel *);
     void doAgendaRefresh();
 
     QStringList mDefaultNotebookColors;