Use Q_DECL_OVERRIDE where possible

REVIEW: 122542
This commit is contained in:
Kevin Funk 2015-02-13 13:31:30 +01:00
parent 667eb808a9
commit 7e302a5236
43 changed files with 98 additions and 98 deletions

View File

@ -30,7 +30,7 @@ class SimpleLoader : public Plasma::PluginLoader
{
protected:
virtual Plasma::Applet *internalLoadApplet(const QString &name, uint appletId = 0,
const QVariantList &args = QVariantList());
const QVariantList &args = QVariantList()) Q_DECL_OVERRIDE;
};
@ -42,8 +42,8 @@ public:
explicit SimpleCorona(QObject * parent = 0);
~SimpleCorona();
QRect screenGeometry(int) const;
int screenForContainment(const Plasma::Containment *) const;
QRect screenGeometry(int) const Q_DECL_OVERRIDE;
int screenForContainment(const Plasma::Containment *) const Q_DECL_OVERRIDE;
};
class SimpleApplet : public Plasma::Applet

View File

@ -42,8 +42,8 @@ public:
explicit DaysModel(QObject *parent = 0);
void setSourceData(QList<DayData> *data);
virtual int rowCount(const QModelIndex &parent) const;
virtual QVariant data(const QModelIndex &index, int role) const;
int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
void update();
private:

View File

@ -34,8 +34,8 @@ class CoreBindingsPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void initializeEngine(QQmlEngine *engine, const char *uri);
void registerTypes(const char *uri);
void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
};
#endif

View File

@ -176,14 +176,14 @@ public:
int roleNameToId(const QString &name);
//Reimplemented
QVariant data(const QModelIndex &index, int role) const;
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const;
int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const;
QModelIndex parent(const QModelIndex &child) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
int count() const
{

View File

@ -176,19 +176,19 @@ public:
bool fromCurrentTheme() const;
void geometryChanged(const QRectF &newGeometry,
const QRectF &oldGeometry);
const QRectF &oldGeometry) Q_DECL_OVERRIDE;
/**
* Only to be used from inside this library, is not intended to be invokable
*/
Plasma::FrameSvg *frameSvg() const;
virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
protected:
virtual void componentComplete();
void componentComplete() Q_DECL_OVERRIDE;
/// @endcond

View File

@ -64,10 +64,10 @@ public:
bool isValid() const;
QSGNode* updatePaintNode(QSGNode * oldNode, UpdatePaintNodeData * updatePaintNodeData);
QSGNode* updatePaintNode(QSGNode * oldNode, UpdatePaintNodeData * updatePaintNodeData) Q_DECL_OVERRIDE;
void geometryChanged(const QRectF &newGeometry,
const QRectF &oldGeometry);
const QRectF &oldGeometry) Q_DECL_OVERRIDE;
void componentComplete() Q_DECL_OVERRIDE;

View File

@ -81,7 +81,7 @@ public:
QSizeF naturalSize() const;
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData);
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) Q_DECL_OVERRIDE;
/// @endcond
Q_SIGNALS:

View File

@ -169,9 +169,9 @@ public Q_SLOTS:
protected:
/// @cond INTERNAL_DOCS
bool childMouseEventFilter(QQuickItem *item, QEvent *event);
void hoverEnterEvent(QHoverEvent *event);
void hoverLeaveEvent(QHoverEvent *event);
bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE;
void hoverEnterEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
void hoverLeaveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
ToolTipDialog *tooltipDialogInstance();
/// @endcond

View File

@ -55,7 +55,7 @@ public:
/**
* animate the position change if visible
*/
virtual void adjustGeometry(const QRect &geom);
void adjustGeometry(const QRect &geom) Q_DECL_OVERRIDE;
void dismiss();
void keepalive();
@ -67,10 +67,10 @@ public:
void setAnimationsEnabled(bool enabled);
protected:
void showEvent(QShowEvent *event);
void hideEvent(QHideEvent *event);
void resizeEvent(QResizeEvent *re);
bool event(QEvent *e);
void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *re) Q_DECL_OVERRIDE;
bool event(QEvent *e) Q_DECL_OVERRIDE;
private Q_SLOTS:
void valueChanged(const QVariant &value);

View File

@ -105,7 +105,7 @@ public:
Units(QObject *parent = 0);
~Units();
bool eventFilter(QObject *watched, QEvent *event);
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
/**
* @return pixel value for a grid Unit. Depends on DPI and font size.

View File

@ -83,8 +83,8 @@ class WindowThumbnail : public QQuickItem, public QAbstractNativeEventFilter
public:
WindowThumbnail(QQuickItem *parent = 0);
virtual ~WindowThumbnail();
virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long int *result);
virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData);
bool nativeEventFilter(const QByteArray &eventType, void *message, long int *result) Q_DECL_OVERRIDE;
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) Q_DECL_OVERRIDE;
uint32_t winId() const;
void setWinId(uint32_t winId);

View File

@ -51,8 +51,8 @@ class PlasmaComponentsPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void initializeEngine(QQmlEngine *engine, const char *uri);
void registerTypes(const char *uri);
void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
};
#endif

View File

@ -69,7 +69,7 @@ public:
Q_INVOKABLE void addMenuItem(QMenuItem *item);
protected:
bool event(QEvent *event);
bool event(QEvent *event) Q_DECL_OVERRIDE;
Q_SIGNALS:
void statusChanged();

View File

@ -33,7 +33,7 @@ class AppBackgroundProvider : public QQuickImageProvider
public:
AppBackgroundProvider();
~AppBackgroundProvider();
virtual QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE;
private:
Plasma::Theme *m_theme;
};

View File

@ -31,8 +31,8 @@ class PlasmaExtraComponentsPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void initializeEngine(QQmlEngine *engine, const char *uri);
void registerTypes(const char *uri);
void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
};
#endif

View File

@ -592,7 +592,7 @@ protected:
/**
* Reimplemented from QObject
*/
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
private:
/**

View File

@ -90,7 +90,7 @@ public:
/**
* Reimplemented from Applet
*/
void init();
void init() Q_DECL_OVERRIDE;
/**
* Returns the type of containment
@ -145,13 +145,13 @@ public:
* @reimp
* @sa Applet::save(KConfigGroup &)
*/
void save(KConfigGroup &group) const;
void save(KConfigGroup &group) const Q_DECL_OVERRIDE;
/**
* @reimp
* @sa Applet::restore(KConfigGroup &)
*/
void restore(KConfigGroup &group);
void restore(KConfigGroup &group) Q_DECL_OVERRIDE;
/**
* Sets wallpaper plugin.

View File

@ -275,7 +275,7 @@ protected Q_SLOTS:
/**
* @reimp from QObject
*/
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
private:
friend class SignalRelay;

View File

@ -390,7 +390,7 @@ protected:
/**
* Reimplemented from QObject
**/
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
/**
* Sets the icon for this data engine

View File

@ -110,7 +110,7 @@ public:
* Loads a new Svg
* @param imagePath the new file
*/
Q_INVOKABLE void setImagePath(const QString &path);
Q_INVOKABLE void setImagePath(const QString &path) Q_DECL_OVERRIDE;
/**
* Sets what borders should be painted

View File

@ -124,7 +124,7 @@ Q_SIGNALS:
void dataUpdated(const QString &, const Plasma::DataEngine::Data &);
protected:
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
};
} // Plasma namespace

View File

@ -78,7 +78,7 @@ protected:
/**
* Reimplemented from QObject
**/
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
private:
/**

View File

@ -32,8 +32,8 @@ class ChangeableMainScriptPackage : public KPackage::PackageStructure
{
Q_OBJECT
public:
void initPackage(KPackage::Package *package);
void pathChanged(KPackage::Package *package);
void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE;
void pathChanged(KPackage::Package *package) Q_DECL_OVERRIDE;
protected:
virtual QString mainScriptConfigKey() const;
@ -43,35 +43,35 @@ class GenericPackage : public ChangeableMainScriptPackage
{
Q_OBJECT
public:
void initPackage(KPackage::Package *package);
void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE;
};
class PlasmoidPackage : public GenericPackage
{
Q_OBJECT
public:
void initPackage(KPackage::Package *package);
void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE;
};
class DataEnginePackage : public ChangeableMainScriptPackage
{
Q_OBJECT
public:
void initPackage(KPackage::Package *package);
void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE;
};
class ThemePackage : public KPackage::PackageStructure
{
Q_OBJECT
public:
void initPackage(KPackage::Package *package);
void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE;
};
class ContainmentActionsPackage : public ChangeableMainScriptPackage
{
Q_OBJECT
public:
void initPackage(KPackage::Package *package);
void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE;
};
} // namespace Plasma

View File

@ -37,12 +37,12 @@ public:
~PackageStructureWrapper();
virtual void initPackage(KPackage::Package *package);
void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE;
virtual void pathChanged(KPackage::Package *package);
void pathChanged(KPackage::Package *package) Q_DECL_OVERRIDE;
virtual KJob *install(KPackage::Package *package, const QString &archivePath, const QString &packageRoot);
virtual KJob *uninstall(KPackage::Package *package, const QString &packageRoot);
KJob *install(KPackage::Package *package, const QString &archivePath, const QString &packageRoot) Q_DECL_OVERRIDE;
KJob *uninstall(KPackage::Package *package, const QString &packageRoot) Q_DECL_OVERRIDE;
private:
QPointer<Plasma::PackageStructure> m_struct;

View File

@ -42,7 +42,7 @@ public:
{
}
void start()
void start() Q_DECL_OVERRIDE
{
setErrorText(i18nc("Error message, tried to start an invalid service", "Invalid (null) service, can not perform any operations."));
emitResult();
@ -59,7 +59,7 @@ public:
setName("NullService");
}
ServiceJob *createJob(const QString &operation, QVariantMap &)
ServiceJob *createJob(const QString &operation, QVariantMap &) Q_DECL_OVERRIDE
{
return new NullServiceJob(destination(), operation, this);
}

View File

@ -42,7 +42,7 @@ public:
~StorageJob();
void setData(const QVariantMap &data);
QVariantMap data() const;
void start();
void start() Q_DECL_OVERRIDE;
QString clientName() const;
protected Q_SLOTS:
@ -66,7 +66,7 @@ public:
~Storage();
protected:
Plasma::ServiceJob *createJob(const QString &operation, QVariantMap &parameters);
Plasma::ServiceJob *createJob(const QString &operation, QVariantMap &parameters) Q_DECL_OVERRIDE;
private:
QString m_clientName;

View File

@ -36,7 +36,7 @@ public:
StorageThread(QObject *parent = 0);
~StorageThread();
void run();
void run() Q_DECL_OVERRIDE;
static Plasma::StorageThread *self();

View File

@ -117,7 +117,7 @@ public:
KColorScheme colorScheme;
KColorScheme buttonColorScheme;
KColorScheme viewColorScheme;
bool eventFilter(QObject *watched, QEvent *event);
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
KConfigGroup cfg;
QString defaultWallpaperTheme;
QString defaultWallpaperSuffix;

View File

@ -147,14 +147,14 @@ protected:
/**
* @return absolute path to the main script file for this plasmoid
*/
QString mainScript() const;
QString mainScript() const Q_DECL_OVERRIDE;
/**
* @return the Package associated with this plasmoid which can
* be used to request resources, such as images and
* interface files.
*/
Package package() const;
Package package() const Q_DECL_OVERRIDE;
/**
* @return the KPluginInfo associated with this plasmoid

View File

@ -101,14 +101,14 @@ protected:
/**
* @return absolute path to the main script file for this plasmoid
*/
QString mainScript() const;
QString mainScript() const Q_DECL_OVERRIDE;
/**
* @return the Package associated with this plasmoid which can
* be used to request resources, such as images and
* interface files.
*/
Package package() const;
Package package() const Q_DECL_OVERRIDE;
/**
* @return the KPluginInfo associated with this plasmoid

View File

@ -105,7 +105,7 @@ public:
* Default implementation of start, which simply sets the results to false.
* This makes it easy to create a "failure" job.
*/
Q_INVOKABLE virtual void start();
Q_INVOKABLE void start() Q_DECL_OVERRIDE;
protected:
/**

View File

@ -440,7 +440,7 @@ Q_SIGNALS:
private:
SvgPrivate *const d;
bool eventFilter(QObject *watched, QEvent *event);
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
Q_PRIVATE_SLOT(d, void themeChanged())
Q_PRIVATE_SLOT(d, void colorsChanged())

View File

@ -146,8 +146,8 @@ protected:
KDeclarative::QmlObject *qmlObject();
//Reimplementation
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
virtual void itemChange(ItemChange change, const ItemChangeData &value);
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE;
private:
AppletQuickItemPrivate *const d;

View File

@ -92,8 +92,8 @@ public:
{
return rowCount();
}
virtual int rowCount(const QModelIndex &index = QModelIndex()) const;
virtual QVariant data(const QModelIndex &, int) const;
int rowCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &, int) const Q_DECL_OVERRIDE;
/**
* @param row the row for which the data will be returned

View File

@ -77,8 +77,8 @@ Q_SIGNALS:
void appletGlobalShortcutChanged();
protected:
void hideEvent(QHideEvent *ev);
void resizeEvent(QResizeEvent *re);
void hideEvent(QHideEvent *ev) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *re) Q_DECL_OVERRIDE;
private:
ConfigViewPrivate *const d;

View File

@ -229,14 +229,14 @@ protected:
virtual void adjustGeometry(const QRect &geom);
//Reimplementations
virtual void classBegin();
virtual void componentComplete();
virtual void resizeEvent(QResizeEvent *re);
virtual void focusInEvent(QFocusEvent *ev);
virtual void focusOutEvent(QFocusEvent *ev);
virtual void showEvent(QShowEvent *event);
virtual void hideEvent(QHideEvent *event);
virtual bool event(QEvent *event);
void classBegin() Q_DECL_OVERRIDE;
void componentComplete() Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *re) Q_DECL_OVERRIDE;
void focusInEvent(QFocusEvent *ev) Q_DECL_OVERRIDE;
void focusOutEvent(QFocusEvent *ev) Q_DECL_OVERRIDE;
void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE;
bool event(QEvent *event) Q_DECL_OVERRIDE;
private:
friend class DialogPrivate;

View File

@ -53,7 +53,7 @@ public:
void removeAllowedPath(const QString &path);
QStringList allowedPaths() const;
virtual QUrl intercept(const QUrl &path, QQmlAbstractUrlInterceptor::DataType type);
QUrl intercept(const QUrl &path, QQmlAbstractUrlInterceptor::DataType type) Q_DECL_OVERRIDE;
static inline QByteArray prefixForType(QQmlAbstractUrlInterceptor::DataType type, const QString &fileName)
{

View File

@ -28,19 +28,19 @@
class LookAndFeelPackage : public Plasma::PackageStructure
{
public:
void initPackage(Plasma::Package *package);
void initPackage(Plasma::Package *package) Q_DECL_OVERRIDE;
};
class QmlWallpaperPackage : public Plasma::PackageStructure
{
public:
void initPackage(Plasma::Package *package);
void initPackage(Plasma::Package *package) Q_DECL_OVERRIDE;
};
class LayoutTemplatePackage : public Plasma::PackageStructure
{
public:
void initPackage(Plasma::Package *package);
void initPackage(Plasma::Package *package) Q_DECL_OVERRIDE;
};
#endif // LOOKANDFEELPACKAGE_H

View File

@ -33,7 +33,7 @@ public:
static void init();
protected:
Plasma::Package internalLoadPackage(const QString &packageFormat, const QString &specialization);
Plasma::Package internalLoadPackage(const QString &packageFormat, const QString &specialization) Q_DECL_OVERRIDE;
/**
These members are actually file-static in the .cpp because binary compat must be preserved

View File

@ -362,11 +362,11 @@ Q_SIGNALS:
void globalShortcutChanged();
protected Q_SLOTS:
virtual void init();
void init() Q_DECL_OVERRIDE;
protected:
bool event(QEvent *event);
bool eventFilter(QObject *watched, QEvent *event);
bool event(QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
private Q_SLOTS:
void destroyedChanged(bool destroyed);

View File

@ -150,10 +150,10 @@ public:
}
protected:
void init();
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void wheelEvent(QWheelEvent *event);
void init() Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
void addAppletActions(QMenu &desktopMenu, Plasma::Applet *applet, QEvent *event);
void addContainmentActions(QMenu &desktopMenu, QEvent *event);

View File

@ -38,15 +38,15 @@ public:
QString filePath(const QString &type, const QString &file) const;
QList<QAction *> contextualActions();
QList<QAction *> contextualActions() Q_DECL_OVERRIDE;
void constraintsEvent(Plasma::Types::Constraints constraints);
void constraintsEvent(Plasma::Types::Constraints constraints) Q_DECL_OVERRIDE;
public Q_SLOTS:
void executeAction(const QString &name);
protected:
bool init();
bool init() Q_DECL_OVERRIDE;
Q_SIGNALS:
void formFactorChanged();

View File

@ -41,7 +41,7 @@ public:
protected:
void init();
bool sourceRequestEvent(const QString &source);
bool sourceRequestEvent(const QString &source) Q_DECL_OVERRIDE;
};
#endif // __TESTDATAENGINE_H__