summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-08-02 06:43:55 +0200
committerMontel Laurent <[email protected]>2017-08-02 06:43:55 +0200
commitc65f4a2a2bc0227d355a3cb87440484d3d9f1d6b (patch)
tree4c423349b3a969c8f7ffb722b8ec6de3114745a4
parentd220f33ccc51c4bf8f88a88dfec2706234222619 (diff)
Use override
-rw-r--r--src/konfigurator/konfigurator.h8
-rw-r--r--src/manager/allyourbase.cpp2
-rw-r--r--src/manager/allyourbase.h10
-rw-r--r--src/manager/authorizedapplicationstable.h4
-rw-r--r--src/manager/connectedapplicationstable.h4
-rw-r--r--src/manager/kbetterthankdialogbase.h4
-rw-r--r--src/manager/kwalleteditor.h4
-rw-r--r--src/manager/kwalletmanager.h2
-rw-r--r--src/manager/kwalletmanagerwidget.h6
-rw-r--r--src/manager/kwmapeditor.cpp14
-rw-r--r--src/manager/walletcontrolwidget.h4
11 files changed, 31 insertions, 31 deletions
diff --git a/src/konfigurator/konfigurator.h b/src/konfigurator/konfigurator.h
index 0636c99..76c7e1e 100644
--- a/src/konfigurator/konfigurator.h
+++ b/src/konfigurator/konfigurator.h
@@ -39,11 +39,11 @@ public:
explicit KWalletConfig(QWidget *parent = nullptr, const QVariantList & = QVariantList());
virtual ~KWalletConfig();
- void load() Q_DECL_OVERRIDE;
- void save() Q_DECL_OVERRIDE;
- void defaults() Q_DECL_OVERRIDE;
+ void load() override;
+ void save() override;
+ void defaults() override;
- QString quickHelp() const Q_DECL_OVERRIDE;
+ QString quickHelp() const override;
public slots:
void configChanged();
diff --git a/src/manager/allyourbase.cpp b/src/manager/allyourbase.cpp
index 1b50761..c5aac68 100644
--- a/src/manager/allyourbase.cpp
+++ b/src/manager/allyourbase.cpp
@@ -690,7 +690,7 @@ public:
parent->installEventFilter(this);
}
- bool eventFilter(QObject * /*watched*/, QEvent *event) Q_DECL_OVERRIDE
+ bool eventFilter(QObject * /*watched*/, QEvent *event) override
{
if (event->type() == QEvent::KeyPress) {
QKeyEvent *ke = static_cast<QKeyEvent *>(event);
diff --git a/src/manager/allyourbase.h b/src/manager/allyourbase.h
index 5c26781..72b443d 100644
--- a/src/manager/allyourbase.h
+++ b/src/manager/allyourbase.h
@@ -116,11 +116,11 @@ public:
void setWallet(KWallet::Wallet *w);
protected:
- void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE;
- void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
- void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
- void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
- void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent *e) override;
+ void dragMoveEvent(QDragMoveEvent *e) override;
+ void dropEvent(QDropEvent *e) override;
+ void mousePressEvent(QMouseEvent *e) override;
+ void mouseMoveEvent(QMouseEvent *e) override;
void itemDropped(QDropEvent *e, QTreeWidgetItem *item);
diff --git a/src/manager/authorizedapplicationstable.h b/src/manager/authorizedapplicationstable.h
index d5423b0..051bab1 100644
--- a/src/manager/authorizedapplicationstable.h
+++ b/src/manager/authorizedapplicationstable.h
@@ -33,11 +33,11 @@ class AuthorizedApplicationsTable : public QTableView
public:
explicit AuthorizedApplicationsTable(QWidget *parent);
- void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
+ void setModel(QAbstractItemModel *model) override;
void setWallet(KWallet::Wallet *wallet);
protected:
- void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent *resizeEvent) override;
private:
KWallet::Wallet *_wallet;
diff --git a/src/manager/connectedapplicationstable.h b/src/manager/connectedapplicationstable.h
index 5e7397a..bfd4b4a 100644
--- a/src/manager/connectedapplicationstable.h
+++ b/src/manager/connectedapplicationstable.h
@@ -29,11 +29,11 @@ class ConnectedApplicationsTable : public QTableView
public:
explicit ConnectedApplicationsTable(QWidget *parent);
- void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
+ void setModel(QAbstractItemModel *model) override;
void setWallet(KWallet::Wallet *wallet);
protected:
- void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent *resizeEvent) override;
private:
KWallet::Wallet *_wallet;
diff --git a/src/manager/kbetterthankdialogbase.h b/src/manager/kbetterthankdialogbase.h
index a9abb84..a5718fb 100644
--- a/src/manager/kbetterthankdialogbase.h
+++ b/src/manager/kbetterthankdialogbase.h
@@ -32,8 +32,8 @@ public:
public slots:
virtual void setLabel(const QString &label);
- void accept() Q_DECL_OVERRIDE;
- void reject() Q_DECL_OVERRIDE;
+ void accept() override;
+ void reject() override;
private slots:
virtual void clicked();
diff --git a/src/manager/kwalleteditor.h b/src/manager/kwalleteditor.h
index 54f445d..9ad0e6c 100644
--- a/src/manager/kwalleteditor.h
+++ b/src/manager/kwalleteditor.h
@@ -51,8 +51,8 @@ public:
void setNewWallet(bool newWallet);
protected:
- void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
- void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
+ void hideEvent(QHideEvent *) override;
+ void showEvent(QShowEvent *) override;
public slots:
void walletClosed();
diff --git a/src/manager/kwalletmanager.h b/src/manager/kwalletmanager.h
index ffc9727..cd83b4b 100644
--- a/src/manager/kwalletmanager.h
+++ b/src/manager/kwalletmanager.h
@@ -54,7 +54,7 @@ public slots:
void walletCreated(const QString &walletName);
protected:
- bool queryClose() Q_DECL_OVERRIDE;
+ bool queryClose() override;
private:
public Q_SLOTS: //dbus
diff --git a/src/manager/kwalletmanagerwidget.h b/src/manager/kwalletmanagerwidget.h
index 4aff293..dfc4fcf 100644
--- a/src/manager/kwalletmanagerwidget.h
+++ b/src/manager/kwalletmanagerwidget.h
@@ -44,9 +44,9 @@ public:
bool hasUnsavedChanges(const QString& name) const;
protected:
- void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE;
- void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
- void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent *e) override;
+ void dragMoveEvent(QDragMoveEvent *e) override;
+ void dropEvent(QDropEvent *e) override;
private Q_SLOTS:
void onCurrentPageChanged(KPageWidgetItem *, KPageWidgetItem *);
diff --git a/src/manager/kwmapeditor.cpp b/src/manager/kwmapeditor.cpp
index 19a49da..3b3df13 100644
--- a/src/manager/kwmapeditor.cpp
+++ b/src/manager/kwmapeditor.cpp
@@ -47,7 +47,7 @@ public:
}
protected:
- void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE
+ void focusOutEvent(QFocusEvent *e) override
{
if (e->reason() == Qt::PopupFocusReason) {
// TODO: It seems we only get here if we're disturbed
@@ -57,7 +57,7 @@ protected:
close();
}
- void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE
+ void keyPressEvent(QKeyEvent *e) override
{
if (e->key() == Qt::Key_Escape) {
e->accept();
@@ -67,7 +67,7 @@ protected:
QTextEdit::keyPressEvent(e);
}
}
- void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE
+ void contextMenuEvent(QContextMenuEvent *event) override
{
QMenu *menu = createStandardContextMenu();
popup = menu;
@@ -85,7 +85,7 @@ public:
{
}
- QWidget *createEditor(QWidget *parentWidget, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE
+ QWidget *createEditor(QWidget *parentWidget, const QStyleOptionViewItem &option, const QModelIndex &index) const override
{
if (index.column() != 2) {
return QItemDelegate::createEditor(parentWidget, option, index);
@@ -95,7 +95,7 @@ public:
return new InlineEditor(mapEditor);
}
- void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override
{
if (dynamic_cast<InlineEditor *>(editor)) {
KWMapEditor *mapEditor = static_cast<KWMapEditor *>(parent());
@@ -107,7 +107,7 @@ public:
}
}
- void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE
+ void setEditorData(QWidget *editor, const QModelIndex &index) const override
{
InlineEditor *e = dynamic_cast<InlineEditor *>(editor);
if (e) {
@@ -118,7 +118,7 @@ public:
}
}
- void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE
+ void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override
{
InlineEditor *e = dynamic_cast<InlineEditor *>(editor);
if (e) {
diff --git a/src/manager/walletcontrolwidget.h b/src/manager/walletcontrolwidget.h
index a1315db..2abbff3 100644
--- a/src/manager/walletcontrolwidget.h
+++ b/src/manager/walletcontrolwidget.h
@@ -47,8 +47,8 @@ public Q_SLOTS:
void onChangePassword();
protected:
- void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
- void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
+ void hideEvent(QHideEvent *) override;
+ void showEvent(QShowEvent *) override;
private:
QString _walletName;