Commit 82d6364a authored by Laurent Montel's avatar Laurent Montel 😁

Port to new connect api, clean up

parent a49eb18d
......@@ -56,15 +56,13 @@ public:
public Q_SLOTS:
void slotQuit();
protected Q_SLOTS:
void deferredInit();
void checkAlarms();
Q_SIGNALS:
void reminderCount(int);
void saveAllSignal();
private:
void deferredInit();
void checkAlarms();
void setupAkonadi();
void slotCommitData(QSessionManager &);
bool dockerEnabled();
......
......@@ -105,8 +105,8 @@ FilterEdit::FilterEdit(QList<KCalCore::CalFilter *> *filters, QWidget *parent)
i18nc("@info:whatsthis",
"Press this button to remove the currently active filter."));
connect(mRulesList, SIGNAL(itemSelectionChanged()),
this, SLOT(filterSelected()));
connect(mRulesList, QOverload<>::of(&QListWidget::itemSelectionChanged),
this, QOverload<>::of(&FilterEdit::filterSelected));
connect(mNewButton, &QPushButton::clicked, this, &FilterEdit::bNewPressed);
connect(mDeleteButton, &QPushButton::clicked, this, &FilterEdit::bDeletePressed);
......
......@@ -89,7 +89,7 @@ Q_SIGNALS:
void filterChanged();
void editCategories();
private Q_SLOTS:
private:
void filterSelected();
void bNewPressed();
void bDeletePressed();
......@@ -98,7 +98,6 @@ private Q_SLOTS:
void editCategorySelection();
void slotHelp();
private:
bool correctName(const QString &newText);
void filterSelected(KCalCore::CalFilter *f);
......
......@@ -57,12 +57,10 @@ public:
QPushButton *editButton() const;
private Q_SLOTS:
private:
void editIncidence();
void showIncidenceContext();
void delayedDestruct();
private:
CalendarSupport::IncidenceViewer *mEventViewer = nullptr;
QPushButton *mUser1Button = nullptr;
};
......
......@@ -62,10 +62,6 @@ public Q_SLOTS:
updateView();
}
protected Q_SLOTS:
void doSearch();
void searchTextChanged(const QString &_text);
Q_SIGNALS:
void showIncidenceSignal(const Akonadi::Item &);
void editIncidenceSignal(const Akonadi::Item &);
......@@ -75,6 +71,8 @@ protected:
/*reimp*/
void showEvent(QShowEvent *event) override;
private:
void doSearch();
void searchTextChanged(const QString &_text);
void slotHelpRequested();
void search(const QRegExp &);
void readConfig();
......
......@@ -43,7 +43,7 @@ class SearchCollectionHelper: public QObject
public:
explicit SearchCollectionHelper(QObject *parent = nullptr);
private Q_SLOTS:
private:
void onSearchCollectionsFetched(KJob *job);
void updateOpenInvitation();
void updateDeclinedInvitation();
......@@ -51,7 +51,6 @@ private Q_SLOTS:
void createSearchJobFinished(KJob *job);
void modifyResult(KJob *job);
private:
void setupSearchCollections();
void updateSearchCollection(Akonadi::Collection col, KCalCore::Attendee::PartStat status, const QString &name, const QString &displayName);
......
......@@ -65,7 +65,7 @@ public:
protected:
bool eventFilter(QObject *obj, QEvent *e) override;
private Q_SLOTS:
private:
void updateView();
void popupMenu(const QString &url);
void mailContact(const QString &url);
......@@ -73,11 +73,11 @@ private Q_SLOTS:
void slotBirthdayJobFinished(KJob *job);
void slotItemFetchJobDone(KJob *job);
private:
int span(const KCalCore::Event::Ptr &event) const;
int dayof(const KCalCore::Event::Ptr &event, const QDate &date) const;
bool initHolidays();
void dateDiff(const QDate &date, int &days, int &years) const;
void createLabels();
Akonadi::ETMCalendar::Ptr mCalendar;
......@@ -86,16 +86,15 @@ private:
KontactInterface::Plugin *mPlugin = nullptr;
int mDaysAhead;
bool mShowBirthdaysFromKAB;
bool mShowBirthdaysFromCal;
bool mShowAnniversariesFromKAB;
bool mShowAnniversariesFromCal;
bool mShowHolidays;
bool mShowSpecialsFromCal;
bool mShowMineOnly;
bool mJobRunning;
bool mShowBirthdaysFromKAB = false;
bool mShowBirthdaysFromCal = false;
bool mShowAnniversariesFromKAB = false;
bool mShowAnniversariesFromCal = false;
bool mShowHolidays = false;
bool mShowSpecialsFromCal = false;
bool mShowMineOnly = false;
bool mJobRunning = false;
QList<SDEntry> mDates;
void createLabels();
KHolidays::HolidayRegion *mHolidays = nullptr;
};
......
......@@ -58,7 +58,7 @@ private:
EventViews::AgendaView *mAgendaView = nullptr;
KPIM::Person mPerson;
Akonadi::Collection mCollection;
int mDayRange;
int mDayRange = 7;
};
#endif // QUICKVIEW_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment