aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-05-11 16:53:45 +0200
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-05-11 16:54:01 +0200
commit505c26b074b22d36662bbdfa184624def58325a4 (patch)
tree43e862a58f72a907f0e3e9024c5a2ef195fcd244
parent298e4e678b2fa6dc62f5a90e0b27caa954aaed66 (diff)
Use macros for slots/signals
-rw-r--r--src/gamepad/qgamepad.h6
-rw-r--r--src/gamepad/qgamepadkeynavigation.h6
-rw-r--r--src/gamepad/qgamepadmanager.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gamepad/qgamepad.h b/src/gamepad/qgamepad.h
index e561ad3..bc797bd 100644
--- a/src/gamepad/qgamepad.h
+++ b/src/gamepad/qgamepad.h
@@ -103,7 +103,7 @@ public:
bool buttonRight() const;
bool buttonGuide() const;
-signals:
+Q_SIGNALS:
void indexChanged(int value);
void connectedChanged(bool value);
@@ -130,11 +130,11 @@ signals:
void buttonRightChanged(bool value);
void buttonGuideChanged(bool value);
-public slots:
+public Q_SLOTS:
void setIndex(int number);
-private slots:
+private Q_SLOTS:
void setConnected(bool isConnected);
void handleGamepadConnected(int index);
diff --git a/src/gamepad/qgamepadkeynavigation.h b/src/gamepad/qgamepadkeynavigation.h
index 03ea422..90fe47c 100644
--- a/src/gamepad/qgamepadkeynavigation.h
+++ b/src/gamepad/qgamepadkeynavigation.h
@@ -94,7 +94,7 @@ public:
Qt::Key buttonL3Key() const;
Qt::Key buttonR3Key() const;
-signals:
+Q_SIGNALS:
void activeChanged(bool isActive);
void gamepadChanged(QGamepad *gamepad);
@@ -116,7 +116,7 @@ signals:
void buttonL3KeyChanged(Qt::Key key);
void buttonR3KeyChanged(Qt::Key key);
-public slots:
+public Q_SLOTS:
void setActive(bool isActive);
void setGamepad(QGamepad *gamepad);
@@ -138,7 +138,7 @@ public slots:
void setButtonL3Key(Qt::Key key);
void setButtonR3Key(Qt::Key key);
-private slots:
+private Q_SLOTS:
void processGamepadButtonPressEvent(int index, QGamepadManager::GamepadButton button, double value);
void procressGamepadButtonReleaseEvent(int index, QGamepadManager::GamepadButton button);
diff --git a/src/gamepad/qgamepadmanager.h b/src/gamepad/qgamepadmanager.h
index 49eaa94..d49bc71 100644
--- a/src/gamepad/qgamepadmanager.h
+++ b/src/gamepad/qgamepadmanager.h
@@ -89,14 +89,14 @@ public:
bool isGamepadConnected(int index);
-signals:
+Q_SIGNALS:
void gamepadConnected(int index);
void gamepadDisconnected(int index);
void gamepadAxisEvent(int index, QGamepadManager::GamepadAxis axis, double value);
void gamepadButtonPressEvent(int index, QGamepadManager::GamepadButton button, double value);
void gamepadButtonReleaseEvent(int index, QGamepadManager::GamepadButton button);
-private slots:
+private Q_SLOTS:
void forwardGamepadConnected(int index);
void forwardGamepadDisconnected(int index);
void forwardGamepadAxisEvent(int index, QGamepadManager::GamepadAxis axis, double value);