[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Use Q_DECL_OVERRIDE
From: Sergio Martins <iamsergio () gmail ! com>
Date: 2015-08-08 20:24:39
Message-ID: E1ZOAfX-0006j6-43 () scm ! kde ! org
[Download RAW message or body]
Git commit 25b254b7f1150e1edc2fc876951c14593ed2badb by Sergio Martins.
Committed on 08/08/2015 at 19:51.
Pushed by smartins into branch 'master'.
Use Q_DECL_OVERRIDE
kdepim now uses Q_DECL_OVERRIDE everywhere
M +2 -2 accountwizard/identity.h
M +6 -6 kaddressbook/xxport/csv/qcsvmodel_p.h
M +3 -3 kdgantt2/kdganttconstraintgraphicsitem.h
M +4 -4 kdgantt2/kdganttdatetimegrid.h
M +10 -10 kdgantt2/kdganttgraphicsitem.h
M +2 -2 kdgantt2/kdganttgraphicsscene.h
M +2 -2 kdgantt2/kdganttgraphicsview_p.h
M +10 -10 kdgantt2/kdganttlegend.h
M +9 -9 kdgantt2/kdganttlistviewrowcontroller.h
M +6 -6 kdgantt2/kdganttproxymodel.h
M +8 -8 kdgantt2/kdganttsummaryhandlingproxymodel.h
M +9 -9 kdgantt2/kdgantttreeviewrowcontroller.h
M +1 -1 kdgantt2/kdganttview.cpp
M +1 -1 korgac/alarmdialog.cpp
M +1 -1 korgac/alarmdockwindow.h
M +4 -4 ktnef/qwmf.cpp
M +1 -1 libkdepim/addressline/completionorder/completionorderwidget.cpp
M +1 -1 libkdepim/widgets/tagselectioncombo.cpp
M +36 -36 libkpgp/kpgpbase.h
M +4 -4 libkpgp/kpgpui.h
M +16 -16 pimcommon/storageservice/webdav/webdavjob.h
M +2 -2 storageservicemanager/storageserviceconfiguredialog.h
M +13 -13 storageservicemanager/storageservicemanagersettingsjob.h
http://commits.kde.org/kdepim/25b254b7f1150e1edc2fc876951c14593ed2badb
diff --git a/accountwizard/identity.h b/accountwizard/identity.h
index 85ecd9a..07ada28 100644
--- a/accountwizard/identity.h
+++ b/accountwizard/identity.h
@@ -36,8 +36,8 @@ class Identity : public SetupObject
public:
explicit Identity(QObject *parent = Q_NULLPTR);
~Identity();
- void create();
- void destroy();
+ void create() Q_DECL_OVERRIDE;
+ void destroy() Q_DECL_OVERRIDE;
public Q_SLOTS:
Q_SCRIPTABLE void setIdentityName(const QString &name);
diff --git a/kaddressbook/xxport/csv/qcsvmodel_p.h \
b/kaddressbook/xxport/csv/qcsvmodel_p.h index a271ea9..3efd7d9 100644
--- a/kaddressbook/xxport/csv/qcsvmodel_p.h
+++ b/kaddressbook/xxport/csv/qcsvmodel_p.h
@@ -34,12 +34,12 @@ public:
void load(QIODevice *device);
- void begin();
- void beginLine();
- void field(const QString &data, uint row, uint column);
- void endLine();
- void end();
- void error(const QString &errorMsg);
+ void begin() Q_DECL_OVERRIDE;
+ void beginLine() Q_DECL_OVERRIDE;
+ void field(const QString &data, uint row, uint column) Q_DECL_OVERRIDE;
+ void endLine() Q_DECL_OVERRIDE;
+ void end() Q_DECL_OVERRIDE;
+ void error(const QString &errorMsg) Q_DECL_OVERRIDE;
QCsvReader *reader()
{
diff --git a/kdgantt2/kdganttconstraintgraphicsitem.h \
b/kdgantt2/kdganttconstraintgraphicsitem.h index d042a78..470a4f8 100644
--- a/kdgantt2/kdganttconstraintgraphicsitem.h
+++ b/kdgantt2/kdganttconstraintgraphicsitem.h
@@ -42,14 +42,14 @@ public:
QGraphicsItem *parent = Q_NULLPTR, GraphicsScene \
*scene = Q_NULLPTR); virtual ~ConstraintGraphicsItem();
- /*reimp*/ int type() const;
+ int type() const Q_DECL_OVERRIDE;
/*reimp (non virtual)*/GraphicsScene *scene() const;
/*reimp*/ QString ganttToolTip() const;
- /*reimp*/ QRectF boundingRect() const;
+ QRectF boundingRect() const Q_DECL_OVERRIDE;
/*reimp*/ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
- QWidget *widget = Q_NULLPTR);
+ QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE;
inline const Constraint &constraint() const
{
diff --git a/kdgantt2/kdganttdatetimegrid.h b/kdgantt2/kdganttdatetimegrid.h
index 221cbd5..f496635 100644
--- a/kdgantt2/kdganttdatetimegrid.h
+++ b/kdgantt2/kdganttdatetimegrid.h
@@ -110,16 +110,16 @@ public:
void setNoInformationBrush(const QBrush &brush);
QBrush noInformationBrush() const;
- /*reimp*/ Span mapToChart(const QModelIndex &idx) const;
+ Span mapToChart(const QModelIndex &idx) const Q_DECL_OVERRIDE;
/*reimp*/ bool mapFromChart(const Span &span, const QModelIndex &idx,
- const QList<Constraint> &constraints = \
QList<Constraint>()) const; + const QList<Constraint> \
&constraints = QList<Constraint>()) const Q_DECL_OVERRIDE; /*reimp*/ void \
paintGrid(QPainter *painter,
const QRectF &sceneRect, const QRectF &exposedRect,
AbstractRowController *rowController = 0,
- QWidget *widget = Q_NULLPTR);
+ QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE;
/*reimp*/ void paintHeader(QPainter *painter,
const QRectF &headerRect, const QRectF &exposedRect,
- qreal offset, QWidget *widget = Q_NULLPTR);
+ qreal offset, QWidget *widget = Q_NULLPTR) \
Q_DECL_OVERRIDE;
protected:
virtual void paintHourScaleHeader(QPainter *painter,
diff --git a/kdgantt2/kdganttgraphicsitem.h b/kdgantt2/kdganttgraphicsitem.h
index 961ccb7..c62b2f3 100644
--- a/kdgantt2/kdganttgraphicsitem.h
+++ b/kdgantt2/kdganttgraphicsitem.h
@@ -93,19 +93,19 @@ public:
return m_endConstraints;
}
- /*reimp*/ QRectF boundingRect() const;
+ QRectF boundingRect() const Q_DECL_OVERRIDE;
/*reimp*/ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
- QWidget *widget = Q_NULLPTR);
+ QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE;
- /*reimp*/ QVariant itemChange(GraphicsItemChange, const QVariant &value);
+ QVariant itemChange(GraphicsItemChange, const QVariant &value) Q_DECL_OVERRIDE;
protected:
- /*reimp*/ void focusInEvent(QFocusEvent *event);
- /*reimp*/ void hoverMoveEvent(QGraphicsSceneHoverEvent *);
- /*reimp*/ void hoverLeaveEvent(QGraphicsSceneHoverEvent *);
- /*reimp*/ void mousePressEvent(QGraphicsSceneMouseEvent *);
- /*reimp*/ void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
- /*reimp*/ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *);
- /*reimp*/ void mouseMoveEvent(QGraphicsSceneMouseEvent *);
+ void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
+ void hoverMoveEvent(QGraphicsSceneHoverEvent *) Q_DECL_OVERRIDE;
+ void hoverLeaveEvent(QGraphicsSceneHoverEvent *) Q_DECL_OVERRIDE;
+ void mousePressEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
private:
void init();
diff --git a/kdgantt2/kdganttgraphicsscene.h b/kdgantt2/kdganttgraphicsscene.h
index 2de84dc..e144a4b 100644
--- a/kdgantt2/kdganttgraphicsscene.h
+++ b/kdgantt2/kdganttgraphicsscene.h
@@ -117,8 +117,8 @@ Q_SIGNALS:
void pressed(const QModelIndex &index);
protected:
- /*reimp*/ void helpEvent(QGraphicsSceneHelpEvent *helpEvent);
- /*reimp*/ void drawBackground(QPainter *painter, const QRectF &rect);
+ void helpEvent(QGraphicsSceneHelpEvent *helpEvent) Q_DECL_OVERRIDE;
+ void drawBackground(QPainter *painter, const QRectF &rect) Q_DECL_OVERRIDE;
public Q_SLOTS:
void setModel(QAbstractItemModel *);
diff --git a/kdgantt2/kdganttgraphicsview_p.h b/kdgantt2/kdganttgraphicsview_p.h
index fec663b..a9be8a6 100644
--- a/kdgantt2/kdganttgraphicsview_p.h
+++ b/kdgantt2/kdganttgraphicsview_p.h
@@ -48,9 +48,9 @@ public:
public Q_SLOTS:
void scrollTo(int);
protected:
- /*reimp*/ void paintEvent(QPaintEvent *ev);
+ void paintEvent(QPaintEvent *ev) Q_DECL_OVERRIDE;
#ifndef QT_NO_CONTEXTMENU
- /*reimp*/ void contextMenuEvent(QContextMenuEvent *ev);
+ void contextMenuEvent(QContextMenuEvent *ev) Q_DECL_OVERRIDE;
#endif
private:
qreal m_offset;
diff --git a/kdgantt2/kdganttlegend.h b/kdgantt2/kdganttlegend.h
index 5423212..a5eca02 100644
--- a/kdgantt2/kdganttlegend.h
+++ b/kdgantt2/kdganttlegend.h
@@ -40,15 +40,15 @@ public:
explicit Legend(QWidget *parent = Q_NULLPTR);
virtual ~Legend();
- /*reimp*/ QModelIndex indexAt(const QPoint &point) const;
- /*reimp*/ QRect visualRect(const QModelIndex &index) const;
+ QModelIndex indexAt(const QPoint &point) const Q_DECL_OVERRIDE;
+ QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE;
- /*reimp*/ void scrollTo(const QModelIndex &, ScrollHint = EnsureVisible) {}
+ void scrollTo(const QModelIndex &, ScrollHint = EnsureVisible) Q_DECL_OVERRIDE \
{}
QSize sizeHint() const Q_DECL_OVERRIDE;
QSize minimumSizeHint() const Q_DECL_OVERRIDE;
- /*reimp*/ void setModel(QAbstractItemModel *model);
+ void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
protected:
virtual QRect drawItem(QPainter *painter, const QModelIndex &index, const QPoint \
&pos = QPoint()) const; @@ -57,24 +57,24 @@ protected:
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
- /*reimp*/ int horizontalOffset() const
+ int horizontalOffset() const Q_DECL_OVERRIDE
{
return 0;
}
- /*reimp*/ bool isIndexHidden(const QModelIndex &) const
+ bool isIndexHidden(const QModelIndex &) const Q_DECL_OVERRIDE
{
return false;
}
- /*reimp*/ QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers)
+ QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) Q_DECL_OVERRIDE
{
return QModelIndex();
}
- /*reimp*/ void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) \
{}
- /*reimp*/ int verticalOffset() const
+ void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) \
Q_DECL_OVERRIDE {} + int verticalOffset() const Q_DECL_OVERRIDE
{
return 0;
}
- /*reimp*/ QRegion visualRegionForSelection(const QItemSelection &) const
+ QRegion visualRegionForSelection(const QItemSelection &) const Q_DECL_OVERRIDE
{
return QRegion();
}
diff --git a/kdgantt2/kdganttlistviewrowcontroller.h \
b/kdgantt2/kdganttlistviewrowcontroller.h index 57de30e..cbc5753 100644
--- a/kdgantt2/kdganttlistviewrowcontroller.h
+++ b/kdgantt2/kdganttlistviewrowcontroller.h
@@ -39,15 +39,15 @@ public:
ListViewRowController(QListView *lv, QAbstractProxyModel *proxy);
~ListViewRowController();
- /*reimp*/ int headerHeight() const;
- /*reimp*/ int maximumItemHeight() const;
- /*reimp*/ int totalHeight() const;
- /*reimp*/ bool isRowVisible(const QModelIndex &idx) const;
- /*reimp*/ bool isRowExpanded(const QModelIndex &idx) const;
- /*reimp*/ Span rowGeometry(const QModelIndex &idx) const;
- /*reimp*/ QModelIndex indexAt(int height) const;
- /*reimp*/ QModelIndex indexAbove(const QModelIndex &idx) const;
- /*reimp*/ QModelIndex indexBelow(const QModelIndex &idx) const;
+ int headerHeight() const Q_DECL_OVERRIDE;
+ int maximumItemHeight() const Q_DECL_OVERRIDE;
+ int totalHeight() const Q_DECL_OVERRIDE;
+ bool isRowVisible(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ bool isRowExpanded(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ Span rowGeometry(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ QModelIndex indexAt(int height) const Q_DECL_OVERRIDE;
+ QModelIndex indexAbove(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ QModelIndex indexBelow(const QModelIndex &idx) const Q_DECL_OVERRIDE;
};
}
diff --git a/kdgantt2/kdganttproxymodel.h b/kdgantt2/kdganttproxymodel.h
index e084a3e..2c10395 100644
--- a/kdgantt2/kdganttproxymodel.h
+++ b/kdgantt2/kdganttproxymodel.h
@@ -49,14 +49,14 @@ public:
bool calendarMode() const;
#endif
- /*reimp*/ QModelIndex mapFromSource(const QModelIndex &idx) const;
- /*reimp*/ QModelIndex mapToSource(const QModelIndex &proxyIdx) const;
+ QModelIndex mapFromSource(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ QModelIndex mapToSource(const QModelIndex &proxyIdx) const Q_DECL_OVERRIDE;
- /*reimp*/ int rowCount(const QModelIndex &idx) const;
- /*reimp*/ int columnCount(const QModelIndex &idx) const;
+ int rowCount(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ int columnCount(const QModelIndex &idx) const Q_DECL_OVERRIDE;
- /*reimp*/ QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) \
const;
- /*reimp*/ bool setData(const QModelIndex &idx, const QVariant &value, int role = \
Qt::EditRole); + QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) \
const Q_DECL_OVERRIDE; + bool setData(const QModelIndex &idx, const QVariant \
&value, int role = Qt::EditRole) Q_DECL_OVERRIDE; };
}
diff --git a/kdgantt2/kdganttsummaryhandlingproxymodel.h \
b/kdgantt2/kdganttsummaryhandlingproxymodel.h index d4c744b..48a6433 100644
--- a/kdgantt2/kdganttsummaryhandlingproxymodel.h
+++ b/kdgantt2/kdganttsummaryhandlingproxymodel.h
@@ -42,16 +42,16 @@ public:
QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const \
Q_DECL_OVERRIDE;
bool setData(const QModelIndex &index, const QVariant &value, int role = \
Qt::EditRole) Q_DECL_OVERRIDE;
- /*reimp*/ Qt::ItemFlags flags(const QModelIndex &idx) const;
+ Qt::ItemFlags flags(const QModelIndex &idx) const Q_DECL_OVERRIDE;
protected:
- /*reimp*/ void sourceModelReset();
- /*reimp*/ void sourceLayoutChanged();
- /*reimp*/ void sourceDataChanged(const QModelIndex &from, const QModelIndex \
&to);
- /*reimp*/ void sourceColumnsAboutToBeInserted(const QModelIndex &idx, int start, \
int end);
- /*reimp*/ void sourceColumnsAboutToBeRemoved(const QModelIndex &idx, int start, \
int end);
- /*reimp*/ void sourceRowsAboutToBeInserted(const QModelIndex &idx, int start, \
int end);
- /*reimp*/ void sourceRowsAboutToBeRemoved(const QModelIndex &, int start, int \
end); + void sourceModelReset() Q_DECL_OVERRIDE;
+ void sourceLayoutChanged() Q_DECL_OVERRIDE;
+ void sourceDataChanged(const QModelIndex &from, const QModelIndex &to) \
Q_DECL_OVERRIDE; + void sourceColumnsAboutToBeInserted(const QModelIndex &idx, int \
start, int end) Q_DECL_OVERRIDE; + void sourceColumnsAboutToBeRemoved(const \
QModelIndex &idx, int start, int end) Q_DECL_OVERRIDE; + void \
sourceRowsAboutToBeInserted(const QModelIndex &idx, int start, int end) \
Q_DECL_OVERRIDE; + void sourceRowsAboutToBeRemoved(const QModelIndex &, int start, \
int end) Q_DECL_OVERRIDE; };
}
diff --git a/kdgantt2/kdgantttreeviewrowcontroller.h \
b/kdgantt2/kdgantttreeviewrowcontroller.h index 99ab3a2..81a9f0c 100644
--- a/kdgantt2/kdgantttreeviewrowcontroller.h
+++ b/kdgantt2/kdgantttreeviewrowcontroller.h
@@ -39,15 +39,15 @@ public:
TreeViewRowController(QTreeView *tv, QAbstractProxyModel *proxy);
virtual ~TreeViewRowController();
- /*reimp*/ int headerHeight() const;
- /*reimp*/ int maximumItemHeight() const;
- /*reimp*/ int totalHeight() const;
- /*reimp*/ bool isRowVisible(const QModelIndex &idx) const;
- /*reimp*/ bool isRowExpanded(const QModelIndex &idx) const;
- /*reimp*/ Span rowGeometry(const QModelIndex &idx) const;
- /*reimp*/ QModelIndex indexAt(int height) const;
- /*reimp*/ QModelIndex indexAbove(const QModelIndex &idx) const;
- /*reimp*/ QModelIndex indexBelow(const QModelIndex &idx) const;
+ int headerHeight() const Q_DECL_OVERRIDE;
+ int maximumItemHeight() const Q_DECL_OVERRIDE;
+ int totalHeight() const Q_DECL_OVERRIDE;
+ bool isRowVisible(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ bool isRowExpanded(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ Span rowGeometry(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ QModelIndex indexAt(int height) const Q_DECL_OVERRIDE;
+ QModelIndex indexAbove(const QModelIndex &idx) const Q_DECL_OVERRIDE;
+ QModelIndex indexBelow(const QModelIndex &idx) const Q_DECL_OVERRIDE;
};
}
diff --git a/kdgantt2/kdganttview.cpp b/kdgantt2/kdganttview.cpp
index fb3f77c..ddbfd17 100644
--- a/kdgantt2/kdganttview.cpp
+++ b/kdgantt2/kdganttview.cpp
@@ -55,7 +55,7 @@ public:
{
}
- QSize sizeHint() const
+ QSize sizeHint() const Q_DECL_OVERRIDE
{
QSize s = QHeaderView::sizeHint();
s.rheight() *= 2;
diff --git a/korgac/alarmdialog.cpp b/korgac/alarmdialog.cpp
index a567b25..ca8635a 100644
--- a/korgac/alarmdialog.cpp
+++ b/korgac/alarmdialog.cpp
@@ -95,7 +95,7 @@ public:
: QTreeWidgetItem(parent), mIncidence(incidence), mNotified(false)
{
}
- bool operator<(const QTreeWidgetItem &other) const;
+ bool operator<(const QTreeWidgetItem &other) const Q_DECL_OVERRIDE;
QString mDisplayText;
diff --git a/korgac/alarmdockwindow.h b/korgac/alarmdockwindow.h
index 34fe6c6..4caccc2 100644
--- a/korgac/alarmdockwindow.h
+++ b/korgac/alarmdockwindow.h
@@ -50,7 +50,7 @@ Q_SIGNALS:
void dismissAllSignal();
protected Q_SLOTS:
- virtual void activate(const QPoint &pos);
+ void activate(const QPoint &pos) Q_DECL_OVERRIDE;
void slotQuit();
void slotSuspendAll();
void slotDismissAll();
diff --git a/ktnef/qwmf.cpp b/ktnef/qwmf.cpp
index 5dad46a..5c636cf 100644
--- a/ktnef/qwmf.cpp
+++ b/ktnef/qwmf.cpp
@@ -63,7 +63,7 @@ public:
class WinObjBrushHandle: public WinObjHandle
{
public:
- virtual void apply(QPainter &p);
+ void apply(QPainter &p) Q_DECL_OVERRIDE;
QBrush brush;
virtual ~WinObjBrushHandle() {}
};
@@ -71,7 +71,7 @@ public:
class WinObjPenHandle: public WinObjHandle
{
public:
- virtual void apply(QPainter &p);
+ void apply(QPainter &p) Q_DECL_OVERRIDE;
QPen pen;
virtual ~WinObjPenHandle() {}
};
@@ -79,7 +79,7 @@ public:
class WinObjPatternBrushHandle: public WinObjHandle
{
public:
- virtual void apply(QPainter &p);
+ void apply(QPainter &p) Q_DECL_OVERRIDE;
QBrush brush;
QImage image;
virtual ~WinObjPatternBrushHandle() {}
@@ -88,7 +88,7 @@ public:
class WinObjFontHandle: public WinObjHandle
{
public:
- virtual void apply(QPainter &p);
+ void apply(QPainter &p) Q_DECL_OVERRIDE;
QFont font;
int rotation;
virtual ~WinObjFontHandle() {}
diff --git a/libkdepim/addressline/completionorder/completionorderwidget.cpp \
b/libkdepim/addressline/completionorder/completionorderwidget.cpp index \
b1d6054..dd8e23b 100644
--- a/libkdepim/addressline/completionorder/completionorderwidget.cpp
+++ b/libkdepim/addressline/completionorder/completionorderwidget.cpp
@@ -210,7 +210,7 @@ public:
return mItem;
}
- bool operator<(const QTreeWidgetItem &other) const
+ bool operator<(const QTreeWidgetItem &other) const Q_DECL_OVERRIDE
{
const QTreeWidgetItem *otherItem = &other;
const CompletionViewItem *completionItem = static_cast<const \
CompletionViewItem *>(otherItem);
diff --git a/libkdepim/widgets/tagselectioncombo.cpp \
b/libkdepim/widgets/tagselectioncombo.cpp index 7215b9b..69eaa4f 100644
--- a/libkdepim/widgets/tagselectioncombo.cpp
+++ b/libkdepim/widgets/tagselectioncombo.cpp
@@ -29,7 +29,7 @@ class MatchingCheckableProxyModel : public KCheckableProxyModel
{
public:
MatchingCheckableProxyModel(QObject *parent = Q_NULLPTR): \
KCheckableProxyModel(parent) {}
- virtual QModelIndexList match(const QModelIndex &start, int role, const QVariant \
&value, int hits = 1, Qt::MatchFlags flags = Qt::MatchExactly) const + \
QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int \
hits = 1, Qt::MatchFlags flags = Qt::MatchExactly) const Q_DECL_OVERRIDE {
if (role == Qt::CheckStateRole) {
return selectionModel()->selectedRows();
diff --git a/libkpgp/kpgpbase.h b/libkpgp/kpgpbase.h
index b8b8880..e795818 100644
--- a/libkpgp/kpgpbase.h
+++ b/libkpgp/kpgpbase.h
@@ -137,23 +137,23 @@ public:
Base2();
virtual ~Base2();
- virtual int encrypt(Block &block, const KeyIDList &recipients);
- virtual int clearsign(Block &block, const char *passphrase);
+ int encrypt(Block &block, const KeyIDList &recipients) Q_DECL_OVERRIDE;
+ int clearsign(Block &block, const char *passphrase) Q_DECL_OVERRIDE;
virtual int encsign(Block &block, const KeyIDList &recipients,
- const char *passphrase = 0);
- virtual int decrypt(Block &block, const char *passphrase = 0);
- virtual int verify(Block &block)
+ const char *passphrase = 0) Q_DECL_OVERRIDE;
+ int decrypt(Block &block, const char *passphrase = 0) Q_DECL_OVERRIDE;
+ int verify(Block &block) Q_DECL_OVERRIDE
{
return decrypt(block, 0);
}
virtual Key *readPublicKey(const KeyID &keyID,
const bool readTrust = false,
- Key *key = 0);
- virtual KeyList publicKeys(const QStringList &patterns = QStringList());
- virtual KeyList secretKeys(const QStringList &patterns = QStringList());
- virtual QByteArray getAsciiPublicKey(const KeyID &keyID);
- virtual int signKey(const KeyID &keyID, const char *passphrase);
+ Key *key = 0) Q_DECL_OVERRIDE;
+ KeyList publicKeys(const QStringList &patterns = QStringList()) Q_DECL_OVERRIDE;
+ KeyList secretKeys(const QStringList &patterns = QStringList()) Q_DECL_OVERRIDE;
+ QByteArray getAsciiPublicKey(const KeyID &keyID) Q_DECL_OVERRIDE;
+ int signKey(const KeyID &keyID, const char *passphrase) Q_DECL_OVERRIDE;
protected:
KeyList doGetPublicKeys(const QByteArray &cmd,
@@ -172,23 +172,23 @@ public:
BaseG();
virtual ~BaseG();
- virtual int encrypt(Block &block, const KeyIDList &recipients);
- virtual int clearsign(Block &block, const char *passphrase);
+ int encrypt(Block &block, const KeyIDList &recipients) Q_DECL_OVERRIDE;
+ int clearsign(Block &block, const char *passphrase) Q_DECL_OVERRIDE;
virtual int encsign(Block &block, const KeyIDList &recipients,
- const char *passphrase = 0);
- virtual int decrypt(Block &block, const char *passphrase = 0);
- virtual int verify(Block &block)
+ const char *passphrase = 0) Q_DECL_OVERRIDE;
+ int decrypt(Block &block, const char *passphrase = 0) Q_DECL_OVERRIDE;
+ int verify(Block &block) Q_DECL_OVERRIDE
{
return decrypt(block, 0);
}
virtual Key *readPublicKey(const KeyID &keyID,
const bool readTrust = false,
- Key *key = 0);
- virtual KeyList publicKeys(const QStringList &patterns = QStringList());
- virtual KeyList secretKeys(const QStringList &patterns = QStringList());
- virtual QByteArray getAsciiPublicKey(const KeyID &keyID);
- virtual int signKey(const KeyID &keyID, const char *passphrase);
+ Key *key = 0) Q_DECL_OVERRIDE;
+ KeyList publicKeys(const QStringList &patterns = QStringList()) Q_DECL_OVERRIDE;
+ KeyList secretKeys(const QStringList &patterns = QStringList()) Q_DECL_OVERRIDE;
+ QByteArray getAsciiPublicKey(const KeyID &keyID) Q_DECL_OVERRIDE;
+ int signKey(const KeyID &keyID, const char *passphrase) Q_DECL_OVERRIDE;
private:
Key *parseKeyData(const QByteArray &output, int &offset, Key *key = 0);
@@ -202,23 +202,23 @@ public:
Base5();
virtual ~Base5();
- virtual int encrypt(Block &block, const KeyIDList &recipients);
- virtual int clearsign(Block &block, const char *passphrase);
+ int encrypt(Block &block, const KeyIDList &recipients) Q_DECL_OVERRIDE;
+ int clearsign(Block &block, const char *passphrase) Q_DECL_OVERRIDE;
virtual int encsign(Block &block, const KeyIDList &recipients,
- const char *passphrase = 0);
- virtual int decrypt(Block &block, const char *passphrase = 0);
- virtual int verify(Block &block)
+ const char *passphrase = 0) Q_DECL_OVERRIDE;
+ int decrypt(Block &block, const char *passphrase = 0) Q_DECL_OVERRIDE;
+ int verify(Block &block) Q_DECL_OVERRIDE
{
return decrypt(block, 0);
}
virtual Key *readPublicKey(const KeyID &keyID,
const bool readTrust = false,
- Key *key = 0);
- virtual KeyList publicKeys(const QStringList &patterns = QStringList());
- virtual KeyList secretKeys(const QStringList &patterns = QStringList());
- virtual QByteArray getAsciiPublicKey(const KeyID &keyID);
- virtual int signKey(const KeyID &keyID, const char *passphrase);
+ Key *key = 0) Q_DECL_OVERRIDE;
+ KeyList publicKeys(const QStringList &patterns = QStringList()) Q_DECL_OVERRIDE;
+ KeyList secretKeys(const QStringList &patterns = QStringList()) Q_DECL_OVERRIDE;
+ QByteArray getAsciiPublicKey(const KeyID &keyID) Q_DECL_OVERRIDE;
+ int signKey(const KeyID &keyID, const char *passphrase) Q_DECL_OVERRIDE;
private:
Key *parseKeyData(const QByteArray &output, int &offset, Key *key = 0);
@@ -234,22 +234,22 @@ public:
Base6();
virtual ~Base6();
- virtual int decrypt(Block &block, const char *passphrase = 0);
- virtual int verify(Block &block)
+ int decrypt(Block &block, const char *passphrase = 0) Q_DECL_OVERRIDE;
+ int verify(Block &block) Q_DECL_OVERRIDE
{
return decrypt(block, 0);
}
virtual Key *readPublicKey(const KeyID &keyID,
const bool readTrust = false,
- Key *key = 0);
- virtual KeyList publicKeys(const QStringList &patterns = QStringList());
- virtual KeyList secretKeys(const QStringList &patterns = QStringList());
+ Key *key = 0) Q_DECL_OVERRIDE;
+ KeyList publicKeys(const QStringList &patterns = QStringList()) Q_DECL_OVERRIDE;
+ KeyList secretKeys(const QStringList &patterns = QStringList()) Q_DECL_OVERRIDE;
virtual int isVersion6();
protected:
- virtual KeyList parseKeyList(const QByteArray &, bool);
+ KeyList parseKeyList(const QByteArray &, bool) Q_DECL_OVERRIDE;
private:
Key *parseKeyData(const QByteArray &output, int &offset, Key *key = 0);
diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h
index 6100545..119805e 100644
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@@ -273,14 +273,14 @@ public:
virtual ~PublicKeyRequester();
protected:
- KeyIDList keyRequestHook(Module *pgp) const;
+ KeyIDList keyRequestHook(Module *pgp) const Q_DECL_OVERRIDE;
private:
typedef KeyRequester base;
class Private;
Private *d;
protected:
- virtual void virtual_hook(int, void *);
+ void virtual_hook(int, void *) Q_DECL_OVERRIDE;
};
class LIBKPGP_EXPORT SecretKeyRequester : public KeyRequester
@@ -293,14 +293,14 @@ public:
virtual ~SecretKeyRequester();
protected:
- KeyIDList keyRequestHook(Module *pgp) const;
+ KeyIDList keyRequestHook(Module *pgp) const Q_DECL_OVERRIDE;
private:
typedef KeyRequester base;
class Private;
Private *d;
protected:
- virtual void virtual_hook(int, void *);
+ void virtual_hook(int, void *) Q_DECL_OVERRIDE;
};
// -------------------------------------------------------------------------
diff --git a/pimcommon/storageservice/webdav/webdavjob.h \
b/pimcommon/storageservice/webdav/webdavjob.h index 6f3528f..f561e7d 100644
--- a/pimcommon/storageservice/webdav/webdavjob.h
+++ b/pimcommon/storageservice/webdav/webdavjob.h
@@ -30,22 +30,22 @@ public:
explicit WebDavJob(QObject *parent = Q_NULLPTR);
~WebDavJob();
- void requestTokenAccess();
- QNetworkReply *uploadFile(const QString &filename, const QString &uploadAsName, \
const QString &destination);
- void listFolder(const QString &folder = QString());
- void accountInfo();
- void createFolder(const QString &foldername, const QString &destination);
- void shareLink(const QString &root, const QString &path);
- void createServiceFolder();
- QNetworkReply *downloadFile(const QString &name, const QString &fileId, const \
QString &destination);
- void deleteFile(const QString &filename);
- void deleteFolder(const QString &foldername);
- void renameFolder(const QString &source, const QString &destination);
- void renameFile(const QString &oldName, const QString &newName);
- void moveFolder(const QString &source, const QString &destination);
- void moveFile(const QString &source, const QString &destination);
- void copyFile(const QString &source, const QString &destination);
- void copyFolder(const QString &source, const QString &destination);
+ void requestTokenAccess() Q_DECL_OVERRIDE;
+ QNetworkReply *uploadFile(const QString &filename, const QString &uploadAsName, \
const QString &destination) Q_DECL_OVERRIDE; + void listFolder(const QString \
&folder = QString()) Q_DECL_OVERRIDE; + void accountInfo() Q_DECL_OVERRIDE;
+ void createFolder(const QString &foldername, const QString &destination) \
Q_DECL_OVERRIDE; + void shareLink(const QString &root, const QString &path) \
Q_DECL_OVERRIDE; + void createServiceFolder() Q_DECL_OVERRIDE;
+ QNetworkReply *downloadFile(const QString &name, const QString &fileId, const \
QString &destination) Q_DECL_OVERRIDE; + void deleteFile(const QString &filename) \
Q_DECL_OVERRIDE; + void deleteFolder(const QString &foldername) Q_DECL_OVERRIDE;
+ void renameFolder(const QString &source, const QString &destination) \
Q_DECL_OVERRIDE; + void renameFile(const QString &oldName, const QString &newName) \
Q_DECL_OVERRIDE; + void moveFolder(const QString &source, const QString \
&destination) Q_DECL_OVERRIDE; + void moveFile(const QString &source, const \
QString &destination) Q_DECL_OVERRIDE; + void copyFile(const QString &source, \
const QString &destination) Q_DECL_OVERRIDE; + void copyFolder(const QString \
&source, const QString &destination) Q_DECL_OVERRIDE;
void initializeToken(const QString &publicLocation, const QString \
&serviceLocation, const QString &username, const QString &password);
Q_SIGNALS:
diff --git a/storageservicemanager/storageserviceconfiguredialog.h \
b/storageservicemanager/storageserviceconfiguredialog.h index e4791bd..4e38542 100644
--- a/storageservicemanager/storageserviceconfiguredialog.h
+++ b/storageservicemanager/storageserviceconfiguredialog.h
@@ -32,10 +32,10 @@ public:
explicit StorageServiceConfigureDialog(QWidget *parent = Q_NULLPTR);
~StorageServiceConfigureDialog();
- void writeSettings();
+ void writeSettings() Q_DECL_OVERRIDE;
private:
- void loadSettings();
+ void loadSettings() Q_DECL_OVERRIDE;
QCheckBox *mCloseWallet;
};
diff --git a/storageservicemanager/storageservicemanagersettingsjob.h \
b/storageservicemanager/storageservicemanagersettingsjob.h index 10e5e83..64d9a3c \
100644
--- a/storageservicemanager/storageservicemanagersettingsjob.h
+++ b/storageservicemanager/storageservicemanagersettingsjob.h
@@ -29,19 +29,19 @@ public:
StorageServiceManagerSettingsJob();
~StorageServiceManagerSettingsJob();
- QString youSendItApiKey() const;
- QString dropboxOauthConsumerKey() const;
- QString dropboxOauthSignature() const;
- QString boxClientId() const;
- QString boxClientSecret() const;
- QString hubicClientId() const;
- QString hubicClientSecret() const;
- QString dropboxRootPath() const;
- QString oauth2RedirectUrl() const;
- QString hubicScope() const;
- QString gdriveClientId() const;
- QString gdriveClientSecret() const;
- QString defaultUploadFolder() const;
+ QString youSendItApiKey() const Q_DECL_OVERRIDE;
+ QString dropboxOauthConsumerKey() const Q_DECL_OVERRIDE;
+ QString dropboxOauthSignature() const Q_DECL_OVERRIDE;
+ QString boxClientId() const Q_DECL_OVERRIDE;
+ QString boxClientSecret() const Q_DECL_OVERRIDE;
+ QString hubicClientId() const Q_DECL_OVERRIDE;
+ QString hubicClientSecret() const Q_DECL_OVERRIDE;
+ QString dropboxRootPath() const Q_DECL_OVERRIDE;
+ QString oauth2RedirectUrl() const Q_DECL_OVERRIDE;
+ QString hubicScope() const Q_DECL_OVERRIDE;
+ QString gdriveClientId() const Q_DECL_OVERRIDE;
+ QString gdriveClientSecret() const Q_DECL_OVERRIDE;
+ QString defaultUploadFolder() const Q_DECL_OVERRIDE;
};
#endif // STORAGESERVICEMANAGERSETTINGSJOB_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic