Cosmetics and remove unused signals

sailfishos · May 17, 2019 · 114cd30 · 114cd30
1 parent d4ad760
commit 114cd30
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git a/src/calendareventquery.cpp b/src/calendareventquery.cpp
@@ -129,7 +129,7 @@ QObject *NemoCalendarEventQuery::event() const
     if (mEvent.isValid() && mEvent.uniqueId == mUid)
         return NemoCalendarManager::instance()->eventObject(mUid, mRecurrenceId);
     else
-        return 0;
+        return nullptr;
 }
 
 QObject *NemoCalendarEventQuery::occurrence() const

diff --git a/src/calendareventquery.h b/src/calendareventquery.h
@@ -55,10 +55,10 @@ class Person : public QObject
 public:
     // mapping to KCalcore::Attendee::Role
     enum AttendeeRole {
-      RequiredParticipant,
-      OptionalParticipant,
-      NonParticipant,
-      ChairParticipant
+        RequiredParticipant,
+        OptionalParticipant,
+        NonParticipant,
+        ChairParticipant
     };
 
     Person(const QString &aName, const QString &aEmail, bool aIsOrganizer, bool aParticipationRole)

diff --git a/src/calendarimportevent.h b/src/calendarimportevent.h
@@ -57,9 +57,8 @@ class CalendarImportEvent : public QObject
     Q_PROPERTY(QString organizer READ organizer CONSTANT)
     Q_PROPERTY(QString organizerEmail READ organizerEmail CONSTANT)
     Q_PROPERTY(NemoCalendarEvent::Secrecy secrecy READ secrecy CONSTANT)
-
-    Q_PROPERTY(NemoCalendarEvent::Response ownerStatus READ ownerStatus NOTIFY ownerStatusChanged)
-    Q_PROPERTY(bool rsvp READ rsvp NOTIFY rsvpChanged)
+    Q_PROPERTY(NemoCalendarEvent::Response ownerStatus READ ownerStatus CONSTANT)
+    Q_PROPERTY(bool rsvp READ rsvp CONSTANT)
 
 public:
     CalendarImportEvent(KCalCore::Event::Ptr event);
@@ -91,9 +90,6 @@ public slots:
 
 signals:
     void colorChanged();
-    void ownerStatusChanged();
-    void attendeeListChanged();
-    void rsvpChanged();
 
 private:
     KCalCore::Event::Ptr mEvent;

diff --git a/src/calendarmanager.cpp b/src/calendarmanager.cpp
@@ -45,8 +45,8 @@
 // kCalCore
 #include <calformat.h>
 
-NemoCalendarManager::NemoCalendarManager() :
-    QObject(0), mLoadPending(false), mResetPending(false)
+NemoCalendarManager::NemoCalendarManager()
+    : mLoadPending(false), mResetPending(false)
 {
     qRegisterMetaType<KDateTime>("KDateTime");
     qRegisterMetaType<QList<KDateTime> >("QList<KDateTime>");
@@ -123,7 +123,7 @@ QString NemoCalendarManager::defaultNotebook() const
         if (notebook.isDefault)
             return notebook.uid;
     }
-    return "";
+    return QString();
 }
 
 void NemoCalendarManager::setDefaultNotebook(const QString &notebookUid)
@@ -152,7 +152,7 @@ NemoCalendarEvent* NemoCalendarManager::eventObject(const QString &eventUid, con
     // TODO: maybe attempt to read event from DB? This situation should not happen.
     qWarning() << Q_FUNC_INFO << "No event with uid" << eventUid << recurrenceId.toString() << ", returning empty event";
 
-    return new NemoCalendarEvent(this, "", KDateTime());
+    return new NemoCalendarEvent(this, QString(), KDateTime());
 }
 
 void NemoCalendarManager::saveModification(NemoCalendarData::Event eventData)
@@ -167,12 +167,12 @@ NemoCalendarManager::replaceOccurrence(NemoCalendarData::Event eventData, NemoCa
 {
     if (!occurrence) {
         qWarning() << Q_FUNC_INFO << "no occurrence given";
-        return 0;
+        return nullptr;
     }
 
     if (eventData.uniqueId.isEmpty()) {
         qWarning("NemocalendarManager::replaceOccurrence() - empty uid given");
-        return 0;
+        return nullptr;
     }
 
     // save request information for signal handling
@@ -222,7 +222,7 @@ QString NemoCalendarManager::getNotebookColor(const QString &notebookUid) const
     if (mNotebooks.contains(notebookUid))
         return mNotebooks.value(notebookUid, NemoCalendarData::Notebook()).color;
     else
-        return "";
+        return QString();
 }
 
 void NemoCalendarManager::cancelAgendaRefresh(NemoCalendarAgendaModel *model)
@@ -528,7 +528,7 @@ void NemoCalendarManager::save()
 QString NemoCalendarManager::convertEventToVCalendarSync(const QString &uid, const QString &prodId)
 {
     QString vEvent;
-    QMetaObject::invokeMethod(mCalendarWorker, "convertEventToVCalendar",Qt::BlockingQueuedConnection,
+    QMetaObject::invokeMethod(mCalendarWorker, "convertEventToVCalendar", Qt::BlockingQueuedConnection,
                               Q_RETURN_ARG(QString, vEvent),
                               Q_ARG(QString, uid),
                               Q_ARG(QString, prodId));

diff --git a/src/calendarworker.cpp b/src/calendarworker.cpp
@@ -56,8 +56,8 @@
 #include <Accounts/Provider>
 #include <Accounts/Account>
 
-NemoCalendarWorker::NemoCalendarWorker() :
-    QObject(0), mAccountManager(0)
+NemoCalendarWorker::NemoCalendarWorker()
+    : QObject(0), mAccountManager(0)
 {
 }
 
@@ -173,7 +173,7 @@ QString NemoCalendarWorker::convertEventToVCalendar(const QString &uid, const QS
     KCalCore::Event::Ptr event = mCalendar->event(uid);
     if (event.isNull()) {
         qWarning() << "No event with uid " << uid << ", unable to create VCalendar";
-        return "";
+        return QString();
     }
 
     NemoCalendarVCalFormat fmt;

diff --git a/src/calendarworker.h b/src/calendarworker.h
@@ -77,7 +77,7 @@ public slots:
     void setDefaultNotebook(const QString &notebookUid);
 
     void loadData(const QList<NemoCalendarData::Range> &ranges,
-                    const QStringList &uidList, bool reset);
+                  const QStringList &uidList, bool reset);
 
     NemoCalendarData::EventOccurrence getNextOccurrence(const QString &uid, const KDateTime &recurrenceId,
                                                         const QDateTime &startTime) const;
@@ -95,11 +95,11 @@ public slots:
     void notebooksChanged(QList<NemoCalendarData::Notebook> notebooks);
 
     void dataLoaded(QList<NemoCalendarData::Range> ranges,
-                      QStringList uidList,
-                      QMultiHash<QString, NemoCalendarData::Event> events,
-                      QHash<QString, NemoCalendarData::EventOccurrence> occurrences,
-                      QHash<QDate, QStringList> dailyOccurrences,
-                      bool reset);
+                    QStringList uidList,
+                    QMultiHash<QString, NemoCalendarData::Event> events,
+                    QHash<QString, NemoCalendarData::EventOccurrence> occurrences,
+                    QHash<QDate, QStringList> dailyOccurrences,
+                    bool reset);
 
     void occurrenceExceptionFailed(NemoCalendarData::Event eventData, QDateTime startTime);
     void occurrenceExceptionCreated(NemoCalendarData::Event eventData, QDateTime startTime, KDateTime newRecurrenceId);