summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Martins <[email protected]>2015-07-31 23:17:14 +0100
committerSergio Martins <[email protected]>2015-07-31 23:17:14 +0100
commit206ab9d26d2cca7ee1cf5c32255b2d0ae4ce04ef (patch)
tree1c92d7a989ffafa2c41552f99c646bac66fc8471
parenta3b3fbddca72255aec301d5767e8a03a88e98013 (diff)
incidenceeditors: Use Q_DECL_OVERRIDE
-rw-r--r--incidenceeditor-ng/attendeeeditor.h2
-rw-r--r--incidenceeditor-ng/attendeeline.h28
-rw-r--r--incidenceeditor-ng/groupwareuidelegate.h6
-rw-r--r--incidenceeditor-ng/incidencealarm.h6
-rw-r--r--incidenceeditor-ng/incidenceattendee.h8
-rw-r--r--incidenceeditor-ng/incidencecompletionpriority.h6
-rw-r--r--incidenceeditor-ng/incidencedialog.cpp16
-rw-r--r--incidenceeditor-ng/incidencerecurrence.h8
-rw-r--r--incidenceeditor-ng/incidenceresource.h6
-rw-r--r--incidenceeditor-ng/incidencesecrecy.h6
-rw-r--r--incidenceeditor-ng/incidencewhatwhere.h8
-rw-r--r--incidenceeditor-ng/korganizereditorconfig.h34
-rw-r--r--incidenceeditor-ng/visualfreebusywidget.cpp20
13 files changed, 77 insertions, 77 deletions
diff --git a/incidenceeditor-ng/attendeeeditor.h b/incidenceeditor-ng/attendeeeditor.h
index 0d1310f..871c373 100644
--- a/incidenceeditor-ng/attendeeeditor.h
+++ b/incidenceeditor-ng/attendeeeditor.h
@@ -37,7 +37,7 @@ public:
{
}
- virtual KPIM::MultiplyingLine *newLine(QWidget *parent)
+ KPIM::MultiplyingLine *newLine(QWidget *parent) Q_DECL_OVERRIDE
{
return new AttendeeLine(parent);
}
diff --git a/incidenceeditor-ng/attendeeline.h b/incidenceeditor-ng/attendeeline.h
index 70dc1b1..7855f42 100644
--- a/incidenceeditor-ng/attendeeline.h
+++ b/incidenceeditor-ng/attendeeline.h
@@ -100,27 +100,27 @@ public:
explicit AttendeeLine(QWidget *parent);
virtual ~AttendeeLine() {}
- virtual void activate();
- virtual bool isActive() const;
+ void activate() Q_DECL_OVERRIDE;
+ bool isActive() const Q_DECL_OVERRIDE;
- virtual bool isEmpty() const;
- virtual void clear();
+ bool isEmpty() const Q_DECL_OVERRIDE;
+ void clear() Q_DECL_OVERRIDE;
- virtual bool isModified() const;
- virtual void clearModified();
+ bool isModified() const Q_DECL_OVERRIDE;
+ void clearModified() Q_DECL_OVERRIDE;
- virtual KPIM::MultiplyingLineData::Ptr data() const;
- virtual void setData(const KPIM::MultiplyingLineData::Ptr &data);
+ KPIM::MultiplyingLineData::Ptr data() const Q_DECL_OVERRIDE;
+ void setData(const KPIM::MultiplyingLineData::Ptr &data) Q_DECL_OVERRIDE;
- virtual void fixTabOrder(QWidget *previous);
- virtual QWidget *tabOut() const;
+ void fixTabOrder(QWidget *previous) Q_DECL_OVERRIDE;
+ QWidget *tabOut() const Q_DECL_OVERRIDE;
- virtual void moveCompletionPopup();
- virtual void setCompletionMode(KCompletion::CompletionMode);
+ void moveCompletionPopup() Q_DECL_OVERRIDE;
+ void setCompletionMode(KCompletion::CompletionMode) Q_DECL_OVERRIDE;
- virtual int setColumnWidth(int w);
+ int setColumnWidth(int w) Q_DECL_OVERRIDE;
- virtual void aboutToBeDeleted();
+ void aboutToBeDeleted() Q_DECL_OVERRIDE;
void setActions(AttendeeActions actions);
diff --git a/incidenceeditor-ng/groupwareuidelegate.h b/incidenceeditor-ng/groupwareuidelegate.h
index 5658f89..ae5dd37 100644
--- a/incidenceeditor-ng/groupwareuidelegate.h
+++ b/incidenceeditor-ng/groupwareuidelegate.h
@@ -28,9 +28,9 @@ class INCIDENCEEDITORS_NG_EXPORT GroupwareUiDelegate : public Akonadi::Groupware
{
public:
- void requestIncidenceEditor(const Akonadi::Item &item) /** Q_DECL_OVERRIDE */;
- void setCalendar(const Akonadi::ETMCalendar::Ptr &calendar) /** Q_DECL_OVERRIDE */;
- void createCalendar() /** Q_DECL_OVERRIDE */;
+ void requestIncidenceEditor(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void setCalendar(const Akonadi::ETMCalendar::Ptr &calendar) Q_DECL_OVERRIDE;
+ void createCalendar() Q_DECL_OVERRIDE;
};
}
diff --git a/incidenceeditor-ng/incidencealarm.h b/incidenceeditor-ng/incidencealarm.h
index 7fcd28c..447f05d 100644
--- a/incidenceeditor-ng/incidencealarm.h
+++ b/incidenceeditor-ng/incidencealarm.h
@@ -41,9 +41,9 @@ public:
using IncidenceEditorNG::IncidenceEditor::save; // So we don't trigger -Woverloaded-virtual
IncidenceAlarm(IncidenceDateTime *dateTime, Ui::EventOrTodoDesktop *ui);
- virtual void load(const KCalCore::Incidence::Ptr &incidence);
- virtual void save(const KCalCore::Incidence::Ptr &incidence);
- virtual bool isDirty() const;
+ void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE;
Q_SIGNALS:
void alarmCountChanged(int newCount);
diff --git a/incidenceeditor-ng/incidenceattendee.h b/incidenceeditor-ng/incidenceattendee.h
index 809571e..aaccf94 100644
--- a/incidenceeditor-ng/incidenceattendee.h
+++ b/incidenceeditor-ng/incidenceattendee.h
@@ -56,10 +56,10 @@ public:
IncidenceAttendee(QWidget *parent, IncidenceDateTime *dateTime, Ui::EventOrTodoDesktop *ui);
~IncidenceAttendee();
- virtual void load(const KCalCore::Incidence::Ptr &incidence);
- virtual void save(const KCalCore::Incidence::Ptr &incidence);
- virtual bool isDirty() const;
- virtual void printDebugInfo() const;
+ void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE;
+ void printDebugInfo() const Q_DECL_OVERRIDE;
AttendeeTableModel *dataModel() const;
AttendeeComboBoxDelegate *stateDelegate() const;
diff --git a/incidenceeditor-ng/incidencecompletionpriority.h b/incidenceeditor-ng/incidencecompletionpriority.h
index c028ab0..a7b5c70 100644
--- a/incidenceeditor-ng/incidencecompletionpriority.h
+++ b/incidenceeditor-ng/incidencecompletionpriority.h
@@ -41,9 +41,9 @@ public:
explicit IncidenceCompletionPriority(Ui::EventOrTodoDesktop *ui);
~IncidenceCompletionPriority();
- void load(const KCalCore::Incidence::Ptr &incidence);
- void save(const KCalCore::Incidence::Ptr &incidence);
- bool isDirty() const;
+ void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/incidenceeditor-ng/incidencedialog.cpp b/incidenceeditor-ng/incidencedialog.cpp
index f8cb39d..5a3baff 100644
--- a/incidenceeditor-ng/incidencedialog.cpp
+++ b/incidenceeditor-ng/incidencedialog.cpp
@@ -113,18 +113,18 @@ public:
void slotInvalidCollection();
/// ItemEditorUi methods
- virtual bool containsPayloadIdentifiers(const QSet<QByteArray> &partIdentifiers) const;
+ bool containsPayloadIdentifiers(const QSet<QByteArray> &partIdentifiers) const Q_DECL_OVERRIDE;
void handleItemSaveFinish(EditorItemManager::SaveAction);
void handleItemSaveFail(EditorItemManager::SaveAction, const QString &errorMessage);
- virtual bool hasSupportedPayload(const Akonadi::Item &item) const;
- virtual bool isDirty() const;
- virtual bool isValid() const;
- virtual void load(const Akonadi::Item &item);
- virtual Akonadi::Item save(const Akonadi::Item &item);
- virtual Akonadi::Collection selectedCollection() const;
+ bool hasSupportedPayload(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE;
+ bool isValid() const Q_DECL_OVERRIDE;
+ void load(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ Akonadi::Item save(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ Akonadi::Collection selectedCollection() const Q_DECL_OVERRIDE;
void slotButtonClicked(int button);
- virtual void reject(RejectReason reason, const QString &errorMessage = QString());
+ void reject(RejectReason reason, const QString &errorMessage = QString()) Q_DECL_OVERRIDE;
};
}
diff --git a/incidenceeditor-ng/incidencerecurrence.h b/incidenceeditor-ng/incidencerecurrence.h
index 211f3b4..9e2da22 100644
--- a/incidenceeditor-ng/incidencerecurrence.h
+++ b/incidenceeditor-ng/incidencerecurrence.h
@@ -56,10 +56,10 @@ public:
IncidenceRecurrence(IncidenceDateTime *dateTime, Ui::EventOrTodoDesktop *ui);
- virtual void load(const KCalCore::Incidence::Ptr &incidence);
- virtual void save(const KCalCore::Incidence::Ptr &incidence);
- virtual bool isDirty() const;
- virtual bool isValid() const;
+ void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE;
+ bool isValid() const Q_DECL_OVERRIDE;
RecurrenceType currentRecurrenceType() const;
diff --git a/incidenceeditor-ng/incidenceresource.h b/incidenceeditor-ng/incidenceresource.h
index b3cdf71..1467324 100644
--- a/incidenceeditor-ng/incidenceresource.h
+++ b/incidenceeditor-ng/incidenceresource.h
@@ -48,9 +48,9 @@ public:
explicit IncidenceResource(IncidenceAttendee *mIeAttendee, IncidenceDateTime *dateTime, Ui::EventOrTodoDesktop *ui);
- void load(const KCalCore::Incidence::Ptr &incidence);
- void save(const KCalCore::Incidence::Ptr &incidence);
- bool isDirty() const;
+ void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE;
/** resturn the count of resources */
int resourceCount() const;
diff --git a/incidenceeditor-ng/incidencesecrecy.h b/incidenceeditor-ng/incidencesecrecy.h
index 6a59dc0..ec1c100 100644
--- a/incidenceeditor-ng/incidencesecrecy.h
+++ b/incidenceeditor-ng/incidencesecrecy.h
@@ -40,9 +40,9 @@ public:
explicit IncidenceSecrecy(Ui::EventOrTodoDesktop *ui);
- virtual void load(const KCalCore::Incidence::Ptr &incidence);
- virtual void save(const KCalCore::Incidence::Ptr &incidence);
- virtual bool isDirty() const;
+ void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE;
private:
Ui::EventOrTodoDesktop *mUi;
diff --git a/incidenceeditor-ng/incidencewhatwhere.h b/incidenceeditor-ng/incidencewhatwhere.h
index 362bac2..db5de46 100644
--- a/incidenceeditor-ng/incidencewhatwhere.h
+++ b/incidenceeditor-ng/incidencewhatwhere.h
@@ -47,10 +47,10 @@ public:
explicit IncidenceWhatWhere(Ui::EventOrTodoDesktop *ui);
- virtual void load(const KCalCore::Incidence::Ptr &incidence);
- virtual void save(const KCalCore::Incidence::Ptr &incidence);
- virtual bool isDirty() const;
- virtual bool isValid() const;
+ void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE;
+ bool isValid() const Q_DECL_OVERRIDE;
virtual void validate();
private:
diff --git a/incidenceeditor-ng/korganizereditorconfig.h b/incidenceeditor-ng/korganizereditorconfig.h
index 4251a67..513d7bf 100644
--- a/incidenceeditor-ng/korganizereditorconfig.h
+++ b/incidenceeditor-ng/korganizereditorconfig.h
@@ -32,23 +32,23 @@ public:
KOrganizerEditorConfig();
virtual ~KOrganizerEditorConfig();
- virtual KConfigSkeleton *config() const;
- virtual QString fullName() const;
- virtual QString email() const;
- virtual bool thatIsMe(const QString &email) const;
- virtual QStringList allEmails() const;
- virtual QStringList fullEmails() const;
- virtual bool showTimeZoneSelectorInIncidenceEditor() const;
- virtual QDateTime defaultDuration() const;
- virtual QDateTime startTime() const;
- virtual bool defaultAudioFileReminders() const;
- virtual QUrl audioFilePath() const;
- virtual int reminderTime() const;
- virtual int reminderTimeUnits() const;
- virtual bool defaultTodoReminders() const;
- virtual bool defaultEventReminders() const;
- virtual QStringList activeDesignerFields() const;
- virtual QStringList &templates(KCalCore::IncidenceBase::IncidenceType type);
+ KConfigSkeleton *config() const Q_DECL_OVERRIDE;
+ QString fullName() const Q_DECL_OVERRIDE;
+ QString email() const Q_DECL_OVERRIDE;
+ bool thatIsMe(const QString &email) const Q_DECL_OVERRIDE;
+ QStringList allEmails() const Q_DECL_OVERRIDE;
+ QStringList fullEmails() const Q_DECL_OVERRIDE;
+ bool showTimeZoneSelectorInIncidenceEditor() const Q_DECL_OVERRIDE;
+ QDateTime defaultDuration() const Q_DECL_OVERRIDE;
+ QDateTime startTime() const Q_DECL_OVERRIDE;
+ bool defaultAudioFileReminders() const Q_DECL_OVERRIDE;
+ QUrl audioFilePath() const Q_DECL_OVERRIDE;
+ int reminderTime() const Q_DECL_OVERRIDE;
+ int reminderTimeUnits() const Q_DECL_OVERRIDE;
+ bool defaultTodoReminders() const Q_DECL_OVERRIDE;
+ bool defaultEventReminders() const Q_DECL_OVERRIDE;
+ QStringList activeDesignerFields() const Q_DECL_OVERRIDE;
+ QStringList &templates(KCalCore::IncidenceBase::IncidenceType type) Q_DECL_OVERRIDE;
};
} // IncidenceEditors
diff --git a/incidenceeditor-ng/visualfreebusywidget.cpp b/incidenceeditor-ng/visualfreebusywidget.cpp
index 5760186..99469fb 100644
--- a/incidenceeditor-ng/visualfreebusywidget.cpp
+++ b/incidenceeditor-ng/visualfreebusywidget.cpp
@@ -63,49 +63,49 @@ public:
}
/*reimp*/
- int headerHeight() const
+ int headerHeight() const Q_DECL_OVERRIDE
{
return 2 * mRowHeight + 10;
}
/*reimp*/
- bool isRowVisible(const QModelIndex &) const
+ bool isRowVisible(const QModelIndex &) const Q_DECL_OVERRIDE
{
return true;
}
/*reimp*/
- bool isRowExpanded(const QModelIndex &) const
+ bool isRowExpanded(const QModelIndex &) const Q_DECL_OVERRIDE
{
return false;
}
/*reimp*/
- KDGantt::Span rowGeometry(const QModelIndex &idx) const
+ KDGantt::Span rowGeometry(const QModelIndex &idx) const Q_DECL_OVERRIDE
{
return KDGantt::Span(idx.row() * mRowHeight, mRowHeight);
}
/*reimp*/
- int maximumItemHeight() const
+ int maximumItemHeight() const Q_DECL_OVERRIDE
{
return mRowHeight / 2;
}
/*reimp*/
- int totalHeight() const
+ int totalHeight() const Q_DECL_OVERRIDE
{
return m_model->rowCount() * mRowHeight;
}
/*reimp*/
- QModelIndex indexAt(int height) const
+ QModelIndex indexAt(int height) const Q_DECL_OVERRIDE
{
return m_model->index(height / mRowHeight, 0);
}
/*reimp*/
- QModelIndex indexBelow(const QModelIndex &idx) const
+ QModelIndex indexBelow(const QModelIndex &idx) const Q_DECL_OVERRIDE
{
if (!idx.isValid()) {
return QModelIndex();
@@ -114,7 +114,7 @@ public:
}
/*reimp*/
- QModelIndex indexAbove(const QModelIndex &idx) const
+ QModelIndex indexAbove(const QModelIndex &idx) const Q_DECL_OVERRIDE
{
if (!idx.isValid()) {
return QModelIndex();
@@ -139,7 +139,7 @@ public:
{
}
- QSize sizeHint() const
+ QSize sizeHint() const Q_DECL_OVERRIDE
{
QSize s = QHeaderView::sizeHint();
s.rheight() *= 2;