summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-01 13:45:08 +0200
committerMontel Laurent <[email protected]>2017-06-01 13:45:08 +0200
commit3b3111de273cd9bd9bbe46a36786bc9131f00b99 (patch)
tree407a72b90771ec87f9b69d66f3b50eeeeb7be3e3
parentbe887067dcba1cd2cd2cb1cb14f93c7eff212c4a (diff)
Use Q_DECL_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 ade579b..270def6 100644
--- a/src/konfigurator/konfigurator.h
+++ b/src/konfigurator/konfigurator.h
@@ -39,11 +39,11 @@ public:
explicit KWalletConfig(QWidget *parent = 0L, const QVariantList & = QVariantList());
virtual ~KWalletConfig();
- void load();
- void save();
- void defaults();
+ void load() Q_DECL_OVERRIDE;
+ void save() Q_DECL_OVERRIDE;
+ void defaults() Q_DECL_OVERRIDE;
- QString quickHelp() const;
+ QString quickHelp() const Q_DECL_OVERRIDE;
public slots:
void configChanged();
diff --git a/src/manager/allyourbase.cpp b/src/manager/allyourbase.cpp
index 5d4b3e7..bb5703c 100644
--- a/src/manager/allyourbase.cpp
+++ b/src/manager/allyourbase.cpp
@@ -691,7 +691,7 @@ public:
parent->installEventFilter(this);
}
- bool eventFilter(QObject * /*watched*/, QEvent *event)
+ bool eventFilter(QObject * /*watched*/, QEvent *event) Q_DECL_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 fdfec43..dce59d5 100644
--- a/src/manager/allyourbase.h
+++ b/src/manager/allyourbase.h
@@ -116,11 +116,11 @@ public:
void setWallet(KWallet::Wallet *w);
protected:
- virtual void dragEnterEvent(QDragEnterEvent *e);
- virtual void dragMoveEvent(QDragMoveEvent *e);
- virtual void dropEvent(QDropEvent *e);
- virtual void mousePressEvent(QMouseEvent *e);
- virtual void mouseMoveEvent(QMouseEvent *e);
+ 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 itemDropped(QDropEvent *e, QTreeWidgetItem *item);
diff --git a/src/manager/authorizedapplicationstable.h b/src/manager/authorizedapplicationstable.h
index 3a80d68..d5423b0 100644
--- a/src/manager/authorizedapplicationstable.h
+++ b/src/manager/authorizedapplicationstable.h
@@ -33,11 +33,11 @@ class AuthorizedApplicationsTable : public QTableView
public:
explicit AuthorizedApplicationsTable(QWidget *parent);
- virtual void setModel(QAbstractItemModel *model);
+ void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
void setWallet(KWallet::Wallet *wallet);
protected:
- virtual void resizeEvent(QResizeEvent *resizeEvent);
+ void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE;
private:
KWallet::Wallet *_wallet;
diff --git a/src/manager/connectedapplicationstable.h b/src/manager/connectedapplicationstable.h
index 6c42886..5e7397a 100644
--- a/src/manager/connectedapplicationstable.h
+++ b/src/manager/connectedapplicationstable.h
@@ -29,11 +29,11 @@ class ConnectedApplicationsTable : public QTableView
public:
explicit ConnectedApplicationsTable(QWidget *parent);
- virtual void setModel(QAbstractItemModel *model);
+ void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
void setWallet(KWallet::Wallet *wallet);
protected:
- virtual void resizeEvent(QResizeEvent *resizeEvent);
+ void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE;
private:
KWallet::Wallet *_wallet;
diff --git a/src/manager/kbetterthankdialogbase.h b/src/manager/kbetterthankdialogbase.h
index 98becae..a9abb84 100644
--- a/src/manager/kbetterthankdialogbase.h
+++ b/src/manager/kbetterthankdialogbase.h
@@ -32,8 +32,8 @@ public:
public slots:
virtual void setLabel(const QString &label);
- virtual void accept();
- virtual void reject();
+ void accept() Q_DECL_OVERRIDE;
+ void reject() Q_DECL_OVERRIDE;
private slots:
virtual void clicked();
diff --git a/src/manager/kwalleteditor.h b/src/manager/kwalleteditor.h
index ea03859..4e0f16d 100644
--- a/src/manager/kwalleteditor.h
+++ b/src/manager/kwalleteditor.h
@@ -55,8 +55,8 @@ public:
void setNewWallet(bool newWallet);
protected:
- virtual void hideEvent(QHideEvent *);
- virtual void showEvent(QShowEvent *);
+ void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
+ void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
public slots:
void walletClosed();
diff --git a/src/manager/kwalletmanager.h b/src/manager/kwalletmanager.h
index 077864d..4bbe2bb 100644
--- a/src/manager/kwalletmanager.h
+++ b/src/manager/kwalletmanager.h
@@ -55,7 +55,7 @@ public slots:
void walletCreated(const QString &walletName);
protected:
- virtual bool queryClose();
+ bool queryClose() Q_DECL_OVERRIDE;
private:
public Q_SLOTS: //dbus
diff --git a/src/manager/kwalletmanagerwidget.h b/src/manager/kwalletmanagerwidget.h
index 2d21fd4..d43a5af 100644
--- a/src/manager/kwalletmanagerwidget.h
+++ b/src/manager/kwalletmanagerwidget.h
@@ -44,9 +44,9 @@ public:
bool hasUnsavedChanges(const QString& name) const;
protected:
- virtual void dragEnterEvent(QDragEnterEvent *e);
- virtual void dragMoveEvent(QDragMoveEvent *e);
- virtual void dropEvent(QDropEvent *e);
+ void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE;
+ void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
+ void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
private Q_SLOTS:
void onCurrentPageChanged(KPageWidgetItem *, KPageWidgetItem *);
diff --git a/src/manager/kwmapeditor.cpp b/src/manager/kwmapeditor.cpp
index 9fb3a8a..f985901 100644
--- a/src/manager/kwmapeditor.cpp
+++ b/src/manager/kwmapeditor.cpp
@@ -48,7 +48,7 @@ public:
}
protected:
- virtual void focusOutEvent(QFocusEvent *e)
+ void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE
{
if (e->reason() == Qt::PopupFocusReason) {
// TODO: It seems we only get here if we're disturbed
@@ -58,7 +58,7 @@ protected:
close();
}
- virtual void keyPressEvent(QKeyEvent *e)
+ void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE
{
if (e->key() == Qt::Key_Escape) {
e->accept();
@@ -68,7 +68,7 @@ protected:
QTextEdit::keyPressEvent(e);
}
}
- virtual void contextMenuEvent(QContextMenuEvent *event)
+ void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE
{
QMenu *menu = createStandardContextMenu();
popup = menu;
@@ -86,7 +86,7 @@ public:
{
}
- QWidget *createEditor(QWidget *parentWidget, const QStyleOptionViewItem &option, const QModelIndex &index) const
+ QWidget *createEditor(QWidget *parentWidget, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE
{
if (index.column() != 2) {
return QItemDelegate::createEditor(parentWidget, option, index);
@@ -96,7 +96,7 @@ public:
return new InlineEditor(mapEditor);
}
- void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE
{
if (dynamic_cast<InlineEditor *>(editor)) {
KWMapEditor *mapEditor = static_cast<KWMapEditor *>(parent());
@@ -108,7 +108,7 @@ public:
}
}
- void setEditorData(QWidget *editor, const QModelIndex &index) const
+ void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE
{
InlineEditor *e = dynamic_cast<InlineEditor *>(editor);
if (e) {
@@ -119,7 +119,7 @@ public:
}
}
- void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+ void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE
{
InlineEditor *e = dynamic_cast<InlineEditor *>(editor);
if (e) {
diff --git a/src/manager/walletcontrolwidget.h b/src/manager/walletcontrolwidget.h
index e4724a9..a1315db 100644
--- a/src/manager/walletcontrolwidget.h
+++ b/src/manager/walletcontrolwidget.h
@@ -47,8 +47,8 @@ public Q_SLOTS:
void onChangePassword();
protected:
- virtual void hideEvent(QHideEvent *);
- virtual void showEvent(QShowEvent *);
+ void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
+ void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
private:
QString _walletName;