whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing "override" specifiers 

Annotate this function with 'override' or (rarely) 'final'
[modernize-use-override]

Change-Id: If31ab03b46f885e4984ba3aaaf1ad8d46aae9d9c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Alessandro Portale 2019-02-11 00:02:37 +01:00
parent 6bad49308a
commit e1d42a40a2
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/corelib/codecs/qbig5codec_p.h
View File

@ -69,12 +69,12 @@ public:
static QList<QByteArray> _aliases();
static int _mibEnum();
QByteArray name() const { return _name(); }
QList<QByteArray> aliases() const { return _aliases(); }
int mibEnum() const { return _mibEnum(); }
QByteArray name() const override { return _name(); }
QList<QByteArray> aliases() const override { return _aliases(); }
int mibEnum() const override { return _mibEnum(); }
QString convertToUnicode(const char *, int, ConverterState *) const;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const;
QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
};
class QBig5hkscsCodec : public QTextCodec {
@ -83,12 +83,12 @@ public:
static QList<QByteArray> _aliases() { return QList<QByteArray>(); }
static int _mibEnum();
QByteArray name() const { return _name(); }
QList<QByteArray> aliases() const { return _aliases(); }
int mibEnum() const { return _mibEnum(); }
QByteArray name() const override { return _name(); }
QList<QByteArray> aliases() const override { return _aliases(); }
int mibEnum() const override { return _mibEnum(); }
QString convertToUnicode(const char *, int, ConverterState *) const;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const;
QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
};
QT_END_NAMESPACE

6
src/corelib/io/qfilesystemwatcher_win_p.h
View File

@ -77,8 +77,8 @@ public:
explicit QWindowsFileSystemWatcherEngine(QObject *parent);
~QWindowsFileSystemWatcherEngine();
QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories);
QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories);
QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) override;
QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) override;
class Handle
{
@ -154,7 +154,7 @@ public:
QWindowsFileSystemWatcherEngineThread();
~QWindowsFileSystemWatcherEngineThread();
void run();
void run() override;
void stop();
void wakeup();

34
src/corelib/kernel/qeventdispatcher_win_p.h
View File

@ -80,31 +80,31 @@ public:
explicit QEventDispatcherWin32(QObject *parent = 0);
~QEventDispatcherWin32();
bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags);
bool hasPendingEvents();
bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) override;
bool hasPendingEvents() override;
void registerSocketNotifier(QSocketNotifier *notifier);
void unregisterSocketNotifier(QSocketNotifier *notifier);
void registerSocketNotifier(QSocketNotifier *notifier) override;
void unregisterSocketNotifier(QSocketNotifier *notifier) override;
void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object);
bool unregisterTimer(int timerId);
bool unregisterTimers(QObject *object);
QList<TimerInfo> registeredTimers(QObject *object) const;
void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) override;
bool unregisterTimer(int timerId) override;
bool unregisterTimers(QObject *object) override;
QList<TimerInfo> registeredTimers(QObject *object) const override;
bool registerEventNotifier(QWinEventNotifier *notifier);
void unregisterEventNotifier(QWinEventNotifier *notifier);
bool registerEventNotifier(QWinEventNotifier *notifier) override;
void unregisterEventNotifier(QWinEventNotifier *notifier) override;
void activateEventNotifiers();
int remainingTime(int timerId);
int remainingTime(int timerId) override;
void wakeUp();
void interrupt();
void flush();
void wakeUp() override;
void interrupt() override;
void flush() override;
void startingUp();
void closingDown();
void startingUp() override;
void closingDown() override;
bool event(QEvent *e);
bool event(QEvent *e) override;
HWND internalHwnd();

4
src/widgets/itemviews/qitemeditorfactory.h
View File

@ -66,8 +66,8 @@ class QItemEditorCreator : public QItemEditorCreatorBase
{
public:
inline explicit QItemEditorCreator(const QByteArray &valuePropertyName);
inline QWidget *createWidget(QWidget *parent) const { return new T(parent); }
inline QByteArray valuePropertyName() const { return propertyName; }
inline QWidget *createWidget(QWidget *parent) const override { return new T(parent); }
inline QByteArray valuePropertyName() const override { return propertyName; }
private:
QByteArray propertyName;