aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhu Yuliang <zhuyuliang@uniontech.com>2020-11-17 15:18:15 +0800
committerZhu Yuliang <zhuyuliang@uniontech.com>2020-11-18 22:07:50 +0800
commit941da49e0d444241be14e14c4f4c031238523df8 (patch)
treec1fb6a3cf2ed61644af1cee649cefda278c040d5
parent69b95376a11588db0b2e080a4b3ad1da09b60dad (diff)
There should be a space after the comment '//'
The other Qt codes style has space after '//' Change-Id: Icfe6e60163680da706380d7729682b8da9a1b509 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/gamepad/qgamepadbackend_p.h4
-rw-r--r--src/gamepad/qgamepadkeynavigation.cpp10
-rw-r--r--src/gamepad/qgamepadmanager.cpp4
-rw-r--r--src/imports/gamepad/qgamepadmouseitem.cpp10
-rw-r--r--src/imports/gamepad/qtgamepad.cpp2
5 files changed, 15 insertions, 15 deletions
diff --git a/src/gamepad/qgamepadbackend_p.h b/src/gamepad/qgamepadbackend_p.h
index 41d7472..9b619f6 100644
--- a/src/gamepad/qgamepadbackend_p.h
+++ b/src/gamepad/qgamepadbackend_p.h
@@ -70,10 +70,10 @@ public:
virtual double normalized(T value) const
{
if (gamepadAxis == QGamepadManager::AxisInvalid && minValue >= 0) {
- //case 0.0 - 1.0
+ // case 0.0 - 1.0
return double(value - minValue) / double(maxValue - minValue);
} else {
- //case -1.0 - 1.0
+ // case -1.0 - 1.0
return 2.0 * double(value - minValue) / double(maxValue - minValue) - 1.0;
}
}
diff --git a/src/gamepad/qgamepadkeynavigation.cpp b/src/gamepad/qgamepadkeynavigation.cpp
index 79ff592..66c6906 100644
--- a/src/gamepad/qgamepadkeynavigation.cpp
+++ b/src/gamepad/qgamepadkeynavigation.cpp
@@ -84,11 +84,11 @@ void QGamepadKeyNavigationPrivate::sendGeneratedKeyEvent(QKeyEvent *event)
void QGamepadKeyNavigationPrivate::_q_processGamepadButtonPressEvent(int index, QGamepadManager::GamepadButton button, double value)
{
Q_UNUSED(value);
- //If a gamepad has been set then, only use the events of that gamepad
+ // If a gamepad has been set then, only use the events of that gamepad
if (gamepad && gamepad->deviceId() != index)
return;
- //Trigger buttons are a special case as they get multiple press events as the value changes
+ // Trigger buttons are a special case as they get multiple press events as the value changes
if (button == QGamepadManager::ButtonL2 && buttonL2Pressed)
return;
else
@@ -104,11 +104,11 @@ void QGamepadKeyNavigationPrivate::_q_processGamepadButtonPressEvent(int index,
void QGamepadKeyNavigationPrivate::_q_processGamepadButtonReleaseEvent(int index, QGamepadManager::GamepadButton button)
{
- //If a gamepad has been set then, only use the events of that gamepad
+ // If a gamepad has been set then, only use the events of that gamepad
if (gamepad && gamepad->deviceId() != index)
return;
- //Free the trigger buttons if necessary
+ // Free the trigger buttons if necessary
if (button == QGamepadManager::ButtonL2)
buttonL2Pressed = false;
if (button == QGamepadManager::ButtonR2)
@@ -137,7 +137,7 @@ QGamepadKeyNavigation::QGamepadKeyNavigation(QObject *parent)
Q_D(QGamepadKeyNavigation);
d->gamepadManger = QGamepadManager::instance();
- //Default keymap
+ // Default keymap
d->keyMapping.insert(QGamepadManager::ButtonUp, Qt::Key_Up);
d->keyMapping.insert(QGamepadManager::ButtonDown, Qt::Key_Down);
d->keyMapping.insert(QGamepadManager::ButtonLeft, Qt::Key_Left);
diff --git a/src/gamepad/qgamepadmanager.cpp b/src/gamepad/qgamepadmanager.cpp
index c8a0eb5..c1dc740 100644
--- a/src/gamepad/qgamepadmanager.cpp
+++ b/src/gamepad/qgamepadmanager.cpp
@@ -62,7 +62,7 @@ public:
QGamepadBackend *gamepadBackend;
QMap<int, QString> connectedGamepads;
- //private slots
+ // private slots
void _q_forwardGamepadConnected(int deviceId);
void _q_forwardGamepadNameChanged(int deviceId, const QString &name);
void _q_forwardGamepadDisconnected(int deviceId);
@@ -128,7 +128,7 @@ void QGamepadManagerPrivate::loadBackend()
}
if (!gamepadBackend) {
- //Use dummy backend
+ // Use dummy backend
gamepadBackend = new QGamepadBackend();
qCDebug(gp) << "Using dummy backend";
}
diff --git a/src/imports/gamepad/qgamepadmouseitem.cpp b/src/imports/gamepad/qgamepadmouseitem.cpp
index ea8fa13..b6e5d99 100644
--- a/src/imports/gamepad/qgamepadmouseitem.cpp
+++ b/src/imports/gamepad/qgamepadmouseitem.cpp
@@ -131,10 +131,10 @@ void QGamepadMouseItem::mouseButtonReleased(int button)
void QGamepadMouseItem::updateMousePostion()
{
- //Get the delta from the last call
+ // Get the delta from the last call
qint64 delta = m_deltaTimer.restart();
- //Don't bother when there is not gamepad to read from
+ // Don't bother when there is not gamepad to read from
if (!m_gamepad || !m_gamepad->isConnected())
return;
@@ -147,7 +147,7 @@ void QGamepadMouseItem::updateMousePostion()
} else if (m_joystick == QGamepadMouseItem::RightStick) {
xVelocity = m_gamepad->axisRightX();
yVelocity = m_gamepad->axisRightY();
- } else { //The greatest of both
+ } else { // The greatest of both
if (std::abs(m_gamepad->axisLeftX()) > std::abs(m_gamepad->axisRightX()))
xVelocity = m_gamepad->axisLeftX();
else
@@ -158,7 +158,7 @@ void QGamepadMouseItem::updateMousePostion()
yVelocity = m_gamepad->axisRightY();
}
- //Check for deadzone limits]
+ // Check for deadzone limits]
if (std::abs(xVelocity) < m_deadZoneSize)
xVelocity = 0.0;
if (std::abs(yVelocity) < m_deadZoneSize)
@@ -168,7 +168,7 @@ void QGamepadMouseItem::updateMousePostion()
double newXPosition = m_mousePosition.x() + xVelocity * delta;
double newYPosition = m_mousePosition.y() + yVelocity * delta;
- //Check bounds
+ // Check bounds
if (newXPosition < 0)
newXPosition = 0;
else if (newXPosition > width())
diff --git a/src/imports/gamepad/qtgamepad.cpp b/src/imports/gamepad/qtgamepad.cpp
index 5d5fa68..347e38a 100644
--- a/src/imports/gamepad/qtgamepad.cpp
+++ b/src/imports/gamepad/qtgamepad.cpp
@@ -62,7 +62,7 @@ public:
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtGamepad"));
- //@uri QtGamepad
+ // @uri QtGamepad
qmlRegisterSingletonType<QGamepadManager>(uri, 1, 0, "GamepadManager", &gamepadmanager_singletontype_provider);
qmlRegisterType<QGamepad>(uri, 1, 0, "Gamepad");