Use override

This commit is contained in:
Jonas Kvinge
2020-06-15 21:55:05 +02:00
parent 72ede666d4
commit 651020388d
271 changed files with 1199 additions and 1231 deletions

View File

@@ -40,7 +40,7 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter {
public:
explicit GlobalShortcut(QObject *parent = nullptr);
explicit GlobalShortcut(QKeySequence shortcut, GlobalShortcutBackend *backend, QObject *parent = nullptr);
~GlobalShortcut();
~GlobalShortcut() override;
GlobalShortcutBackend *backend() const { return backend_; }
QKeySequence shortcut() const { return shortcut_; }
@@ -61,7 +61,7 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter {
bool registerShortcut(quint32 native_key, quint32 native_mods);
bool unregisterShortcut(quint32 native_key, quint32 native_mods);
bool nativeEventFilter(const QByteArray &eventtype, void *message, long *result);
bool nativeEventFilter(const QByteArray &eventtype, void *message, long *result) override;
static GlobalShortcut *initialized_;
static QHash<QPair<quint32, quint32>, GlobalShortcut*> internal_shortcuts_;

View File

@@ -48,8 +48,6 @@ GlobalShortcutBackendGSD::GlobalShortcutBackendGSD(GlobalShortcuts *parent)
interface_(nullptr),
is_connected_(false) {}
GlobalShortcutBackendGSD::~GlobalShortcutBackendGSD(){}
bool GlobalShortcutBackendGSD::DoRegister() {
qLog(Debug) << "Registering";

View File

@@ -37,7 +37,6 @@ class GlobalShortcutBackendGSD : public GlobalShortcutBackend {
public:
explicit GlobalShortcutBackendGSD(GlobalShortcuts *parent);
~GlobalShortcutBackendGSD();
static const char *kGsdService;
static const char *kGsdService2;
@@ -45,8 +44,8 @@ class GlobalShortcutBackendGSD : public GlobalShortcutBackend {
protected:
bool RegisterInNewThread() const { return true; }
bool DoRegister();
void DoUnregister();
bool DoRegister() override;
void DoUnregister() override;
private slots:
void RegisterFinished(QDBusPendingCallWatcher *watcher);

View File

@@ -39,11 +39,11 @@ class GlobalShortcutBackendSystem : public GlobalShortcutBackend {
public:
explicit GlobalShortcutBackendSystem(GlobalShortcuts *parent = nullptr);
~GlobalShortcutBackendSystem();
~GlobalShortcutBackendSystem() override;
protected:
bool DoRegister();
void DoUnregister();
bool DoRegister() override;
void DoUnregister() override;
private:

View File

@@ -33,7 +33,6 @@ class GlobalShortcutBackend : public QObject {
public:
explicit GlobalShortcutBackend(GlobalShortcuts *parent = nullptr);
virtual ~GlobalShortcutBackend() {}
bool is_active() const { return active_; }

View File

@@ -48,14 +48,14 @@ class GlobalShortcutGrabber : public QDialog {
public:
explicit GlobalShortcutGrabber(QWidget *parent = nullptr);
~GlobalShortcutGrabber();
~GlobalShortcutGrabber() override;
QKeySequence GetKey(const QString &name);
protected:
bool event(QEvent *);
void showEvent(QShowEvent *);
void hideEvent(QHideEvent *);
bool event(QEvent *e) override;
void showEvent(QShowEvent *e) override;
void hideEvent(QHideEvent *e) override;
void grabKeyboard();
void releaseKeyboard();