From a645f3812488b2fe4d92d7168921cb0ae604a18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Puci?= Date: Tue, 11 Oct 2022 01:15:02 +0200 Subject: [PATCH 1/2] chore: Fix infer code warnings --- src/eventhandlers/uinputeventhandler.cpp | 2 +- src/gui/advancebuttondialog.cpp | 2 +- src/inputdevice.cpp | 14 ++++++++++---- src/joybutton.cpp | 11 ++++------- src/joycontrolstick.cpp | 3 +-- src/joydpad.cpp | 4 +--- src/mousedialog/springmoderegionpreview.cpp | 2 +- src/x11extras.cpp | 4 +--- src/xml/joybuttonslotxml.cpp | 1 - 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/eventhandlers/uinputeventhandler.cpp b/src/eventhandlers/uinputeventhandler.cpp index 6fa9e59fc..fa8ec71ae 100644 --- a/src/eventhandlers/uinputeventhandler.cpp +++ b/src/eventhandlers/uinputeventhandler.cpp @@ -194,7 +194,7 @@ void UInputEventHandler::sendMouseButtonEvent(JoyButtonSlot *slot, bool pressed) { if (code <= 3) { - unsigned int tempcode = BTN_LEFT; + unsigned int tempcode; switch (code) { case 3: { diff --git a/src/gui/advancebuttondialog.cpp b/src/gui/advancebuttondialog.cpp index ec9acce88..368806357 100644 --- a/src/gui/advancebuttondialog.cpp +++ b/src/gui/advancebuttondialog.cpp @@ -892,7 +892,7 @@ void AdvanceButtonDialog::updateSetSelection() { PadderCommon::inputDaemonMutex.lock(); - int chosen_set = -1; + int chosen_set; JoyButton::SetChangeCondition set_selection_condition = JoyButton::SetChangeDisabled; if (ui->setSelectionComboBox->currentIndex() > 0) diff --git a/src/inputdevice.cpp b/src/inputdevice.cpp index 161abd3c1..d2eadfdcb 100644 --- a/src/inputdevice.cpp +++ b/src/inputdevice.cpp @@ -600,11 +600,17 @@ void InputDevice::changeSetAxisButtonAssociation(int button_index, int axis_inde } else if (button_index == 1) { button = getJoystick_sets().value(newset)->getJoyAxis(axis_index)->getPAxisButton(); + } else + { + WARN() << "Invalid button_index value: " << button_index; + return; + } + if (button != nullptr) + { + JoyButton::SetChangeCondition tempmode = static_cast(mode); + button->setChangeSetSelection(originset); + button->setChangeSetCondition(tempmode, true); } - - JoyButton::SetChangeCondition tempmode = static_cast(mode); - button->setChangeSetSelection(originset); - button->setChangeSetCondition(tempmode, true); } void InputDevice::changeSetStickButtonAssociation(int button_index, int stick_index, int originset, int newset, int mode) diff --git a/src/joybutton.cpp b/src/joybutton.cpp index 7672646d4..9fd5fed7b 100644 --- a/src/joybutton.cpp +++ b/src/joybutton.cpp @@ -1140,7 +1140,7 @@ void JoyButton::mouseEvent() // Determine the multiplier to use for the current maximum mouse speed // based on how much time has passed. - double elapsedDiff = 1.0; + double elapsedDiff; if ((easingDuration > 0.0) && ((easingElapsed * .001) < easingDuration)) { elapsedDiff = ((easingElapsed * .001) / easingDuration); @@ -1291,7 +1291,7 @@ void JoyButton::mouseEvent() } double tempAccel = currentAccelMultiTemp; - double elapsedDiff = 1.0; + double elapsedDiff; if ((elapsedDuration > 0.0) && ((elapsedElapsed * 0.001) < elapsedDuration)) { @@ -1305,7 +1305,6 @@ void JoyButton::mouseEvent() updateOldAccelMulti = currentAccelMulti; } else { - elapsedDiff = 1.0; currentAccelMulti = 0.0; updateOldAccelMulti = 0.0; accelTravel = 0.0; @@ -3801,8 +3800,6 @@ void JoyButton::moveSpringMouse(int &movedX, int &movedY, bool &hasMoved, int sp for (int i = (springXSpeeds->length() - 1); (i >= 0) && !complete; i--) { - double tempx = -2.0; - double tempy = -2.0; double tempSpringDeadX = 0.0; double tempSpringDeadY = 0.0; @@ -3812,8 +3809,8 @@ void JoyButton::moveSpringMouse(int &movedX, int &movedY, bool &hasMoved, int sp infoX = springXSpeeds->takeLast(); infoY = springYSpeeds->takeLast(); - tempx = infoX.displacementX; - tempy = infoY.displacementY; + double tempx = infoX.displacementX; + double tempy = infoY.displacementY; tempSpringDeadX = infoX.springDeadX; tempSpringDeadY = infoY.springDeadY; diff --git a/src/joycontrolstick.cpp b/src/joycontrolstick.cpp index c0e554001..a5ae421c4 100644 --- a/src/joycontrolstick.cpp +++ b/src/joycontrolstick.cpp @@ -1985,7 +1985,6 @@ bool JoyControlStick::hasSameButtonsMouseCurve() { bool result = true; - JoyButton::JoyMouseCurve initialCurve = JoyButton::LinearCurve; QHash temphash = getApplicableButtons(); auto iter = temphash.cbegin(); @@ -1993,7 +1992,7 @@ bool JoyControlStick::hasSameButtonsMouseCurve() return result; JoyControlStickButton *button = iter.value(); - initialCurve = button->getMouseCurve(); + JoyButton::JoyMouseCurve initialCurve = button->getMouseCurve(); while (++iter != temphash.cend()) { diff --git a/src/joydpad.cpp b/src/joydpad.cpp index 23ba5c51c..e9edb629b 100644 --- a/src/joydpad.cpp +++ b/src/joydpad.cpp @@ -316,8 +316,6 @@ bool JoyDPad::hasSameButtonsMouseCurve() { bool result = true; - JoyButton::JoyMouseCurve initialCurve = JoyButton::LinearCurve; - QHash temphash = getApplicableButtons(); auto iter = temphash.cbegin(); @@ -325,7 +323,7 @@ bool JoyDPad::hasSameButtonsMouseCurve() return result; JoyDPadButton *button = iter.value(); - initialCurve = button->getMouseCurve(); + JoyButton::JoyMouseCurve initialCurve = button->getMouseCurve(); while (++iter != temphash.cend()) { diff --git a/src/mousedialog/springmoderegionpreview.cpp b/src/mousedialog/springmoderegionpreview.cpp index 47057c31e..c101b3688 100644 --- a/src/mousedialog/springmoderegionpreview.cpp +++ b/src/mousedialog/springmoderegionpreview.cpp @@ -85,7 +85,7 @@ int SpringModeRegionPreview::adjustSpringSizeWidth(int width) int SpringModeRegionPreview::adjustSpringSizeHeight(int height) { - int tempheight = size().height(); + int tempheight; if (height >= 2) { diff --git a/src/x11extras.cpp b/src/x11extras.cpp index e5adcca76..e774e7f34 100644 --- a/src/x11extras.cpp +++ b/src/x11extras.cpp @@ -554,7 +554,7 @@ QString X11Extras::getWindowClass(Window window) qDebug() << nitems; char *null_char = strchr(reinterpret_cast(prop), '\0'); - if (((reinterpret_cast(prop)) + nitems - 1) > null_char) + if ((null_char != nullptr) && (((reinterpret_cast(prop)) + nitems - 1) > null_char)) { *(null_char) = ' '; } @@ -654,7 +654,6 @@ void X11Extras::x11ResetMouseAccelerationChange(QString pointerName) checkFeedback(temp, num_feedbacks, feedback_id); XFree(feedbacks); - feedbacks = temp = nullptr; if (feedback_id <= -1) { @@ -750,7 +749,6 @@ struct X11Extras::ptrInformation X11Extras::getPointInformation(QString pointerN } XFree(feedbacks); - feedbacks = temp = nullptr; XCloseDevice(display, device); } diff --git a/src/xml/joybuttonslotxml.cpp b/src/xml/joybuttonslotxml.cpp index f871c4b40..becf9dcbb 100644 --- a/src/xml/joybuttonslotxml.cpp +++ b/src/xml/joybuttonslotxml.cpp @@ -126,7 +126,6 @@ void JoyButtonSlotXml::readConfig(QXmlStreamReader *xml) tempStringData = QString(); extraStringData = QString(); slotMixString = QString(); - firstTimePlus = true; xml->readNextStartElement(); } From fc3fab498eebb5cba23b91a499bca4deb4c3edae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Puci?= Date: Tue, 11 Oct 2022 13:25:50 +0200 Subject: [PATCH 2/2] CMake SDL warning #474 --- cmake/modules/FindSDL2.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cmake/modules/FindSDL2.cmake b/cmake/modules/FindSDL2.cmake index 0be1fd6b0..8bc6fcfb0 100644 --- a/cmake/modules/FindSDL2.cmake +++ b/cmake/modules/FindSDL2.cmake @@ -313,16 +313,15 @@ endif() include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 - REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR - VERSION_VAR SDL2_VERSION_STRING) +set(SDL2_REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) if(SDL2MAIN_LIBRARY) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main - REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR - VERSION_VAR SDL2_VERSION_STRING) + list(APPEND SDL2_REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR) endif() +find_package_handle_standard_args(SDL2 + REQUIRED_VARS ${SDL2_REQUIRED_VARS} + VERSION_VAR SDL2_VERSION_STRING) mark_as_advanced(SDL2_PATH SDL2_NO_DEFAULT_PATH