General Module Cleanups

Removed reference to bsquask
nullptr instead of 0
explicit override keyword for virtuals
Q_SLOTS and Q_SIGNALS instead of keywords

Change-Id: I7dd96fa66003c52fe2d26decca73224b70896baa
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

17 files changed, 34 insertions, 34 deletions

diff --git a/src/gamepad/qgamepadbackend_p.h b/src/gamepad/qgamepadbackend_p.h
index 0d1f0a6..0ce46de 100644
--- a/src/gamepad/qgamepadbackend_p.h
+++ b/src/gamepad/qgamepadbackend_p.h
@@ -83,7 +83,7 @@ public:
     };
 
 public:
-    explicit QGamepadBackend(QObject *parent = 0);
+    explicit QGamepadBackend(QObject *parent = nullptr);
     virtual bool isConfigurationNeeded(int deviceId);
     virtual void resetConfiguration(int deviceId);
     virtual bool configureButton(int deviceId, QGamepadManager::GamepadButton button);
@@ -93,11 +93,11 @@ public:
     virtual void saveSettings(int productId, const QVariant &value);
     virtual QVariant readSettings(int productId);
 
-public slots:
+public Q_SLOTS:
     virtual bool start();
     virtual void stop();
 
-signals:
+Q_SIGNALS:
     void buttonConfigured(int deviceId, QGamepadManager::GamepadButton button);
     void axisConfigured(int deviceId, QGamepadManager::GamepadAxis axis);
     void configurationCanceled(int deviceId);
diff --git a/src/gamepad/qgamepadbackendplugin_p.h b/src/gamepad/qgamepadbackendplugin_p.h
index 6bb680f..19f53c8 100644
--- a/src/gamepad/qgamepadbackendplugin_p.h
+++ b/src/gamepad/qgamepadbackendplugin_p.h
@@ -57,13 +57,13 @@ QT_BEGIN_NAMESPACE
 
 class QGamepadBackend;
 
-#define QtGamepadBackendFactoryInterface_iid "com.bsquask.Qt.Gamepad.QtGamepadBackendFactoryInterface.5.5"
+#define QtGamepadBackendFactoryInterface_iid "org.qt-project.Qt.Gamepad.QtGamepadBackendFactoryInterface.5.9"
 
 class Q_GAMEPAD_EXPORT QGamepadBackendPlugin : public QObject
 {
     Q_OBJECT
 public:
-    explicit QGamepadBackendPlugin(QObject *parent = 0);
+    explicit QGamepadBackendPlugin(QObject *parent = nullptr);
     ~QGamepadBackendPlugin();
 
     virtual QGamepadBackend *create(const QString &key, const QStringList &paramList) = 0;
diff --git a/src/gamepad/qgamepadkeynavigation.cpp b/src/gamepad/qgamepadkeynavigation.cpp
index a317ed0..2eac092 100644
--- a/src/gamepad/qgamepadkeynavigation.cpp
+++ b/src/gamepad/qgamepadkeynavigation.cpp
@@ -76,7 +76,7 @@ void QGamepadKeyNavigationPrivate::sendGeneratedKeyEvent(QKeyEvent *event)
         return;
     }
     const QGuiApplication *app = qApp;
-    QWindow *focusWindow = app ? app->focusWindow() : 0;
+    QWindow *focusWindow = app ? app->focusWindow() : nullptr;
     if (focusWindow)
         QGuiApplication::sendEvent(focusWindow, event);
 }
diff --git a/src/gamepad/qgamepadmanager.cpp b/src/gamepad/qgamepadmanager.cpp
index 51912ad..4d5c596 100644
--- a/src/gamepad/qgamepadmanager.cpp
+++ b/src/gamepad/qgamepadmanager.cpp
@@ -127,7 +127,7 @@ void QGamepadManagerPrivate::loadBackend()
 }
 
 QGamepadManager::QGamepadManager() :
-    QObject(*new QGamepadManagerPrivate(), 0)
+    QObject(*new QGamepadManagerPrivate(), nullptr)
 {
     Q_D(QGamepadManager);
 
diff --git a/src/imports/gamepad/qgamepadmouseitem.cpp b/src/imports/gamepad/qgamepadmouseitem.cpp
index b8144d7..a7a4a17 100644
--- a/src/imports/gamepad/qgamepadmouseitem.cpp
+++ b/src/imports/gamepad/qgamepadmouseitem.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 QGamepadMouseItem::QGamepadMouseItem(QQuickItem *parent)
     : QQuickItem(parent)
     , m_active(false)
-    , m_gamepad(0)
+    , m_gamepad(nullptr)
     , m_joystick(QGamepadMouseItem::LeftStick)
     , m_deadZoneSize(0.1)
 {
diff --git a/src/imports/gamepad/qgamepadmouseitem.h b/src/imports/gamepad/qgamepadmouseitem.h
index d5eb1e7..b58d9e1 100644
--- a/src/imports/gamepad/qgamepadmouseitem.h
+++ b/src/imports/gamepad/qgamepadmouseitem.h
@@ -62,7 +62,7 @@ public:
         Both
     };
 
-    explicit QGamepadMouseItem(QQuickItem *parent = 0);
+    explicit QGamepadMouseItem(QQuickItem *parent = nullptr);
 
     bool active() const;
     QGamepad* gamepad() const;
diff --git a/src/plugins/gamepads/android/src/main.cpp b/src/plugins/gamepads/android/src/main.cpp
index 20cc646..ddd9261 100644
--- a/src/plugins/gamepads/android/src/main.cpp
+++ b/src/plugins/gamepads/android/src/main.cpp
@@ -46,7 +46,7 @@ class QAndroidGamepadBackendPlugin : public QGamepadBackendPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtGamepadBackendFactoryInterface_iid FILE "android.json")
 public:
-    QGamepadBackend *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE;
+    QGamepadBackend *create(const QString &key, const QStringList &paramList) override;
 };
 
 QGamepadBackend *QAndroidGamepadBackendPlugin::create(const QString &key, const QStringList &paramList) {
diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h b/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h
index 4ef6552..fdd1619 100644
--- a/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h
+++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h
@@ -53,7 +53,7 @@ class QAndroidGamepadBackend : public QGamepadBackend, public QtAndroidPrivate::
 {
     Q_OBJECT
 public:
-    explicit QAndroidGamepadBackend(QObject *parent = 0);
+    explicit QAndroidGamepadBackend(QObject *parent = nullptr);
     ~QAndroidGamepadBackend();
 
     void addDevice(int deviceId);
diff --git a/src/plugins/gamepads/darwin/main.cpp b/src/plugins/gamepads/darwin/main.cpp
index f1dc667..0eb4dff 100644
--- a/src/plugins/gamepads/darwin/main.cpp
+++ b/src/plugins/gamepads/darwin/main.cpp
@@ -46,7 +46,7 @@ class QDarwinGamepadBackendPlugin : public QGamepadBackendPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtGamepadBackendFactoryInterface_iid FILE "darwin.json")
 public:
-    QGamepadBackend *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE;
+    QGamepadBackend *create(const QString &key, const QStringList &paramList) override;
 };
 
 QGamepadBackend *QDarwinGamepadBackendPlugin::create(const QString &key, const QStringList &paramList) {
diff --git a/src/plugins/gamepads/darwin/qdarwingamepadbackend_p.h b/src/plugins/gamepads/darwin/qdarwingamepadbackend_p.h
index 632d5b3..8b21a15 100644
--- a/src/plugins/gamepads/darwin/qdarwingamepadbackend_p.h
+++ b/src/plugins/gamepads/darwin/qdarwingamepadbackend_p.h
@@ -51,14 +51,14 @@ class QDarwinGamepadBackend : public QGamepadBackend
 {
     Q_OBJECT
 public:
-    explicit QDarwinGamepadBackend(QObject *parent = 0);
+    explicit QDarwinGamepadBackend(QObject *parent = nullptr);
     ~QDarwinGamepadBackend();
 
 protected:
-    bool start();
-    void stop();
+    bool start() override;
+    void stop() override;
 
-public slots:
+public Q_SLOTS:
     void darwinGamepadAdded(int index);
     void darwinGamepadRemoved(int index);
     void darwinGamepadAxisMoved(int index, QGamepadManager::GamepadAxis axis, double value);
diff --git a/src/plugins/gamepads/evdev/main.cpp b/src/plugins/gamepads/evdev/main.cpp
index 64f6952..7c6ce57 100644
--- a/src/plugins/gamepads/evdev/main.cpp
+++ b/src/plugins/gamepads/evdev/main.cpp
@@ -46,7 +46,7 @@ class QEvdevGamepadBackendPlugin : public QGamepadBackendPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtGamepadBackendFactoryInterface_iid FILE "evdev.json")
 public:
-    QGamepadBackend *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE;
+    QGamepadBackend *create(const QString &key, const QStringList &paramList) override;
 };
 
 QGamepadBackend *QEvdevGamepadBackendPlugin::create(const QString &key, const QStringList &paramList)
diff --git a/src/plugins/gamepads/evdev/qevdevgamepadbackend_p.h b/src/plugins/gamepads/evdev/qevdevgamepadbackend_p.h
index 2b3f72a..68e011c 100644
--- a/src/plugins/gamepads/evdev/qevdevgamepadbackend_p.h
+++ b/src/plugins/gamepads/evdev/qevdevgamepadbackend_p.h
@@ -65,7 +65,7 @@ public:
     bool configureAxis(QGamepadManager::GamepadAxis axis);
     bool setCancelConfigureButton(QGamepadManager::GamepadButton button);
 
-private slots:
+private Q_SLOTS:
     void readData();
 
 private:
@@ -113,13 +113,13 @@ class QEvdevGamepadBackend : public QGamepadBackend
 
 public:
     QEvdevGamepadBackend();
-    bool start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void resetConfiguration(int deviceId) Q_DECL_OVERRIDE;
-    bool isConfigurationNeeded(int deviceId) Q_DECL_OVERRIDE;
-    bool configureButton(int deviceId, QGamepadManager::GamepadButton button) Q_DECL_OVERRIDE;
-    bool configureAxis(int deviceId, QGamepadManager::GamepadAxis axis) Q_DECL_OVERRIDE;
-    bool setCancelConfigureButton(int deviceId, QGamepadManager::GamepadButton button) Q_DECL_OVERRIDE;
+    bool start() override;
+    void stop() override;
+    void resetConfiguration(int deviceId) override;
+    bool isConfigurationNeeded(int deviceId) override;
+    bool configureButton(int deviceId, QGamepadManager::GamepadButton button) override;
+    bool configureAxis(int deviceId, QGamepadManager::GamepadAxis axis) override;
+    bool setCancelConfigureButton(int deviceId, QGamepadManager::GamepadButton button) override;
 
 private slots:
     void handleAddedDevice(const QString &device);
diff --git a/src/plugins/gamepads/sdl2/main.cpp b/src/plugins/gamepads/sdl2/main.cpp
index cc28ad2..a2adf69 100644
--- a/src/plugins/gamepads/sdl2/main.cpp
+++ b/src/plugins/gamepads/sdl2/main.cpp
@@ -46,7 +46,7 @@ class QSdl2GamepadBackendPlugin : public QGamepadBackendPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtGamepadBackendFactoryInterface_iid FILE "sdl2.json")
 public:
-    QGamepadBackend *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE;
+    QGamepadBackend *create(const QString &key, const QStringList &paramList) override;
 };
 
 QGamepadBackend *QSdl2GamepadBackendPlugin::create(const QString &key, const QStringList &paramList) {
diff --git a/src/plugins/gamepads/sdl2/qsdlgamepadbackend_p.h b/src/plugins/gamepads/sdl2/qsdlgamepadbackend_p.h
index 5991ac1..daff498 100644
--- a/src/plugins/gamepads/sdl2/qsdlgamepadbackend_p.h
+++ b/src/plugins/gamepads/sdl2/qsdlgamepadbackend_p.h
@@ -51,15 +51,15 @@ class QSdlGamepadBackend : public QGamepadBackend
 {
     Q_OBJECT
 public:
-    explicit QSdlGamepadBackend(QObject *parent = 0);
+    explicit QSdlGamepadBackend(QObject *parent = nullptr);
     ~QSdlGamepadBackend();
 
-private slots:
+private Q_SLOTS:
     void pumpSdlEventLoop();
 
 protected:
-    bool start();
-    void stop();
+    bool start() override;
+    void stop() override;
 
 private:
     QGamepadManager::GamepadButton translateButton(int button);
diff --git a/src/plugins/gamepads/xinput/main.cpp b/src/plugins/gamepads/xinput/main.cpp
index a5eb0f8..28ce133 100644
--- a/src/plugins/gamepads/xinput/main.cpp
+++ b/src/plugins/gamepads/xinput/main.cpp
@@ -46,7 +46,7 @@ class QXInputGamepadBackendPlugin : public QGamepadBackendPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtGamepadBackendFactoryInterface_iid FILE "xinput.json")
 public:
-    QGamepadBackend *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE;
+    QGamepadBackend *create(const QString &key, const QStringList &paramList) override;
 };
 
 QGamepadBackend *QXInputGamepadBackendPlugin::create(const QString &key, const QStringList &paramList)
diff --git a/src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp b/src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp
index 97680cb..e9a04a4 100644
--- a/src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp
+++ b/src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp
@@ -91,7 +91,7 @@ class QXInputThread : public QThread
 {
 public:
     QXInputThread(QXInputGamepadBackend *backend);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
     void signalQuit() { m_quit.fetchAndStoreAcquire(1); }
 
 private:
diff --git a/src/plugins/gamepads/xinput/qxinputgamepadbackend_p.h b/src/plugins/gamepads/xinput/qxinputgamepadbackend_p.h
index 42f7a4a..b575ca1 100644
--- a/src/plugins/gamepads/xinput/qxinputgamepadbackend_p.h
+++ b/src/plugins/gamepads/xinput/qxinputgamepadbackend_p.h
@@ -50,8 +50,8 @@ class QXInputGamepadBackend : public QGamepadBackend
 
 public:
     QXInputGamepadBackend();
-    bool start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    bool start() override;
+    void stop() override;
 
 private:
     QXInputThread *m_thread;