Commit 278ed795 authored by Fabian Vogt's avatar Fabian Vogt
Browse files

Fix build with GCC 12 (standard attributes in middle of decl-specifiers)

"static Q_REQUIRED_RESULT foo bar()" -> "Q_REQUIRED_RESULT static foo bar()"

(cherry picked from commit 0c2240f9)
parent 0e5f5803
Pipeline #124806 passed with stage
in 3 minutes and 5 seconds
...@@ -93,7 +93,7 @@ private: ...@@ -93,7 +93,7 @@ private:
void updateButtons(); void updateButtons();
using ReminderList = QList<ReminderTreeItem *>; using ReminderList = QList<ReminderTreeItem *>;
static Q_REQUIRED_RESULT QDateTime triggerDateForIncidence(const KCalendarCore::Incidence::Ptr &inc, const QDateTime &reminderAt, QString &displayStr); Q_REQUIRED_RESULT static QDateTime triggerDateForIncidence(const KCalendarCore::Incidence::Ptr &inc, const QDateTime &reminderAt, QString &displayStr);
// Removes each Incidence-X group that has one of the specified uids // Removes each Incidence-X group that has one of the specified uids
void removeFromConfig(const QList<Akonadi::Item::Id> &); void removeFromConfig(const QList<Akonadi::Item::Id> &);
...@@ -111,7 +111,7 @@ private: ...@@ -111,7 +111,7 @@ private:
Q_REQUIRED_RESULT ReminderList selectedItems() const; Q_REQUIRED_RESULT ReminderList selectedItems() const;
void toggleDetails(QTreeWidgetItem *item); void toggleDetails(QTreeWidgetItem *item);
void showDetails(QTreeWidgetItem *item); void showDetails(QTreeWidgetItem *item);
static Q_REQUIRED_RESULT bool grabFocus(); Q_REQUIRED_RESULT static bool grabFocus();
Akonadi::ETMCalendar::Ptr mCalendar; Akonadi::ETMCalendar::Ptr mCalendar;
QTreeWidget *mIncidenceTree = nullptr; QTreeWidget *mIncidenceTree = nullptr;
......
...@@ -68,7 +68,7 @@ public: ...@@ -68,7 +68,7 @@ public:
/** returns the first and last date of the 6*7 matrix that displays @p month /** returns the first and last date of the 6*7 matrix that displays @p month
* @param month The month we want to get matrix boundaries * @param month The month we want to get matrix boundaries
*/ */
static Q_REQUIRED_RESULT QPair<QDate, QDate> matrixLimits(QDate month); Q_REQUIRED_RESULT static QPair<QDate, QDate> matrixLimits(QDate month);
/** /**
Associate a calendar with this day matrix. If there is a calendar, the Associate a calendar with this day matrix. If there is a calendar, the
......
Supports Markdown
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