Skip to content

Commit

Permalink
Use new signal/slot connection format and const references
Browse files Browse the repository at this point in the history
  • Loading branch information
@pvuorela
pvuorela committed May 24, 2019
1 parent 155513f commit a4c0df4
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 58 deletions.
57 changes: 29 additions & 28 deletions src/calendarmanager.cpp
View file
Expand Up @@ -63,26 +63,26 @@ NemoCalendarManager::NemoCalendarManager()
mCalendarWorker = new NemoCalendarWorker();
mCalendarWorker->moveToThread(&mWorkerThread);

connect(&mWorkerThread, SIGNAL(finished()), mCalendarWorker, SLOT(deleteLater()));
connect(&mWorkerThread, &QThread::finished, mCalendarWorker, &QObject::deleteLater);

connect(mCalendarWorker, SIGNAL(storageModifiedSignal(QString)),
this, SLOT(storageModifiedSlot(QString)));
connect(mCalendarWorker, &NemoCalendarWorker::storageModifiedSignal,
this, &NemoCalendarManager::storageModifiedSlot);

connect(mCalendarWorker, SIGNAL(eventNotebookChanged(QString,QString,QString)),
this, SLOT(eventNotebookChanged(QString,QString,QString)));
connect(mCalendarWorker, &NemoCalendarWorker::eventNotebookChanged,
this, &NemoCalendarManager::eventNotebookChanged);

connect(mCalendarWorker, SIGNAL(excludedNotebooksChanged(QStringList)),
this, SLOT(excludedNotebooksChangedSlot(QStringList)));
connect(mCalendarWorker, SIGNAL(notebooksChanged(QList<NemoCalendarData::Notebook>)),
this, SLOT(notebooksChangedSlot(QList<NemoCalendarData::Notebook>)));
connect(mCalendarWorker, &NemoCalendarWorker::excludedNotebooksChanged,
this, &NemoCalendarManager::excludedNotebooksChangedSlot);
connect(mCalendarWorker, &NemoCalendarWorker::notebooksChanged,
this, &NemoCalendarManager::notebooksChangedSlot);

connect(mCalendarWorker, SIGNAL(dataLoaded(QList<NemoCalendarData::Range>,QStringList,QMultiHash<QString,NemoCalendarData::Event>,QHash<QString,NemoCalendarData::EventOccurrence>,QHash<QDate,QStringList>,bool)),
this, SLOT(dataLoadedSlot(QList<NemoCalendarData::Range>,QStringList,QMultiHash<QString,NemoCalendarData::Event>,QHash<QString,NemoCalendarData::EventOccurrence>,QHash<QDate,QStringList>,bool)));
connect(mCalendarWorker, &NemoCalendarWorker::dataLoaded,
this, &NemoCalendarManager::dataLoadedSlot);

connect(mCalendarWorker, SIGNAL(occurrenceExceptionFailed(NemoCalendarData::Event,QDateTime)),
this, SLOT(occurrenceExceptionFailedSlot(NemoCalendarData::Event,QDateTime)));
connect(mCalendarWorker, SIGNAL(occurrenceExceptionCreated(NemoCalendarData::Event,QDateTime,KDateTime)),
this, SLOT(occurrenceExceptionCreatedSlot(NemoCalendarData::Event,QDateTime,KDateTime)));
connect(mCalendarWorker, &NemoCalendarWorker::occurrenceExceptionFailed,
this, &NemoCalendarManager::occurrenceExceptionFailedSlot);
connect(mCalendarWorker, &NemoCalendarWorker::occurrenceExceptionCreated,
this, &NemoCalendarManager::occurrenceExceptionCreatedSlot);

connect(mCalendarWorker, &NemoCalendarWorker::findMatchingEventFinished,
this, &NemoCalendarManager::findMatchingEventFinished);
Expand Down Expand Up @@ -487,7 +487,7 @@ void NemoCalendarManager::timeout() {
doAgendaAndQueryRefresh();
}

void NemoCalendarManager::occurrenceExceptionFailedSlot(NemoCalendarData::Event data, QDateTime occurrence)
void NemoCalendarManager::occurrenceExceptionFailedSlot(const NemoCalendarData::Event &data, const QDateTime &occurrence)
{
for (int i = 0; i < mPendingOccurrenceExceptions.length(); ++i) {
const OccurrenceData &item = mPendingOccurrenceExceptions.at(i);
Expand All @@ -501,8 +501,8 @@ void NemoCalendarManager::occurrenceExceptionFailedSlot(NemoCalendarData::Event
}
}

void NemoCalendarManager::occurrenceExceptionCreatedSlot(NemoCalendarData::Event data, QDateTime occurrence,
KDateTime newRecurrenceId)
void NemoCalendarManager::occurrenceExceptionCreatedSlot(const NemoCalendarData::Event &data, const QDateTime &occurrence,
const KDateTime &newRecurrenceId)
{
for (int i = 0; i < mPendingOccurrenceExceptions.length(); ++i) {
const OccurrenceData &item = mPendingOccurrenceExceptions.at(i);
Expand Down Expand Up @@ -597,14 +597,15 @@ void NemoCalendarManager::findMatchingEventFinished(
}
}

void NemoCalendarManager::storageModifiedSlot(QString info)
void NemoCalendarManager::storageModifiedSlot(const QString &info)
{
Q_UNUSED(info)
mResetPending = true;
emit storageModified();
}

void NemoCalendarManager::eventNotebookChanged(QString oldEventUid, QString newEventUid, QString notebookUid)
void NemoCalendarManager::eventNotebookChanged(const QString &oldEventUid, const QString &newEventUid,
const QString &notebookUid)
{
// FIXME: adapt to multihash + recurrenceId.
#if 0
Expand Down Expand Up @@ -638,7 +639,7 @@ void NemoCalendarManager::eventNotebookChanged(QString oldEventUid, QString newE
#endif
}

void NemoCalendarManager::excludedNotebooksChangedSlot(QStringList excludedNotebooks)
void NemoCalendarManager::excludedNotebooksChangedSlot(const QStringList &excludedNotebooks)
{
QStringList sortedExcluded = excludedNotebooks;
sortedExcluded.sort();
Expand All @@ -650,7 +651,7 @@ void NemoCalendarManager::excludedNotebooksChangedSlot(QStringList excludedNoteb
}
}

void NemoCalendarManager::notebooksChangedSlot(QList<NemoCalendarData::Notebook> notebooks)
void NemoCalendarManager::notebooksChangedSlot(const QList<NemoCalendarData::Notebook> &notebooks)
{
QHash<QString, NemoCalendarData::Notebook> newNotebooks;
QStringList colorChangers;
Expand Down Expand Up @@ -712,12 +713,12 @@ QList<NemoCalendarData::Attendee> NemoCalendarManager::getEventAttendees(const Q
return attendees;
}

void NemoCalendarManager::dataLoadedSlot(QList<NemoCalendarData::Range> ranges,
QStringList uidList,
QMultiHash<QString, NemoCalendarData::Event> events,
QHash<QString, NemoCalendarData::EventOccurrence> occurrences,
QHash<QDate, QStringList> dailyOccurrences,
bool reset)
void NemoCalendarManager::dataLoadedSlot(const QList<NemoCalendarData::Range> &ranges,
const QStringList &uidList,
const QMultiHash<QString, NemoCalendarData::Event> &events,
const QHash<QString, NemoCalendarData::EventOccurrence> &occurrences,
const QHash<QDate, QStringList> &dailyOccurrences,
bool reset)
{
QList<NemoCalendarData::Event> oldEvents;
foreach (const QString &uid, mEventObjects.keys()) {
Expand Down
29 changes: 13 additions & 16 deletions src/calendarmanager.h
View file
Expand Up @@ -114,23 +114,20 @@ class NemoCalendarManager : public QObject
QList<NemoCalendarData::Attendee> getEventAttendees(const QString &uid, const KDateTime &recurrenceId);

private slots:
void storageModifiedSlot(QString info);

void eventNotebookChanged(QString oldEventUid, QString newEventUid, QString notebookUid);

void excludedNotebooksChangedSlot(QStringList excludedNotebooks);
void notebooksChangedSlot(QList<NemoCalendarData::Notebook> notebooks);

void dataLoadedSlot(QList<NemoCalendarData::Range> ranges,
QStringList uidList,
QMultiHash<QString, NemoCalendarData::Event> events,
QHash<QString, NemoCalendarData::EventOccurrence> occurrences,
QHash<QDate, QStringList> dailyOccurrences,
bool reset);
void storageModifiedSlot(const QString &info);
void eventNotebookChanged(const QString &oldEventUid, const QString &newEventUid, const QString &notebookUid);
void excludedNotebooksChangedSlot(const QStringList &excludedNotebooks);
void notebooksChangedSlot(const QList<NemoCalendarData::Notebook> &notebooks);
void dataLoadedSlot(const QList<NemoCalendarData::Range> &ranges,
const QStringList &uidList,
const QMultiHash<QString, NemoCalendarData::Event> &events,
const QHash<QString, NemoCalendarData::EventOccurrence> &occurrences,
const QHash<QDate, QStringList> &dailyOccurrences,
bool reset);
void timeout();
void occurrenceExceptionFailedSlot(NemoCalendarData::Event data, QDateTime occurrence);
void occurrenceExceptionCreatedSlot(NemoCalendarData::Event data, QDateTime occurrence, KDateTime newRecurrenceId);

void occurrenceExceptionFailedSlot(const NemoCalendarData::Event &data, const QDateTime &occurrence);
void occurrenceExceptionCreatedSlot(const NemoCalendarData::Event &data, const QDateTime &occurrence,
const KDateTime &newRecurrenceId);
void findMatchingEventFinished(const QString &invitationFile,
const NemoCalendarData::Event &event);

Expand Down
29 changes: 15 additions & 14 deletions src/calendarworker.h
View file
Expand Up @@ -90,26 +90,27 @@ public slots:
void findMatchingEvent(const QString &invitationFile);

signals:
void storageModifiedSignal(QString info);
void storageModifiedSignal(const QString &info);

void eventNotebookChanged(QString oldEventUid, QString newEventUid, QString notebookUid);
void eventNotebookChanged(const QString &oldEventUid, const QString &newEventUid, const QString &notebookUid);

void excludedNotebooksChanged(QStringList excludedNotebooks);
void notebookColorChanged(NemoCalendarData::Notebook notebook);
void notebooksChanged(QList<NemoCalendarData::Notebook> notebooks);
void excludedNotebooksChanged(const QStringList &excludedNotebooks);
void notebookColorChanged(const NemoCalendarData::Notebook &notebook);
void notebooksChanged(const 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,
void dataLoaded(const QList<NemoCalendarData::Range> &ranges,
const QStringList &uidList,
const QMultiHash<QString, NemoCalendarData::Event> &events,
const QHash<QString, NemoCalendarData::EventOccurrence> &occurrences,
const QHash<QDate, QStringList> &dailyOccurrences,
bool reset);

void occurrenceExceptionFailed(NemoCalendarData::Event eventData, QDateTime startTime);
void occurrenceExceptionCreated(NemoCalendarData::Event eventData, QDateTime startTime, KDateTime newRecurrenceId);
void occurrenceExceptionFailed(const NemoCalendarData::Event &eventData, const QDateTime &startTime);
void occurrenceExceptionCreated(const NemoCalendarData::Event &eventData, const QDateTime &startTime,
const KDateTime &newRecurrenceId);

void findMatchingEventFinished(QString invitationFile,
NemoCalendarData::Event eventData);
void findMatchingEventFinished(const QString &invitationFile,
const NemoCalendarData::Event &eventData);

private:
void setEventData(KCalCore::Event::Ptr &event, const NemoCalendarData::Event &eventData);
Expand Down

0 comments on commit a4c0df4

Please sign in to comment.