diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp index bb67efd9..9a1cba93 100644 --- a/src/aboutdialog.cpp +++ b/src/aboutdialog.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include AboutDialog::AboutDialog(QWidget *parent) : @@ -57,7 +58,8 @@ void AboutDialog::fillInfoTextBrowser() QStringList finalInfoText = QStringList(); finalInfoText.append(trUtf8("Program Version %1").arg(PadderCommon::programVersion)); - finalInfoText.append(trUtf8("Program Compiled on %1 at %2").arg(__DATE__).arg(__TIME__)); + // __DATE__, __TIME__ + finalInfoText.append(trUtf8("Program Compiled on %1 at %2").arg(QDate::currentDate().toString("MMM dd yyyy")).arg(QTime::currentTime().toString("hh:mm:ss"))); QString sdlCompiledVersionNumber("%1.%2.%3"); QString sdlLinkedVersionNumber("%1.%2.%3"); diff --git a/src/addeditautoprofiledialog.cpp b/src/addeditautoprofiledialog.cpp index aef04219..1348a232 100644 --- a/src/addeditautoprofiledialog.cpp +++ b/src/addeditautoprofiledialog.cpp @@ -362,7 +362,7 @@ void AddEditAutoProfileDialog::checkForGrabbedWindow(UnixCaptureWindowUtility* u qDebug() << "ORIGINAL: " << QString::number(targetWindow, 16); #endif - long tempWindow = X11Extras::getInstance()->findClientWindow(targetWindow); + long tempWindow = static_cast(X11Extras::getInstance()->findClientWindow(static_cast(targetWindow))); if (tempWindow > 0) { targetWindow = tempWindow; diff --git a/src/advancebuttondialog.cpp b/src/advancebuttondialog.cpp index 5d060406..6d410bc6 100644 --- a/src/advancebuttondialog.cpp +++ b/src/advancebuttondialog.cpp @@ -252,7 +252,7 @@ void AdvanceButtonDialog::changeTurboText(int value) if (value >= MINIMUMTURBO) { double delay = value / 100.0; - double clicks = 100.0 / (double)value; + double clicks = 100.0 / static_cast(value); QString delaytext = QString::number(delay, 'g', 3).append(" ").append(trUtf8("sec.")); QString labeltext = QString::number(clicks, 'g', 2).append(" ").append(trUtf8("/sec.")); @@ -336,7 +336,7 @@ void AdvanceButtonDialog::deleteSlot() QListWidgetItem *item = ui->slotListWidget->takeItem(index); delete item; - item = 0; + item = nullptr; // Deleted last button. Replace with new blank button if (index == (itemcount - 1)) @@ -1276,7 +1276,7 @@ void AdvanceButtonDialog::setButtonCycleResetInterval(double value) { qInstallMessageHandler(MessageHandler::myMessageOutput); - int milliseconds = (static_cast(value) * 1000) + (fmod(value, 1.0) * 1000); + int milliseconds = (static_cast(value) * 1000) + static_cast(fmod(value, 1.0) * 1000); button->setCycleResetTime(milliseconds); } diff --git a/src/applaunchhelper.cpp b/src/applaunchhelper.cpp index d0f9cced..932adf5b 100644 --- a/src/applaunchhelper.cpp +++ b/src/applaunchhelper.cpp @@ -98,7 +98,7 @@ void AppLaunchHelper::changeGamepadPollRate() qInstallMessageHandler(MessageHandler::myMessageOutput); int pollRate = settings->value("GamepadPollRate", - AntiMicroSettings::defaultSDLGamepadPollRate).toUInt(); + AntiMicroSettings::defaultSDLGamepadPollRate).toInt(); if (pollRate > 0) { JoyButton::setGamepadRefreshRate(pollRate); diff --git a/src/autoprofilewatcher.cpp b/src/autoprofilewatcher.cpp index e5b19951..3f90b3f3 100644 --- a/src/autoprofilewatcher.cpp +++ b/src/autoprofilewatcher.cpp @@ -109,17 +109,17 @@ void AutoProfileWatcher::runAppCheck() nowWindowName = WinExtras::getCurrentWindowText(); #elif defined(Q_OS_UNIX) - long currentWindow = X11Extras::getInstance()->getWindowInFocus(); + long currentWindow = static_cast(X11Extras::getInstance()->getWindowInFocus()); if (currentWindow > 0) { - long tempWindow = X11Extras::getInstance()->findParentClient(currentWindow); + long tempWindow = static_cast(X11Extras::getInstance()->findParentClient(static_cast(currentWindow))); if (tempWindow > 0) { currentWindow = tempWindow; } nowWindow = QString::number(currentWindow); - nowWindowClass = X11Extras::getInstance()->getWindowClass(currentWindow); - nowWindowName = X11Extras::getInstance()->getWindowTitle(currentWindow); + nowWindowClass = X11Extras::getInstance()->getWindowClass(static_cast(currentWindow)); + nowWindowName = X11Extras::getInstance()->getWindowTitle(static_cast(currentWindow)); #ifndef QT_DEBUG_NO_OUTPUT qDebug() << nowWindowClass; diff --git a/src/capturedwindowinfodialog.cpp b/src/capturedwindowinfodialog.cpp index 003659ea..680fd56a 100644 --- a/src/capturedwindowinfodialog.cpp +++ b/src/capturedwindowinfodialog.cpp @@ -60,7 +60,7 @@ CapturedWindowInfoDialog::CapturedWindowInfoDialog(long window, QWidget *parent) ui->winClassLabel->setVisible(false); ui->winClassHeadLabel->setVisible(false); #elif defined(Q_OS_UNIX) - winClass = info->getWindowClass(window); + winClass = info->getWindowClass(static_cast(window)); ui->winClassLabel->setText(winClass); if (winClass.isEmpty()) { @@ -80,7 +80,7 @@ CapturedWindowInfoDialog::CapturedWindowInfoDialog(long window, QWidget *parent) #ifdef Q_OS_WIN winName = WinExtras::getCurrentWindowText(); #elif defined(Q_OS_UNIX) - winName = info->getWindowTitle(window); + winName = info->getWindowTitle(static_cast(window)); #endif ui->winTitleLabel->setText(winName); @@ -113,7 +113,7 @@ CapturedWindowInfoDialog::CapturedWindowInfoDialog(long window, QWidget *parent) } #elif defined(Q_OS_UNIX) - int pid = info->getApplicationPid(window); + int pid = info->getApplicationPid(static_cast(window)); if (pid > 0) { QString exepath = X11Extras::getInstance()->getApplicationLocation(pid); diff --git a/src/commandlineutility.cpp b/src/commandlineutility.cpp index 296a5f54..918a2243 100644 --- a/src/commandlineutility.cpp +++ b/src/commandlineutility.cpp @@ -31,6 +31,7 @@ QStringList CommandLineUtility::eventGeneratorsList = EventHandlerFactory::buildEventGeneratorList(); + CommandLineUtility::CommandLineUtility(QObject *parent) : QObject(parent) { diff --git a/src/dpadcontextmenu.cpp b/src/dpadcontextmenu.cpp index ae9b911d..0d8f449e 100644 --- a/src/dpadcontextmenu.cpp +++ b/src/dpadcontextmenu.cpp @@ -27,6 +27,7 @@ #include #include + DPadContextMenu::DPadContextMenu(JoyDPad *dpad, QWidget *parent) : QMenu(parent), helper(dpad) @@ -192,7 +193,7 @@ void DPadContextMenu::setDPadMode(QAction* action) qInstallMessageHandler(MessageHandler::myMessageOutput); int item = action->data().toInt(); - dpad->setJoyMode((JoyDPad::JoyMode)item); + dpad->setJoyMode(static_cast(item)); } /** diff --git a/src/dpadeditdialog.cpp b/src/dpadeditdialog.cpp index 54e50ac0..ce093bb6 100644 --- a/src/dpadeditdialog.cpp +++ b/src/dpadeditdialog.cpp @@ -72,7 +72,7 @@ DPadEditDialog::DPadEditDialog(JoyDPad *dpad, QWidget *parent) : ui->dpadNameLineEdit->setText(dpad->getDpadName()); int dpadDelay = dpad->getDPadDelay(); - ui->dpadDelaySlider->setValue(dpadDelay * .1); + ui->dpadDelaySlider->setValue(static_cast(dpadDelay * .1)); ui->dpadDelayDoubleSpinBox->setValue(dpadDelay * .001); PadderCommon::inputDaemonMutex.unlock(); diff --git a/src/dpadpushbutton.cpp b/src/dpadpushbutton.cpp index f23a85c0..19c6ac10 100644 --- a/src/dpadpushbutton.cpp +++ b/src/dpadpushbutton.cpp @@ -23,6 +23,7 @@ #include + DPadPushButton::DPadPushButton(JoyDPad *dpad, bool displayNames, QWidget *parent) : FlashButtonWidget(displayNames, parent) { diff --git a/src/dpadpushbuttongroup.cpp b/src/dpadpushbuttongroup.cpp index fb8fc316..a4fe4c0b 100644 --- a/src/dpadpushbuttongroup.cpp +++ b/src/dpadpushbuttongroup.cpp @@ -29,6 +29,7 @@ #include #include + DPadPushButtonGroup::DPadPushButtonGroup(JoyDPad *dpad, bool displayNames, QWidget *parent) : QGridLayout(parent) { diff --git a/src/editalldefaultautoprofiledialog.cpp b/src/editalldefaultautoprofiledialog.cpp index 423faf57..56c36885 100644 --- a/src/editalldefaultautoprofiledialog.cpp +++ b/src/editalldefaultautoprofiledialog.cpp @@ -29,6 +29,7 @@ #include #include + EditAllDefaultAutoProfileDialog::EditAllDefaultAutoProfileDialog(AutoProfileInfo *info, AntiMicroSettings *settings, QWidget *parent) : QDialog(parent), diff --git a/src/event.cpp b/src/event.cpp index b3fdafb0..3611368b 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -100,8 +100,8 @@ void fakeAbsMouseCoordinates(double springX, double springY, destMidWidth = destSpringWidth / 2; destMidHeight = destSpringHeight / 2; - finalx = (screenMidwidth + (springX * destMidWidth) + deskRect.x()); - finaly = (screenMidheight + (springY * destMidHeight) + deskRect.y()); + finalx = (screenMidwidth + (static_cast(springX) * destMidWidth) + deskRect.x()); + finaly = (screenMidheight + (static_cast(springY) * destMidHeight) + deskRect.y()); } // Create the event used by the operating system. @@ -217,13 +217,13 @@ void sendSpringEventRefactor(PadderCommon::springModeInfo *fullSpring, int xRelativeMoovCoor = 0; if (relativeSpring->displacementX >= -1.0) { - xRelativeMoovCoor = (relativeSpring->displacementX * destRelativeWidth) / 2; + xRelativeMoovCoor = (static_cast(relativeSpring->displacementX) * destRelativeWidth) / 2; } int yRelativeMoovCoor = 0; if (relativeSpring->displacementY >= -1.0) { - yRelativeMoovCoor = (relativeSpring->displacementY * destRelativeHeight) / 2; + yRelativeMoovCoor = (static_cast(relativeSpring->displacementY) * destRelativeHeight) / 2; } xmovecoor += xRelativeMoovCoor; @@ -356,8 +356,8 @@ void sendSpringEvent(PadderCommon::springModeInfo *fullSpring, } } - xmovecoor = (fullSpring->displacementX >= -1.0) ? (midwidth + (fullSpring->displacementX * destMidWidth) + deskRect.x()): pivotX; - ymovecoor = (fullSpring->displacementY >= -1.0) ? (midheight + (fullSpring->displacementY * destMidHeight) + deskRect.y()) : pivotY; + xmovecoor = (fullSpring->displacementX >= -1.0) ? (midwidth + (static_cast(fullSpring->displacementX) * destMidWidth) + deskRect.x()): pivotX; + ymovecoor = (fullSpring->displacementY >= -1.0) ? (midheight + (static_cast(fullSpring->displacementY) * destMidHeight) + deskRect.y()) : pivotY; int fullSpringDestX = xmovecoor; int fullSpringDestY = ymovecoor; @@ -372,13 +372,13 @@ void sendSpringEvent(PadderCommon::springModeInfo *fullSpring, int xRelativeMoovCoor = 0; if (relativeSpring->displacementX >= -1.0) { - xRelativeMoovCoor = (relativeSpring->displacementX * destRelativeWidth) / 2; + xRelativeMoovCoor = (static_cast(relativeSpring->displacementX) * destRelativeWidth) / 2; } int yRelativeMoovCoor = 0; if (relativeSpring->displacementY >= -1.0) { - yRelativeMoovCoor = (relativeSpring->displacementY * destRelativeHeight) / 2; + yRelativeMoovCoor = (static_cast(relativeSpring->displacementY) * destRelativeHeight) / 2; } xmovecoor += xRelativeMoovCoor; @@ -687,7 +687,7 @@ QString keycodeToKeyString(int keycode, int alias) { Display* display = X11Extras::getInstance()->display(); newkey = QString("0x%1").arg(keycode, 0, 16); - QString tempkey = XKeysymToString(XkbKeycodeToKeysym(display, keycode, 0, 0)); + QString tempkey = XKeysymToString(XkbKeycodeToKeysym(display, static_cast(keycode), 0, 0)); QString tempalias = X11Extras::getInstance()->getDisplayString(tempkey); if (!tempalias.isEmpty()) { @@ -696,7 +696,7 @@ QString keycodeToKeyString(int keycode, int alias) else { XKeyPressedEvent tempevent; - tempevent.keycode = keycode; + tempevent.keycode = static_cast(keycode); tempevent.type = KeyPress; tempevent.display = display; tempevent.state = 0; @@ -784,7 +784,7 @@ int X11KeyCodeToX11KeySym(int keycode) #elif defined(Q_OS_UNIX) #ifdef WITH_X11 Display* display = X11Extras::getInstance()->display(); - int tempcode = XkbKeycodeToKeysym(display, keycode, 0, 0); + int tempcode = static_cast(XkbKeycodeToKeysym(display, static_cast(keycode), 0, 0)); return tempcode; #else @@ -811,7 +811,7 @@ QString keysymToKeyString(int keysym, int alias) int keycode = 0; if (keysym > 0) { - keycode = XKeysymToKeycode(display, keysym); + keycode = XKeysymToKeycode(display, static_cast(keysym)); } newkey = keycodeToKeyString(keycode); } diff --git a/src/eventhandlers/baseeventhandler.cpp b/src/eventhandlers/baseeventhandler.cpp index a1a88bdd..65c9f98e 100644 --- a/src/eventhandlers/baseeventhandler.cpp +++ b/src/eventhandlers/baseeventhandler.cpp @@ -32,7 +32,7 @@ BaseEventHandler::BaseEventHandler(QObject *parent) : BaseEventHandler::~BaseEventHandler() { -qInstallMessageHandler(MessageHandler::myMessageOutput); + qInstallMessageHandler(MessageHandler::myMessageOutput); } QString BaseEventHandler::getErrorString() @@ -88,12 +88,17 @@ void BaseEventHandler::sendMouseSpringEvent(int xDis, int yDis, */ void BaseEventHandler::sendMouseSpringEvent(int xDis, int yDis) { -qInstallMessageHandler(MessageHandler::myMessageOutput); + qInstallMessageHandler(MessageHandler::myMessageOutput); + + Q_UNUSED(xDis); + Q_UNUSED(yDis); } void BaseEventHandler::sendTextEntryEvent(QString maintext) { -qInstallMessageHandler(MessageHandler::myMessageOutput); + qInstallMessageHandler(MessageHandler::myMessageOutput); + + Q_UNUSED(maintext); } diff --git a/src/eventhandlers/uinputeventhandler.cpp b/src/eventhandlers/uinputeventhandler.cpp index 971e8269..8a607774 100644 --- a/src/eventhandlers/uinputeventhandler.cpp +++ b/src/eventhandlers/uinputeventhandler.cpp @@ -207,7 +207,7 @@ void UInputEventHandler::sendMouseButtonEvent(JoyButtonSlot *slot, bool pressed) } } - write_uinput_event(mouseFileHandler, EV_KEY, tempcode, pressed ? 1 : 0); + write_uinput_event(mouseFileHandler, EV_KEY, static_cast(tempcode), pressed ? 1 : 0); } else if (code == 4) { @@ -266,24 +266,26 @@ void UInputEventHandler::sendMouseAbsEvent(int xDis, int yDis, int screen) void UInputEventHandler::sendMouseSpringEvent(int xDis, int yDis, int width, int height) { - if (width > 0 && height > 0) + if ((width > 0) && (height > 0)) { double midwidth = static_cast(width) / 2.0; double midheight = static_cast(height) / 2.0; - int fx = ceil(32767 * ((xDis - midwidth) / midwidth)); - int fy = ceil(32767 * ((yDis - midheight) / midheight)); + int fx = static_cast(ceil(32767 * ((xDis - midwidth) / midwidth))); + int fy = static_cast(ceil(32767 * ((yDis - midheight) / midheight))); sendMouseAbsEvent(fx, fy, -1); } + + } void UInputEventHandler::sendMouseSpringEvent(int xDis, int yDis) { - if (xDis >= -1.0 && xDis <= 1.0 && - yDis >= -1.0 && yDis <= 1.0) + if ((xDis >= -1.0) && (xDis <= 1.0) && + (yDis >= -1.0) && (yDis <= 1.0)) { - int fx = ceil(32767 * xDis); - int fy = ceil(32767 * yDis); + int fx = static_cast(ceil(32767 * xDis)); + int fy = static_cast(ceil(32767 * yDis)); sendMouseAbsEvent(fx, fy, -1); } } @@ -465,9 +467,9 @@ void UInputEventHandler::write_uinput_event(int filehandle, int type, struct input_event ev2; memset(&ev, 0, sizeof(struct input_event)); - gettimeofday(&ev.time, 0); - ev.type = type; - ev.code = code; + gettimeofday(&ev.time, nullptr); + ev.type = static_cast(type); + ev.code = static_cast(code); ev.value = value; write(filehandle, &ev, sizeof(struct input_event)); @@ -475,7 +477,7 @@ void UInputEventHandler::write_uinput_event(int filehandle, int type, if (syn) { memset(&ev2, 0, sizeof(struct input_event)); - gettimeofday(&ev2.time, 0); + gettimeofday(&ev2.time, nullptr); ev2.type = EV_SYN; ev2.code = SYN_REPORT; ev2.value = 0; @@ -536,10 +538,10 @@ void UInputEventHandler::sendTextEntryEvent(QString maintext) { QtX11KeyMapper::charKeyInformation tempX11 = nativeWinKeyMapper->getCharKeyInformation(maintext.at(i)); tempX11.virtualkey = X11Extras::getInstance()->getGroup1KeySym(tempX11.virtualkey); - unsigned int tempQtKey = nativeWinKeyMapper->returnQtKey(tempX11.virtualkey); + unsigned int tempQtKey = static_cast(nativeWinKeyMapper->returnQtKey(tempX11.virtualkey)); if (tempQtKey > 0) { - temp.virtualkey = keymapper->returnVirtualKey(tempQtKey); + temp.virtualkey = keymapper->returnVirtualKey(static_cast(tempQtKey)); temp.modifiers = tempX11.modifiers; } else @@ -581,7 +583,7 @@ void UInputEventHandler::sendTextEntryEvent(QString maintext) } } - tempList.append(temp.virtualkey); + tempList.append(static_cast(temp.virtualkey)); write_uinput_event(keyboardFileHandler, EV_KEY, temp.virtualkey, 1, true); } @@ -593,7 +595,7 @@ void UInputEventHandler::sendTextEntryEvent(QString maintext) { unsigned int currentcode = tempiter.previous(); bool sync = !tempiter.hasPrevious() ? true : false; - write_uinput_event(keyboardFileHandler, EV_KEY, currentcode, 0, sync); + write_uinput_event(keyboardFileHandler, EV_KEY, static_cast(currentcode), 0, sync); } } } diff --git a/src/eventhandlers/xtesteventhandler.cpp b/src/eventhandlers/xtesteventhandler.cpp index edc5d853..fc62bb70 100644 --- a/src/eventhandlers/xtesteventhandler.cpp +++ b/src/eventhandlers/xtesteventhandler.cpp @@ -33,18 +33,16 @@ - - XTestEventHandler::XTestEventHandler(QObject *parent) : BaseEventHandler(parent) { -qInstallMessageHandler(MessageHandler::myMessageOutput); + qInstallMessageHandler(MessageHandler::myMessageOutput); } XTestEventHandler::~XTestEventHandler() { -qInstallMessageHandler(MessageHandler::myMessageOutput); + qInstallMessageHandler(MessageHandler::myMessageOutput); } @@ -75,10 +73,10 @@ void XTestEventHandler::sendKeyboardEvent(JoyButtonSlot *slot, bool pressed) if (device == JoyButtonSlot::JoyKeyboard) { - int tempcode = XKeysymToKeycode(display, code); + int tempcode = XKeysymToKeycode(display, static_cast(code)); if (tempcode > 0) { - XTestFakeKeyEvent(display, tempcode, pressed, 0); + XTestFakeKeyEvent(display, static_cast(tempcode), pressed, 0); XFlush(display); } } @@ -93,7 +91,7 @@ void XTestEventHandler::sendMouseButtonEvent(JoyButtonSlot *slot, bool pressed) if (device == JoyButtonSlot::JoyMouseButton) { - XTestFakeButtonEvent(display, code, pressed, 0); + XTestFakeButtonEvent(display, static_cast(code), pressed, 0); XFlush(display); } } @@ -139,7 +137,7 @@ void XTestEventHandler::sendTextEntryEvent(QString maintext) for (int i=0; i < maintext.size(); i++) { QtX11KeyMapper::charKeyInformation temp = keymapper->getCharKeyInformation(maintext.at(i)); - int tempcode = XKeysymToKeycode(display, temp.virtualkey); + int tempcode = XKeysymToKeycode(display, static_cast(temp.virtualkey)); if (tempcode > 0) { QList tempList; @@ -156,7 +154,7 @@ void XTestEventHandler::sendTextEntryEvent(QString maintext) } int modifiercode = shiftcode; - XTestFakeKeyEvent(display, modifiercode, 1, 0); + XTestFakeKeyEvent(display, static_cast(modifiercode), 1, 0); tempList.append(modifiercode); } @@ -170,7 +168,7 @@ void XTestEventHandler::sendTextEntryEvent(QString maintext) } int modifiercode = controlcode; - XTestFakeKeyEvent(display, modifiercode, 1, 0); + XTestFakeKeyEvent(display, static_cast(modifiercode), 1, 0); tempList.append(modifiercode); } @@ -184,7 +182,7 @@ void XTestEventHandler::sendTextEntryEvent(QString maintext) } int modifiercode = altcode; - XTestFakeKeyEvent(display, modifiercode, 1, 0); + XTestFakeKeyEvent(display, static_cast(modifiercode), 1, 0); tempList.append(modifiercode); } @@ -198,12 +196,12 @@ void XTestEventHandler::sendTextEntryEvent(QString maintext) } int modifiercode = metacode; - XTestFakeKeyEvent(display, modifiercode, 1, 0); + XTestFakeKeyEvent(display, static_cast(modifiercode), 1, 0); tempList.append(modifiercode); } } - XTestFakeKeyEvent(display, tempcode, 1, 0); + XTestFakeKeyEvent(display, static_cast(tempcode), 1, 0); tempList.append(tempcode); XFlush(display); @@ -215,7 +213,7 @@ void XTestEventHandler::sendTextEntryEvent(QString maintext) while (tempiter.hasPrevious()) { int currentcode = tempiter.previous(); - XTestFakeKeyEvent(display, currentcode, 0, 0); + XTestFakeKeyEvent(display, static_cast(currentcode), 0, 0); } XFlush(display); diff --git a/src/gamecontroller/gamecontroller.cpp b/src/gamecontroller/gamecontroller.cpp index d4ca27cd..f70f85c6 100644 --- a/src/gamecontroller/gamecontroller.cpp +++ b/src/gamecontroller/gamecontroller.cpp @@ -845,14 +845,14 @@ QString GameController::getBindStringForButton(int index, bool trueIndex) SDL_GameControllerButtonBind GameController::getBindForAxis(int index) { qInstallMessageHandler(MessageHandler::myMessageOutput); - SDL_GameControllerButtonBind bind = SDL_GameControllerGetBindForAxis(controller, (SDL_GameControllerAxis)index); + SDL_GameControllerButtonBind bind = SDL_GameControllerGetBindForAxis(controller, static_cast(index)); return bind; } SDL_GameControllerButtonBind GameController::getBindForButton(int index) { qInstallMessageHandler(MessageHandler::myMessageOutput); - SDL_GameControllerButtonBind bind = SDL_GameControllerGetBindForButton(controller, (SDL_GameControllerButton)index); + SDL_GameControllerButtonBind bind = SDL_GameControllerGetBindForButton(controller, static_cast(index)); return bind; } @@ -903,6 +903,7 @@ void GameController::axisActivatedEvent(int setindex, int axisindex, int value) { qInstallMessageHandler(MessageHandler::myMessageOutput); Q_UNUSED(setindex); + Q_UNUSED(value); SDL_GameControllerButtonBind bind = getBindForAxis(axisindex); // static_cast if (bind.bindType != SDL_CONTROLLER_BINDTYPE_NONE) diff --git a/src/gamecontroller/gamecontrollertrigger.cpp b/src/gamecontroller/gamecontrollertrigger.cpp index c0c546b4..b7610985 100644 --- a/src/gamecontroller/gamecontrollertrigger.cpp +++ b/src/gamecontroller/gamecontrollertrigger.cpp @@ -225,5 +225,5 @@ JoyAxis::ThrottleTypes GameControllerTrigger::getDefaultThrottle() { qInstallMessageHandler(MessageHandler::myMessageOutput); - return (ThrottleTypes)this->DEFAULTTHROTTLE; + return static_cast(this->DEFAULTTHROTTLE); } diff --git a/src/gamecontrollermappingdialog.cpp b/src/gamecontrollermappingdialog.cpp index 69930e45..41087b9c 100644 --- a/src/gamecontrollermappingdialog.cpp +++ b/src/gamecontrollermappingdialog.cpp @@ -386,7 +386,7 @@ void GameControllerMappingDialog::populateGameControllerBindings(GameController for (int i = 0; i < controller->getNumberButtons(); i++) { - int associatedRow = buttonPlacement.value((SDL_GameControllerButton)i); + int associatedRow = buttonPlacement.value(static_cast(i)); SDL_GameControllerButtonBind bind = controller->getBindForButton(i); QString temptext = bindingString(bind); @@ -411,7 +411,7 @@ void GameControllerMappingDialog::populateGameControllerBindings(GameController for (int i = 0; i < controller->getNumberAxes(); i++) { - int associatedRow = axisPlacement.value((SDL_GameControllerAxis)i); + int associatedRow = axisPlacement.value(static_cast(i)); SDL_GameControllerButtonBind bind = controller->getBindForAxis(i); QString temptext = bindingString(bind); @@ -543,13 +543,13 @@ void GameControllerMappingDialog::disableDeviceConnections() { qInstallMessageHandler(MessageHandler::myMessageOutput); - disconnect(device, &InputDevice::rawButtonClick, this, 0); - disconnect(device, &InputDevice::rawButtonRelease, this, 0); - disconnect(device, &InputDevice::rawAxisMoved, this, 0); - disconnect(device, &InputDevice::rawAxisActivated, this, 0); - disconnect(device, &InputDevice::rawAxisReleased, this, 0); - disconnect(device, &InputDevice::rawDPadButtonClick, this, 0); - disconnect(device, &InputDevice::rawDPadButtonRelease, this, 0); + disconnect(device, &InputDevice::rawButtonClick, this, nullptr); + disconnect(device, &InputDevice::rawButtonRelease, this, nullptr); + disconnect(device, &InputDevice::rawAxisMoved, this, nullptr); + disconnect(device, &InputDevice::rawAxisActivated, this, nullptr); + disconnect(device, &InputDevice::rawAxisReleased, this, nullptr); + disconnect(device, &InputDevice::rawDPadButtonClick, this, nullptr); + disconnect(device, &InputDevice::rawDPadButtonRelease, this, nullptr); } void GameControllerMappingDialog::enableButtonEvents(int code) diff --git a/src/inputdaemon.cpp b/src/inputdaemon.cpp index fbd25afb..92b7583f 100644 --- a/src/inputdaemon.cpp +++ b/src/inputdaemon.cpp @@ -37,6 +37,7 @@ const int InputDaemon::GAMECONTROLLERTRIGGERRELEASE = 16384; + InputDaemon::InputDaemon(QMap *joysticks, AntiMicroSettings *settings, bool graphical, QObject *parent) : @@ -360,7 +361,7 @@ void InputDaemon::quit() stopped = true; pollResetTimer.stop(); - disconnect(eventWorker, &SDLEventReader::eventRaised, this, 0); + disconnect(eventWorker, &SDLEventReader::eventRaised, this, nullptr); // Wait for SDL to finish. Let worker destructor close SDL. // Let InputDaemon destructor close thread instance. @@ -875,7 +876,7 @@ void InputDaemon::modifyUnplugEvents(QQueue *sdlEventQueue) { if (axis->getThrottle() != static_cast(JoyAxis::NormalThrottle)) { - event.jaxis.value = axis->getProperReleaseValue(); + event.jaxis.value = static_cast(axis->getProperReleaseValue()); } } } @@ -908,7 +909,7 @@ void InputDaemon::modifyUnplugEvents(QQueue *sdlEventQueue) if ((event.caxis.axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT) || (event.caxis.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT)) { - event.caxis.value = axis->getProperReleaseValue(); + event.caxis.value = static_cast(axis->getProperReleaseValue()); } } } diff --git a/src/inputdevice.cpp b/src/inputdevice.cpp index b0907887..a0750500 100644 --- a/src/inputdevice.cpp +++ b/src/inputdevice.cpp @@ -705,7 +705,7 @@ void InputDevice::changeSetButtonAssociation(int button_index, int originset, in qInstallMessageHandler(MessageHandler::myMessageOutput); JoyButton *button = getJoystick_sets().value(newset)->getJoyButton(button_index); - JoyButton::SetChangeCondition tempmode = (JoyButton::SetChangeCondition)mode; + JoyButton::SetChangeCondition tempmode = static_cast(mode); button->setChangeSetSelection(originset); button->setChangeSetCondition(tempmode, true); } @@ -825,7 +825,7 @@ void InputDevice::readConfig(QXmlStreamReader *xml) if (button != nullptr) { - vdpad->addVButton((JoyDPadButton::JoyDPadDirections)vdpadDirection, button); + vdpad->addVButton(static_cast(vdpadDirection), button); } } } @@ -844,7 +844,7 @@ void InputDevice::readConfig(QXmlStreamReader *xml) JoyButton *button = currentset->getJoyButton(vdpadButtonIndex); if (button != nullptr) { - vdpad->addVButton((JoyDPadButton::JoyDPadDirections)vdpadDirection, button); + vdpad->addVButton(static_cast(vdpadDirection), button); } } } @@ -1306,7 +1306,7 @@ void InputDevice::changeSetAxisButtonAssociation(int button_index, int axis_inde button = getJoystick_sets().value(newset)->getJoyAxis(axis_index)->getPAxisButton(); } - JoyButton::SetChangeCondition tempmode = (JoyButton::SetChangeCondition)mode; + JoyButton::SetChangeCondition tempmode = static_cast(mode); button->setChangeSetSelection(originset); button->setChangeSetCondition(tempmode, true); } @@ -1315,9 +1315,9 @@ void InputDevice::changeSetStickButtonAssociation(int button_index, int stick_in { qInstallMessageHandler(MessageHandler::myMessageOutput); - JoyControlStickButton *button = getJoystick_sets().value(newset)->getJoyStick(stick_index)->getDirectionButton((JoyControlStick::JoyStickDirections)button_index); + JoyControlStickButton *button = getJoystick_sets().value(newset)->getJoyStick(stick_index)->getDirectionButton(static_cast(button_index)); - JoyButton::SetChangeCondition tempmode = (JoyButton::SetChangeCondition)mode; + JoyButton::SetChangeCondition tempmode = static_cast(mode); button->setChangeSetSelection(originset); button->setChangeSetCondition(tempmode, true); } @@ -1328,7 +1328,7 @@ void InputDevice::changeSetDPadButtonAssociation(int button_index, int dpad_inde JoyDPadButton *button = getJoystick_sets().value(newset)->getJoyDPad(dpad_index)->getJoyButton(button_index); - JoyButton::SetChangeCondition tempmode = (JoyButton::SetChangeCondition)mode; + JoyButton::SetChangeCondition tempmode = static_cast(mode); button->setChangeSetSelection(originset); button->setChangeSetCondition(tempmode, true); } @@ -1339,7 +1339,7 @@ void InputDevice::changeSetVDPadButtonAssociation(int button_index, int dpad_ind JoyDPadButton *button = getJoystick_sets().value(newset)->getVDPad(dpad_index)->getJoyButton(button_index); - JoyButton::SetChangeCondition tempmode = (JoyButton::SetChangeCondition)mode; + JoyButton::SetChangeCondition tempmode = static_cast(mode); button->setChangeSetSelection(originset); button->setChangeSetCondition(tempmode, true); } diff --git a/src/joyaxis.cpp b/src/joyaxis.cpp index 809ea8f7..6df8a694 100644 --- a/src/joyaxis.cpp +++ b/src/joyaxis.cpp @@ -28,6 +28,7 @@ #include #include +#include #include // Set default values for many properties. @@ -1132,7 +1133,7 @@ double JoyAxis::getButtonsPresetSensitivity() double presetSensitivity = 1.0; - if (paxisbutton->getSensitivity() == naxisbutton->getSensitivity()) + if (qFuzzyCompare(paxisbutton->getSensitivity(), naxisbutton->getSensitivity())) { presetSensitivity = paxisbutton->getSensitivity(); } @@ -1371,7 +1372,7 @@ double JoyAxis::getButtonsEasingDuration() qInstallMessageHandler(MessageHandler::myMessageOutput); double result = JoyButton::DEFAULTEASINGDURATION; - if (paxisbutton->getEasingDuration() == naxisbutton->getEasingDuration()) + if (qFuzzyCompare(paxisbutton->getEasingDuration(), naxisbutton->getEasingDuration())) { result = paxisbutton->getEasingDuration(); } diff --git a/src/joyaxiscontextmenu.cpp b/src/joyaxiscontextmenu.cpp index d972e647..6c554818 100644 --- a/src/joyaxiscontextmenu.cpp +++ b/src/joyaxiscontextmenu.cpp @@ -27,6 +27,7 @@ #include #include + JoyAxisContextMenu::JoyAxisContextMenu(JoyAxis *axis, QWidget *parent) : QMenu(parent), helper(axis) diff --git a/src/joyaxiswidget.cpp b/src/joyaxiswidget.cpp index 7326791c..af97c3c2 100644 --- a/src/joyaxiswidget.cpp +++ b/src/joyaxiswidget.cpp @@ -23,6 +23,7 @@ #include + JoyAxisWidget::JoyAxisWidget(JoyAxis *axis, bool displayNames, QWidget *parent) : FlashButtonWidget(displayNames, parent) { diff --git a/src/joybutton.cpp b/src/joybutton.cpp index 9b142d6b..7660694a 100644 --- a/src/joybutton.cpp +++ b/src/joybutton.cpp @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -1256,7 +1257,7 @@ void JoyButton::mouseEvent() { qInstallMessageHandler(MessageHandler::myMessageOutput); - JoyButtonSlot *buttonslot = 0; + JoyButtonSlot *buttonslot = nullptr; bool singleShot = false; if (currentMouseEvent != nullptr) { @@ -1691,7 +1692,7 @@ void JoyButton::mouseEvent() } else { - buttonslot = 0; + buttonslot = nullptr; } } @@ -1710,7 +1711,7 @@ void JoyButton::wheelEventVertical() { qInstallMessageHandler(MessageHandler::myMessageOutput); - JoyButtonSlot *buttonslot = 0; + JoyButtonSlot *buttonslot = nullptr; if (currentWheelVerticalEvent != nullptr) { buttonslot = currentWheelVerticalEvent; @@ -1766,7 +1767,7 @@ void JoyButton::wheelEventHorizontal() { qInstallMessageHandler(MessageHandler::myMessageOutput); - JoyButtonSlot *buttonslot = 0; + JoyButtonSlot *buttonslot = nullptr; if (currentWheelHorizontalEvent != nullptr) { buttonslot = currentWheelHorizontalEvent; @@ -2038,7 +2039,7 @@ void JoyButton::writeConfig(QXmlStreamWriter *xml) xml->writeTextElement("relativespring", "true"); } - if (easingDuration != DEFAULTEASINGDURATION) + if (qFuzzyCompare(easingDuration, DEFAULTEASINGDURATION)) { xml->writeTextElement("easingduration", QString::number(easingDuration)); } @@ -2048,27 +2049,27 @@ void JoyButton::writeConfig(QXmlStreamWriter *xml) xml->writeTextElement("extraacceleration", "true"); } - if (extraAccelerationMultiplier != DEFAULTEXTRACCELVALUE) + if (qFuzzyCompare(extraAccelerationMultiplier, DEFAULTEXTRACCELVALUE)) { xml->writeTextElement("accelerationmultiplier", QString::number(extraAccelerationMultiplier)); } - if (startAccelMultiplier != DEFAULTSTARTACCELMULTIPLIER) + if (qFuzzyCompare(startAccelMultiplier, DEFAULTSTARTACCELMULTIPLIER)) { xml->writeTextElement("startaccelmultiplier", QString::number(startAccelMultiplier)); } - if (minMouseDistanceAccelThreshold != DEFAULTMINACCELTHRESHOLD) + if (qFuzzyCompare(minMouseDistanceAccelThreshold, DEFAULTMINACCELTHRESHOLD)) { xml->writeTextElement("minaccelthreshold", QString::number(minMouseDistanceAccelThreshold)); } - if (maxMouseDistanceAccelThreshold != DEFAULTMAXACCELTHRESHOLD) + if (qFuzzyCompare(maxMouseDistanceAccelThreshold, DEFAULTMAXACCELTHRESHOLD)) { xml->writeTextElement("maxaccelthreshold", QString::number(maxMouseDistanceAccelThreshold)); } - if (accelDuration != DEFAULTACCELEASINGDURATION) + if (qFuzzyCompare(accelDuration, DEFAULTACCELEASINGDURATION)) { xml->writeTextElement("accelextraduration", QString::number(accelDuration)); } @@ -2220,13 +2221,13 @@ bool JoyButton::readButtonConfig(QXmlStreamReader *xml) if (!inserted) { delete buttonslot; - buttonslot = 0; + buttonslot = nullptr; } } else { delete buttonslot; - buttonslot = 0; + buttonslot = nullptr; } } else @@ -2753,8 +2754,8 @@ QList JoyButton::getActiveZoneList() QListIterator activeSlotsIter(getActiveSlots()); QListIterator assignmentsIter(*getAssignedSlots()); - QListIterator *iter = 0; - QReadWriteLock *tempLock = 0; + QListIterator *iter = nullptr; + QReadWriteLock *tempLock = nullptr; activeZoneLock.lockForRead(); int numActiveSlots = getActiveSlots().size(); @@ -2956,10 +2957,10 @@ bool JoyButton::setAssignedSlot(int code, JoyButtonSlot::JoySlotInputAction mode } else { - if (slot) + if (slot != nullptr) { delete slot; - slot = 0; + slot = nullptr; } } @@ -3073,7 +3074,7 @@ bool JoyButton::setAssignedSlot(int code, int alias, int index, if (temp) { delete temp; - temp = 0; + temp = nullptr; } getAssignmentsLocal().replace(index, slot); @@ -3093,10 +3094,10 @@ bool JoyButton::setAssignedSlot(int code, int alias, int index, } else { - if (slot) + if (slot != nullptr) { delete slot; - slot = 0; + slot = nullptr; } } @@ -3168,10 +3169,10 @@ bool JoyButton::insertAssignedSlot(int code, int alias, int index, } else { - if (slot) + if (slot != nullptr) { delete slot; - slot = 0; + slot = nullptr; } } @@ -3281,10 +3282,10 @@ bool JoyButton::setAssignedSlot(JoyButtonSlot *otherSlot, int index) { // Slot already exists. Override code and place into desired slot JoyButtonSlot *temp = getAssignedSlots()->at(index); - if (temp) + if (temp != nullptr) { delete temp; - temp = 0; + temp = nullptr; } getAssignmentsLocal().replace(index, newslot); @@ -3304,7 +3305,7 @@ bool JoyButton::setAssignedSlot(JoyButtonSlot *otherSlot, int index) else { delete newslot; - newslot = 0; + newslot = nullptr; } return permitSlot; @@ -4143,10 +4144,10 @@ void JoyButton::removeAssignedSlot(int index) if ((index >= 0) && (index < getAssignedSlots()->size())) { JoyButtonSlot *slot = getAssignedSlots()->takeAt(index); - if (slot) + if (slot != nullptr) { delete slot; - slot = 0; + slot = nullptr; } tempAssignLocker.unlock(); @@ -4837,21 +4838,21 @@ bool JoyButton::isDefault() value = value && (mouseCurve == DEFAULTMOUSECURVE); value = value && (springWidth == DEFAULTSPRINGWIDTH); value = value && (springHeight == DEFAULTSPRINGHEIGHT); - value = value && (sensitivity == DEFAULTSENSITIVITY); + value = value && (qFuzzyCompare(sensitivity, DEFAULTSENSITIVITY)); value = value && (actionName.isEmpty()); value = value && (wheelSpeedX == DEFAULTWHEELX); value = value && (wheelSpeedY == DEFAULTWHEELY); value = value && (cycleResetActive == DEFAULTCYCLERESETACTIVE); value = value && (cycleResetInterval == DEFAULTCYCLERESET); value = value && (relativeSpring == DEFAULTRELATIVESPRING); - value = value && (easingDuration == DEFAULTEASINGDURATION); + value = value && (qFuzzyCompare(easingDuration, DEFAULTEASINGDURATION)); value = value && (extraAccelerationEnabled == false); - value = value && (extraAccelerationMultiplier == DEFAULTEXTRACCELVALUE); - value = value && (minMouseDistanceAccelThreshold == DEFAULTMINACCELTHRESHOLD); - value = value && (maxMouseDistanceAccelThreshold == DEFAULTMAXACCELTHRESHOLD); - value = value && (startAccelMultiplier == DEFAULTSTARTACCELMULTIPLIER); - value = value && (accelDuration == DEFAULTACCELEASINGDURATION); + value = value && (qFuzzyCompare(extraAccelerationMultiplier, DEFAULTEXTRACCELVALUE)); + value = value && (qFuzzyCompare(minMouseDistanceAccelThreshold, DEFAULTMINACCELTHRESHOLD)); + value = value && (qFuzzyCompare(maxMouseDistanceAccelThreshold, DEFAULTMAXACCELTHRESHOLD)); + value = value && (qFuzzyCompare(startAccelMultiplier, DEFAULTSTARTACCELMULTIPLIER)); + value = value && (qFuzzyCompare(accelDuration, DEFAULTACCELEASINGDURATION)); value = value && (springDeadCircleMultiplier == DEFAULTSPRINGRELEASERADIUS); value = value && (extraAccelCurve == DEFAULTEXTRAACCELCURVE); return value; @@ -5107,13 +5108,13 @@ void JoyButton::moveMouseCursor(int &movedX, int &movedY, int &movedElapsed) { mouseCursorInfo infoX = cursorXSpeeds.takeFirst(); mouseCursorInfo infoY = cursorYSpeeds.takeFirst(); - if (infoX.code != 0) + if (qFuzzyCompare(infoX.code, 0)) { finalx = (infoX.code < 0) ? qMin(infoX.code, finalx) : qMax(infoX.code, finalx); } - if (infoY.code != 0) + if (qFuzzyCompare(infoY.code, 0)) { finaly = (infoY.code < 0) ? qMin(infoY.code, finaly) : qMax(infoY.code, finaly); @@ -5222,9 +5223,9 @@ void JoyButton::moveMouseCursor(int &movedX, int &movedY, int &movedElapsed) // This check is more of a precaution than anything. No need to cause // a sync to happen when not needed. - if ((adjustedX != 0) || (adjustedY != 0)) + if ((qFuzzyCompare(adjustedX, 0)) || (qFuzzyCompare(adjustedY, 0))) { - sendevent(adjustedX, adjustedY); + sendevent(static_cast(adjustedX), static_cast(adjustedY)); } movedX = static_cast(adjustedX); @@ -5318,10 +5319,11 @@ void JoyButton::moveSpringMouse(int &movedX, int &movedY, bool &hasMoved) if (infoX.relative) { - if (relativeSpring.displacementX == -2.0) + if (qFuzzyCompare(relativeSpring.displacementX, -2.0)) { relativeSpring.displacementX = tempx; } + relativeSpring.relative = true; // Use largest found width for spring @@ -5330,7 +5332,7 @@ void JoyButton::moveSpringMouse(int &movedX, int &movedY, bool &hasMoved) } else { - if (fullSpring.displacementX == -2.0) + if (qFuzzyCompare(fullSpring.displacementX, -2.0)) { fullSpring.displacementX = tempx; } @@ -5347,7 +5349,7 @@ void JoyButton::moveSpringMouse(int &movedX, int &movedY, bool &hasMoved) if (infoY.relative) { - if (relativeSpring.displacementY == -2.0) + if (qFuzzyCompare(relativeSpring.displacementY, -2.0)) { relativeSpring.displacementY = tempy; } @@ -5360,7 +5362,7 @@ void JoyButton::moveSpringMouse(int &movedX, int &movedY, bool &hasMoved) } else { - if (fullSpring.displacementY == -2.0) + if (qFuzzyCompare(fullSpring.displacementY, -2.0)) { fullSpring.displacementY = tempy; } @@ -5375,8 +5377,8 @@ void JoyButton::moveSpringMouse(int &movedX, int &movedY, bool &hasMoved) fullSpring.height = qMax(infoX.height, fullSpring.height); } - if (((relativeSpring.displacementX != -2.0) && (relativeSpring.displacementY != -2.0)) && - ((fullSpring.displacementX != -2.0) && (fullSpring.displacementY != -2.0))) + if (((qFuzzyCompare(relativeSpring.displacementX, -2.0)) && (qFuzzyCompare(relativeSpring.displacementY, -2.0))) && + ((qFuzzyCompare(fullSpring.displacementX, -2.0)) && (qFuzzyCompare(fullSpring.displacementY, -2.0)))) { complete = true; } @@ -5408,11 +5410,11 @@ void JoyButton::moveSpringMouse(int &movedX, int &movedY, bool &hasMoved) fullSpring.displacementY = fullSpring.springDeadY; } - sendSpringEvent(&fullSpring, 0, &realMouseX, &realMouseY); + sendSpringEvent(&fullSpring, nullptr, &realMouseX, &realMouseY); } else { - sendSpringEvent(&fullSpring, 0, &realMouseX, &realMouseY); + sendSpringEvent(&fullSpring, nullptr, &realMouseX, &realMouseY); } } @@ -5627,7 +5629,7 @@ void JoyButton::disconnectPropertyUpdatedConnections() { qInstallMessageHandler(MessageHandler::myMessageOutput); - disconnect(this, &JoyButton::slotsChanged, 0, 0); + disconnect(this, &JoyButton::slotsChanged, nullptr, nullptr); disconnect(this, &JoyButton::propertyUpdated, parentSet->getInputDevice(), &InputDevice::profileEdited); } @@ -5780,7 +5782,7 @@ int JoyButton::calculateFinalMouseSpeed(JoyMouseCurve curve, int value) { qInstallMessageHandler(MessageHandler::myMessageOutput); - int result = JoyAxis::JOYSPEED * value; + int result = static_cast(JoyAxis::JOYSPEED) * value; switch (curve) { case QuadraticExtremeCurve: @@ -5820,7 +5822,7 @@ void JoyButton::setEasingDuration(double value) qInstallMessageHandler(MessageHandler::myMessageOutput); if ((value >= MINIMUMEASINGDURATION) && (value <= MAXIMUMEASINGDURATION) && - (value != easingDuration)) + (qFuzzyCompare(value, easingDuration))) { easingDuration = value; emit propertyUpdated(); @@ -6492,7 +6494,7 @@ void JoyButton::copyExtraAccelerationState(JoyButton *srcButton) this->updateOldAccelMulti = srcButton->updateOldAccelMulti; this->updateStartingMouseDistance = srcButton->updateStartingMouseDistance; - this->updateLastMouseDistance = srcButton->lastMouseDistance; + this->updateLastMouseDistance = static_cast(srcButton->lastMouseDistance); } void JoyButton::setUpdateInitAccel(bool state) diff --git a/src/joybuttonslot.cpp b/src/joybuttonslot.cpp index 63d30607..404db1db 100644 --- a/src/joybuttonslot.cpp +++ b/src/joybuttonslot.cpp @@ -885,10 +885,6 @@ bool JoyButtonSlot::isValidSlot() { break; } - default: - { - break; - } } return result; diff --git a/src/joybuttonstatusbox.cpp b/src/joybuttonstatusbox.cpp index a192e725..16511f12 100644 --- a/src/joybuttonstatusbox.cpp +++ b/src/joybuttonstatusbox.cpp @@ -24,6 +24,7 @@ #include #include + JoyButtonStatusBox::JoyButtonStatusBox(JoyButton *button, QWidget *parent) : QPushButton(parent) { diff --git a/src/joycontrolstick.cpp b/src/joycontrolstick.cpp index 1688a8aa..22517d5d 100644 --- a/src/joycontrolstick.cpp +++ b/src/joycontrolstick.cpp @@ -43,6 +43,7 @@ const JoyControlStick::JoyMode JoyControlStick::DEFAULTMODE = JoyControlStick::S const double JoyControlStick::DEFAULTCIRCLE = 0.0; const int JoyControlStick::DEFAULTSTICKDELAY = 0; + JoyControlStick::JoyControlStick(JoyAxis *axis1, JoyAxis *axis2, int index, int originset, QObject *parent) : QObject(parent) @@ -480,16 +481,16 @@ double JoyControlStick::getDistanceFromDeadZone(int axisXValue, int axisYValue) int squared_dist = (axis1Value * axis1Value) + (axis2Value * axis2Value); - int dist = sqrt(squared_dist); + int dist = static_cast(sqrt(squared_dist)); - double squareStickFullPhi = qMin(ang_sin ? 1/fabs(ang_sin) : 2, ang_cos ? 1/fabs(ang_cos) : 2); + double squareStickFullPhi = qMin(static_cast(ang_sin) ? 1/fabs(ang_sin) : 2, static_cast(ang_cos) ? 1/fabs(ang_cos) : 2); double circle = this->circle; double circleStickFull = (squareStickFullPhi - 1) * circle + 1; double adjustedDist = (circleStickFull > 1.0) ? (dist / circleStickFull) : dist; double adjustedDeadZone = (circleStickFull > 1.0) ? (deadZone / circleStickFull) : deadZone; - distance = (adjustedDist - adjustedDeadZone)/(double)(maxZone - adjustedDeadZone); + distance = (adjustedDist - adjustedDeadZone)/static_cast(maxZone - adjustedDeadZone); distance = qBound(0.0, distance, 1.0); return distance; } @@ -530,9 +531,9 @@ double JoyControlStick::calculateYDistanceFromDeadZone(int axisXValue, double ang_sin = sin(angle2); double ang_cos = cos(angle2); - int deadY = abs(floor(deadZone * ang_cos + 0.5)); + int deadY = static_cast(abs(floor(deadZone * ang_cos + 0.5))); - double squareStickFullPhi = qMin(ang_sin ? 1/fabs(ang_sin) : 2, ang_cos ? 1/fabs(ang_cos) : 2); + double squareStickFullPhi = qMin(static_cast(ang_sin) ? 1/fabs(ang_sin) : 2, static_cast(ang_cos) ? 1/fabs(ang_cos) : 2); double circle = this->circle; double circleStickFull = (squareStickFullPhi - 1) * circle + 1; @@ -679,7 +680,7 @@ double JoyControlStick::calculateXDistanceFromDeadZone(int axisXValue, double ang_cos = cos(angle2); int deadX = abs(static_cast(floor(deadZone * ang_sin + 0.5))); - double squareStickFullPhi = qMin(ang_sin ? 1/fabs(ang_sin) : 2, ang_cos ? 1/fabs(ang_cos) : 2); + double squareStickFullPhi = qMin(static_cast(ang_sin) ? 1/fabs(ang_sin) : 2, static_cast(ang_cos) ? 1/fabs(ang_cos) : 2); double circle = this->circle; double circleStickFull = (squareStickFullPhi - 1) * circle + 1; @@ -1236,9 +1237,9 @@ void JoyControlStick::readConfig(QXmlStreamReader *xml) else if ((xml->name() == JoyControlStickButton::xmlName) && xml->isStartElement()) { int index = xml->attributes().value("index").toString().toInt(); - JoyControlStickButton *button = buttons.value((JoyStickDirections)index); + JoyControlStickButton *button = buttons.value(static_cast(index)); - if (button) + if (button != nullptr) { button->readConfig(xml); } @@ -1967,7 +1968,7 @@ int JoyControlStick::calculateCircleXValue(int axisXValue, int axisYValue) double ang_sin = sin(angle2); double ang_cos = cos(angle2); - double squareStickFull = qMin(ang_sin ? 1/fabs(ang_sin) : 2, ang_cos ? 1/fabs(ang_cos) : 2); + double squareStickFull = qMin(static_cast(ang_sin) ? 1/fabs(ang_sin) : 2, static_cast(ang_cos) ? 1/fabs(ang_cos) : 2); double circle = this->circle; double circleStickFull = (squareStickFull - 1) * circle + 1; @@ -1991,7 +1992,7 @@ int JoyControlStick::calculateCircleYValue(int axisXValue, int axisYValue) double ang_sin = sin(angle2); double ang_cos = cos(angle2); - double squareStickFull = qMin(ang_sin ? 1/fabs(ang_sin) : 2, ang_cos ? 1/fabs(ang_cos) : 2); + double squareStickFull = qMin(static_cast(ang_sin) ? 1/fabs(ang_sin) : 2, static_cast(ang_cos) ? 1/fabs(ang_cos) : 2); double circle = this->circle; double circleStickFull = (squareStickFull - 1) * circle + 1; @@ -2174,7 +2175,7 @@ bool JoyControlStick::isDefault() value = value && (maxZone == DEFAULTMAXZONE); value = value && (diagonalRange == DEFAULTDIAGONALRANGE); value = value && (currentMode == DEFAULTMODE); - value = value && (circle == DEFAULTCIRCLE); + value = value && (qFuzzyCompare(circle, DEFAULTCIRCLE)); value = value && (stickDelay == DEFAULTSTICKDELAY); QHashIterator iter(buttons); @@ -2455,7 +2456,7 @@ double JoyControlStick::getButtonsPresetSensitivity() { JoyControlStickButton *button = iter.next().value(); double temp = button->getSensitivity(); - if (temp != presetSensitivity) + if (qFuzzyCompare(temp, presetSensitivity)) { presetSensitivity = 1.0; iter.toBack(); @@ -2818,15 +2819,15 @@ JoyControlStick::determineStandardModeDirection(int axisXValue, int axisYValue) double bearing = calculateBearing(axisXValue, axisYValue); QList anglesList = getDiagonalZoneAngles(); - int initialLeft = anglesList.value(0); - int initialRight = anglesList.value(1); - int upRightInitial = anglesList.value(2); - int rightInitial = anglesList.value(3); - int downRightInitial = anglesList.value(4); - int downInitial = anglesList.value(5); - int downLeftInitial = anglesList.value(6); - int leftInitial = anglesList.value(7); - int upLeftInitial = anglesList.value(8); + int initialLeft = static_cast(anglesList.value(0)); + int initialRight = static_cast(anglesList.value(1)); + int upRightInitial = static_cast(anglesList.value(2)); + int rightInitial = static_cast(anglesList.value(3)); + int downRightInitial = static_cast(anglesList.value(4)); + int downInitial = static_cast(anglesList.value(5)); + int downLeftInitial = static_cast(anglesList.value(6)); + int leftInitial = static_cast(anglesList.value(7)); + int upLeftInitial = static_cast(anglesList.value(8)); if ((bearing <= initialRight) || (bearing >= initialLeft)) { @@ -3243,7 +3244,7 @@ double JoyControlStick::getButtonsEasingDuration() { JoyControlStickButton *button = iter.next().value(); double temp = button->getEasingDuration(); - if (temp != result) + if (qFuzzyCompare(temp, result)) { result = JoyButton::DEFAULTEASINGDURATION; iter.toBack(); @@ -3378,7 +3379,7 @@ double JoyControlStick::getButtonsExtraAccelerationMultiplier() if (button != nullptr) { double temp = button->getExtraAccelerationMultiplier(); - if (temp != result) + if (qFuzzyCompare(temp, result)) { result = JoyButton::DEFAULTEXTRACCELVALUE; iter.toBack(); @@ -3429,7 +3430,7 @@ double JoyControlStick::getButtonsStartAccelerationMultiplier() if (button != nullptr) { double temp = button->getStartAccelMultiplier(); - if (temp != result) + if (qFuzzyCompare(temp, result)) { result = JoyButton::DEFAULTSTARTACCELMULTIPLIER; iter.toBack(); @@ -3479,7 +3480,7 @@ double JoyControlStick::getButtonsMinAccelerationThreshold() if (button != nullptr) { double temp = button->getMinAccelThreshold(); - if (temp != result) + if (qFuzzyCompare(temp, result)) { result = JoyButton::DEFAULTMINACCELTHRESHOLD; iter.toBack(); @@ -3529,7 +3530,7 @@ double JoyControlStick::getButtonsMaxAccelerationThreshold() if (button != nullptr) { double temp = button->getMaxAccelThreshold(); - if (temp != result) + if (qFuzzyCompare(temp, result)) { result = JoyButton::DEFAULTMAXACCELTHRESHOLD; iter.toBack(); @@ -3580,7 +3581,7 @@ double JoyControlStick::getButtonsAccelerationEasingDuration() if (button != nullptr) { double temp = button->getAccelExtraDuration(); - if (temp != result) + if (qFuzzyCompare(temp, result)) { result = JoyButton::DEFAULTACCELEASINGDURATION; iter.toBack(); @@ -4048,7 +4049,7 @@ double JoyControlStick::calculateXAxisDistance(int axisXValue) double distance = 0.0; int axis1Value = axisXValue; - distance = axis1Value / (double)(maxZone); + distance = axis1Value / static_cast(maxZone); if (distance < -1.0) { distance = -1.0; @@ -4072,7 +4073,7 @@ double JoyControlStick::calculateYAxisDistance(int axisYValue) double distance = 0.0; int axis2Value = axisYValue; - distance = axis2Value / (double)(maxZone); + distance = axis2Value / static_cast(maxZone); if (distance < -1.0) { distance = -1.0; @@ -4276,7 +4277,7 @@ double JoyControlStick::getSpringDeadCircleX() int deadX = abs(static_cast(floor(deadZone * ang_sin + 0.5))); double diagonalDeadX = calculateXDiagonalDeadZone(axis1Value, axis2Value); - double squareStickFullPhi = qMin(ang_sin ? 1/fabs(ang_sin) : 2, ang_cos ? 1/fabs(ang_cos) : 2); + double squareStickFullPhi = qMin(static_cast(ang_sin) ? 1/fabs(ang_sin) : 2, static_cast(ang_cos) ? 1/fabs(ang_cos) : 2); double circle = this->circle; double circleStickFull = (squareStickFullPhi - 1) * circle + 1; @@ -4321,10 +4322,10 @@ double JoyControlStick::getSpringDeadCircleY() double ang_sin = sin(angle2); double ang_cos = cos(angle2); - int deadY = abs(static_cast((int)floor(deadZone * ang_cos + 0.5))); + int deadY = abs(static_cast(floor(deadZone * ang_cos + 0.5))); double diagonalDeadY = calculateYDiagonalDeadZone(axis1Value, axis2Value); - double squareStickFullPhi = qMin(ang_sin ? 1/fabs(ang_sin) : 2, ang_cos ? 1/fabs(ang_cos) : 2); + double squareStickFullPhi = qMin(static_cast(ang_sin) ? 1/fabs(ang_sin) : 2, static_cast(ang_cos) ? 1/fabs(ang_cos) : 2); double circle = this->circle; double circleStickFull = (squareStickFullPhi - 1) * circle + 1; diff --git a/src/joycontrolstickbuttonpushbutton.cpp b/src/joycontrolstickbuttonpushbutton.cpp index 42e94830..859940ec 100644 --- a/src/joycontrolstickbuttonpushbutton.cpp +++ b/src/joycontrolstickbuttonpushbutton.cpp @@ -27,6 +27,7 @@ #include #include + JoyControlStickButtonPushButton::JoyControlStickButtonPushButton(JoyControlStickButton *button, bool displayNames, QWidget *parent) : FlashButtonWidget(displayNames, parent) { diff --git a/src/joycontrolstickcontextmenu.cpp b/src/joycontrolstickcontextmenu.cpp index 74f636dc..6e1a4ad9 100644 --- a/src/joycontrolstickcontextmenu.cpp +++ b/src/joycontrolstickcontextmenu.cpp @@ -30,6 +30,7 @@ #include #include + JoyControlStickContextMenu::JoyControlStickContextMenu(JoyControlStick *stick, QWidget *parent) : QMenu(parent), helper(stick) diff --git a/src/joycontrolstickeditdialog.cpp b/src/joycontrolstickeditdialog.cpp index 167ce2c8..01e50d63 100644 --- a/src/joycontrolstickeditdialog.cpp +++ b/src/joycontrolstickeditdialog.cpp @@ -110,11 +110,11 @@ JoyControlStickEditDialog::JoyControlStickEditDialog(JoyControlStick *stick, QWi ui->fromSafeZoneValueLabel->setText(QString::number(validDistance)); double circleValue = stick->getCircleAdjust(); - ui->squareStickSlider->setValue(circleValue * 100); - ui->squareStickSpinBox->setValue(circleValue * 100); + ui->squareStickSlider->setValue(static_cast(circleValue) * 100); + ui->squareStickSpinBox->setValue(static_cast(circleValue) * 100); int stickDelay = stick->getStickDelay(); - ui->stickDelaySlider->setValue(stickDelay * .1); + ui->stickDelaySlider->setValue(static_cast(stickDelay * .1)); ui->stickDelayDoubleSpinBox->setValue(stickDelay * .001); ui->modifierPushButton->setText(stick->getModifierButton()->getSlotsSummary()); diff --git a/src/joycontrolstickstatusbox.cpp b/src/joycontrolstickstatusbox.cpp index 9383fe22..b3ac1f0d 100644 --- a/src/joycontrolstickstatusbox.cpp +++ b/src/joycontrolstickstatusbox.cpp @@ -157,10 +157,10 @@ void JoyControlStickStatusBox::drawEightWayBox() painter.setPen(penny); painter.setBrush(QBrush(Qt::green)); - painter.drawPie(-JoyAxis::AXISMAX, -JoyAxis::AXISMAX, JoyAxis::AXISMAX*2, JoyAxis::AXISMAX*2, anglesList.value(2)*16, stick->getDiagonalRange()*16); - painter.drawPie(-JoyAxis::AXISMAX, -JoyAxis::AXISMAX, JoyAxis::AXISMAX*2, JoyAxis::AXISMAX*2, anglesList.value(4)*16, stick->getDiagonalRange()*16); - painter.drawPie(-JoyAxis::AXISMAX, -JoyAxis::AXISMAX, JoyAxis::AXISMAX*2, JoyAxis::AXISMAX*2, anglesList.value(6)*16, stick->getDiagonalRange()*16); - painter.drawPie(-JoyAxis::AXISMAX, -JoyAxis::AXISMAX, JoyAxis::AXISMAX*2, JoyAxis::AXISMAX*2, anglesList.value(8)*16, stick->getDiagonalRange()*16); + painter.drawPie(-JoyAxis::AXISMAX, -JoyAxis::AXISMAX, JoyAxis::AXISMAX*2, JoyAxis::AXISMAX*2, static_cast(anglesList.value(2)*16), stick->getDiagonalRange()*16); + painter.drawPie(-JoyAxis::AXISMAX, -JoyAxis::AXISMAX, JoyAxis::AXISMAX*2, JoyAxis::AXISMAX*2, static_cast(anglesList.value(4)*16), stick->getDiagonalRange()*16); + painter.drawPie(-JoyAxis::AXISMAX, -JoyAxis::AXISMAX, JoyAxis::AXISMAX*2, JoyAxis::AXISMAX*2, static_cast(anglesList.value(6)*16), stick->getDiagonalRange()*16); + painter.drawPie(-JoyAxis::AXISMAX, -JoyAxis::AXISMAX, JoyAxis::AXISMAX*2, JoyAxis::AXISMAX*2, static_cast(anglesList.value(8)*16), stick->getDiagonalRange()*16); // Draw deadzone circle penny.setWidth(0); diff --git a/src/joydpad.cpp b/src/joydpad.cpp index c2bb76bc..c92bee15 100644 --- a/src/joydpad.cpp +++ b/src/joydpad.cpp @@ -322,7 +322,7 @@ void JoyDPad::joyEvent(int value, bool ignoresets) emit active(value); } - pendingDirection = (JoyDPadButton::JoyDPadDirections)value; + pendingDirection = static_cast(value); if (ignoresets || (dpadDelay == 0)) { @@ -701,7 +701,7 @@ double JoyDPad::getButtonsPresetSensitivity() { JoyDPadButton *button = iter.next().value(); double temp = button->getSensitivity(); - if (temp != presetSensitivity) + if (qFuzzyCompare(temp, presetSensitivity)) { presetSensitivity = 1.0; iter.toBack(); @@ -1188,7 +1188,7 @@ double JoyDPad::getButtonsEasingDuration() { JoyDPadButton *button = iter.next().value(); double temp = button->getEasingDuration(); - if (temp != result) + if (qFuzzyCompare(temp, result)) { result = JoyButton::DEFAULTEASINGDURATION; iter.toBack(); diff --git a/src/joydpadbuttonwidget.cpp b/src/joydpadbuttonwidget.cpp index a3129a67..43bd40ef 100644 --- a/src/joydpadbuttonwidget.cpp +++ b/src/joydpadbuttonwidget.cpp @@ -23,6 +23,7 @@ #include #include + JoyDPadButtonWidget::JoyDPadButtonWidget(JoyButton *button, bool displayNames, QWidget *parent) : JoyButtonWidget(button, displayNames, parent) { diff --git a/src/joystick.cpp b/src/joystick.cpp index 13c8d962..a8fefc14 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -26,6 +26,7 @@ const QString Joystick::xmlName = "joystick"; + Joystick::Joystick(SDL_Joystick *joyhandle, int deviceIndex, AntiMicroSettings *settings, QObject *parent) : InputDevice(deviceIndex, settings, parent) diff --git a/src/joytabwidget.cpp b/src/joytabwidget.cpp index 049185fe..f72e923b 100644 --- a/src/joytabwidget.cpp +++ b/src/joytabwidget.cpp @@ -2312,7 +2312,7 @@ void JoyTabWidget::removeSetButtons(SetJoystick *set) } } - while (current_layout && ((child = current_layout->takeAt(0)) != 0)) + while (current_layout && ((child = current_layout->takeAt(0)) != nullptr)) { current_layout->removeWidget(child->widget()); delete child->widget(); diff --git a/src/joytabwidgetcontainer.cpp b/src/joytabwidgetcontainer.cpp index dfa6b29e..8ca8aab6 100644 --- a/src/joytabwidgetcontainer.cpp +++ b/src/joytabwidgetcontainer.cpp @@ -25,6 +25,7 @@ #include #include + JoyTabWidgetContainer::JoyTabWidgetContainer(QWidget *parent) : QTabWidget(parent) { diff --git a/src/keyboard/virtualkeyboardmousewidget.cpp b/src/keyboard/virtualkeyboardmousewidget.cpp index f3c77886..86fe185a 100644 --- a/src/keyboard/virtualkeyboardmousewidget.cpp +++ b/src/keyboard/virtualkeyboardmousewidget.cpp @@ -63,6 +63,8 @@ QHash VirtualKeyboardMouseWidget::topRowKeys = QHash (); + + VirtualKeyboardMouseWidget::VirtualKeyboardMouseWidget(InputDevice *joystick, ButtonEditDialogHelper* helper, QuickSetDialog* quickSetDialog, QWidget *parent) : QTabWidget(parent) { @@ -809,7 +811,7 @@ void VirtualKeyboardMouseWidget::establishVirtualKeyboardSingleSignalConnections while (iter.hasNext()) { VirtualKeyPushButton *keybutton = iter.next(); - disconnect(keybutton, &VirtualKeyPushButton::keycodeObtained, 0, 0); + disconnect(keybutton, &VirtualKeyPushButton::keycodeObtained, nullptr, nullptr); connect(keybutton, &VirtualKeyPushButton::keycodeObtained, this, &VirtualKeyboardMouseWidget::processSingleKeyboardSelection); } @@ -817,14 +819,14 @@ void VirtualKeyboardMouseWidget::establishVirtualKeyboardSingleSignalConnections while (iterActions.hasNext()) { QAction *temp = iterActions.next(); - disconnect(temp, &QAction::triggered, 0, 0); + disconnect(temp, &QAction::triggered, nullptr, nullptr); connect(temp, &QAction::triggered, this, [this, temp](bool checked) { otherKeysActionSingle(temp, checked); }); } - disconnect(noneButton, &QPushButton::clicked, 0, 0); + disconnect(noneButton, &QPushButton::clicked, nullptr, nullptr); connect(noneButton, &QPushButton::clicked, this, &VirtualKeyboardMouseWidget::clearButtonSlotsFinish); #ifndef QT_DEBUG_NO_OUTPUT @@ -841,7 +843,7 @@ void VirtualKeyboardMouseWidget::establishVirtualKeyboardAdvancedSignalConnectio while (iter.hasNext()) { VirtualKeyPushButton *keybutton = iter.next(); - disconnect(keybutton, &VirtualKeyPushButton::keycodeObtained, 0, 0); + disconnect(keybutton, &VirtualKeyPushButton::keycodeObtained, nullptr, nullptr); connect(keybutton, &VirtualKeyPushButton::keycodeObtained, this, &VirtualKeyboardMouseWidget::processAdvancedKeyboardSelection); } @@ -849,13 +851,13 @@ void VirtualKeyboardMouseWidget::establishVirtualKeyboardAdvancedSignalConnectio while (iterActions.hasNext()) { QAction *temp = iterActions.next(); - disconnect(temp, &QAction::triggered, 0, 0); + disconnect(temp, &QAction::triggered, nullptr, nullptr); connect(temp, &QAction::triggered, this, [this, temp](bool checked) { otherKeysActionAdvanced(temp, checked); }); } - disconnect(noneButton, &QPushButton::clicked, 0, 0); + disconnect(noneButton, &QPushButton::clicked, nullptr, nullptr); connect(noneButton, &QPushButton::clicked, this, &VirtualKeyboardMouseWidget::clearButtonSlots); } @@ -868,7 +870,7 @@ void VirtualKeyboardMouseWidget::establishVirtualMouseSignalConnections() while (iter.hasNext()) { VirtualMousePushButton *mousebutton = iter.next(); - disconnect(mousebutton, &VirtualMousePushButton::mouseSlotCreated, 0, 0); + disconnect(mousebutton, &VirtualMousePushButton::mouseSlotCreated, nullptr, nullptr); connect(mousebutton, &VirtualMousePushButton::mouseSlotCreated, this, &VirtualKeyboardMouseWidget::processSingleMouseSelection); } } @@ -882,7 +884,7 @@ void VirtualKeyboardMouseWidget::establishVirtualMouseAdvancedSignalConnections( while (iter.hasNext()) { VirtualMousePushButton *mousebutton = iter.next(); - disconnect(mousebutton, &VirtualMousePushButton::mouseSlotCreated, 0, 0); + disconnect(mousebutton, &VirtualMousePushButton::mouseSlotCreated, nullptr, nullptr); connect(mousebutton, &VirtualMousePushButton::mouseSlotCreated, this, &VirtualKeyboardMouseWidget::processAdvancedMouseSelection); } } diff --git a/src/keyboard/virtualkeypushbutton.cpp b/src/keyboard/virtualkeypushbutton.cpp index bbbea701..c0752ad5 100644 --- a/src/keyboard/virtualkeypushbutton.cpp +++ b/src/keyboard/virtualkeypushbutton.cpp @@ -31,6 +31,8 @@ QHash VirtualKeyPushButton::knownAliases = QHash (); + + VirtualKeyPushButton::VirtualKeyPushButton(QString xcodestring, QWidget *parent) : QPushButton(parent) { diff --git a/src/localantimicroserver.cpp b/src/localantimicroserver.cpp index 51f6d190..a509519b 100644 --- a/src/localantimicroserver.cpp +++ b/src/localantimicroserver.cpp @@ -25,6 +25,7 @@ #include #include + LocalAntiMicroServer::LocalAntiMicroServer(QObject *parent) : QObject(parent) { diff --git a/src/main.cpp b/src/main.cpp index 2e61b74e..b893cbb9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -271,7 +271,7 @@ int main(int argc, char *argv[]) // Update log info based on config values if( cmdutility.getCurrentLogLevel() == Logger::LOG_NONE && settings.contains("LogLevel")) { - appLogger.setLogLevel( (Logger::LogLevel) settings.value("LogLevel").toInt() ); + appLogger.setLogLevel( static_cast(settings.value("LogLevel").toInt()) ); } if( cmdutility.getCurrentLogFile().isEmpty() && settings.contains("LogFile")) { @@ -506,7 +506,7 @@ int main(int argc, char *argv[]) // Update log info based on config values if( cmdutility.getCurrentLogLevel() == Logger::LOG_NONE && settings->contains("LogLevel")) { - appLogger.setLogLevel( (Logger::LogLevel)settings->value("LogLevel").toInt() ); + appLogger.setLogLevel( static_cast(settings->value("LogLevel").toInt()) ); } if( cmdutility.getCurrentLogFile().isEmpty() && settings->contains("LogFile")) { @@ -548,7 +548,7 @@ int main(int argc, char *argv[]) sigemptyset(&termaction.sa_mask); termaction.sa_flags = 0; - sigaction(SIGTERM, &termaction, 0); + sigaction(SIGTERM, &termaction, nullptr); // Have program handle SIGINT struct sigaction termint; @@ -556,7 +556,7 @@ int main(int argc, char *argv[]) sigemptyset(&termint.sa_mask); termint.sa_flags = 0; - sigaction(SIGINT, &termint, 0); + sigaction(SIGINT, &termint, nullptr); #endif diff --git a/src/mousedialog/mouseaxissettingsdialog.cpp b/src/mousedialog/mouseaxissettingsdialog.cpp index c7931165..b1c61e07 100644 --- a/src/mousedialog/mouseaxissettingsdialog.cpp +++ b/src/mousedialog/mouseaxissettingsdialog.cpp @@ -28,6 +28,7 @@ #include #include #include +#include MouseAxisSettingsDialog::MouseAxisSettingsDialog(JoyAxis *axis, QWidget *parent) : MouseSettingsDialog(parent), @@ -339,8 +340,7 @@ void MouseAxisSettingsDialog::calculateExtraAccelerationMultiplier() { qInstallMessageHandler(MessageHandler::myMessageOutput); - if ((axis->getPAxisButton()->getExtraAccelerationMultiplier()) == - (axis->getNAxisButton()->getExtraAccelerationMultiplier())) + if (qFuzzyCompare(axis->getPAxisButton()->getExtraAccelerationMultiplier(), axis->getNAxisButton()->getExtraAccelerationMultiplier())) { double temp = axis->getPAxisButton()->getExtraAccelerationMultiplier(); ui->extraAccelDoubleSpinBox->setValue(temp); @@ -349,11 +349,9 @@ void MouseAxisSettingsDialog::calculateExtraAccelerationMultiplier() void MouseAxisSettingsDialog::calculateStartAccelerationMultiplier() { - qInstallMessageHandler(MessageHandler::myMessageOutput); - if ((axis->getPAxisButton()->getStartAccelMultiplier()) == - (axis->getNAxisButton()->getStartAccelMultiplier())) + if (qFuzzyCompare(axis->getPAxisButton()->getStartAccelMultiplier(), axis->getNAxisButton()->getStartAccelMultiplier())) { double temp = axis->getPAxisButton()->getStartAccelMultiplier(); ui->minMultiDoubleSpinBox->setValue(temp); @@ -364,8 +362,7 @@ void MouseAxisSettingsDialog::calculateMinAccelerationThreshold() { qInstallMessageHandler(MessageHandler::myMessageOutput); - if ((axis->getPAxisButton()->getMinAccelThreshold()) == - (axis->getNAxisButton()->getMinAccelThreshold())) + if (qFuzzyCompare(axis->getPAxisButton()->getMinAccelThreshold(), axis->getNAxisButton()->getMinAccelThreshold())) { double temp = axis->getPAxisButton()->getMinAccelThreshold(); ui->minThresholdDoubleSpinBox->setValue(temp); @@ -376,8 +373,7 @@ void MouseAxisSettingsDialog::calculateMaxAccelerationThreshold() { qInstallMessageHandler(MessageHandler::myMessageOutput); - if ((axis->getPAxisButton()->getMaxAccelThreshold()) == - (axis->getNAxisButton()->getMaxAccelThreshold())) + if (qFuzzyCompare(axis->getPAxisButton()->getMaxAccelThreshold(), axis->getNAxisButton()->getMaxAccelThreshold())) { double temp = axis->getPAxisButton()->getMaxAccelThreshold(); ui->maxThresholdDoubleSpinBox->setValue(temp); @@ -388,8 +384,7 @@ void MouseAxisSettingsDialog::calculateAccelExtraDuration() { qInstallMessageHandler(MessageHandler::myMessageOutput); - if ((axis->getPAxisButton()->getAccelExtraDuration()) == - (axis->getNAxisButton()->getAccelExtraDuration())) + if (qFuzzyCompare(axis->getPAxisButton()->getAccelExtraDuration(), axis->getNAxisButton()->getAccelExtraDuration())) { double temp = axis->getPAxisButton()->getAccelExtraDuration(); ui->accelExtraDurationDoubleSpinBox->setValue(temp); diff --git a/src/mousedialog/mousebuttonsettingsdialog.cpp b/src/mousedialog/mousebuttonsettingsdialog.cpp index b7fe1086..801095a9 100644 --- a/src/mousedialog/mousebuttonsettingsdialog.cpp +++ b/src/mousedialog/mousebuttonsettingsdialog.cpp @@ -30,6 +30,7 @@ #include #include + MouseButtonSettingsDialog::MouseButtonSettingsDialog(JoyButton *button, QWidget *parent) : MouseSettingsDialog(parent), helper(button) diff --git a/src/uihelpers/advancebuttondialoghelper.cpp b/src/uihelpers/advancebuttondialoghelper.cpp index 23632b39..db599b76 100644 --- a/src/uihelpers/advancebuttondialoghelper.cpp +++ b/src/uihelpers/advancebuttondialoghelper.cpp @@ -22,6 +22,7 @@ #include + AdvanceButtonDialogHelper::AdvanceButtonDialogHelper(JoyButton *button, QObject *parent) : QObject(parent) diff --git a/src/uihelpers/buttoneditdialoghelper.cpp b/src/uihelpers/buttoneditdialoghelper.cpp index 1473e7b7..e7bdba6c 100644 --- a/src/uihelpers/buttoneditdialoghelper.cpp +++ b/src/uihelpers/buttoneditdialoghelper.cpp @@ -23,6 +23,7 @@ #include #include + ButtonEditDialogHelper::ButtonEditDialogHelper(JoyButton *button, QObject *parent) : QObject(parent) { diff --git a/src/uihelpers/dpadcontextmenuhelper.cpp b/src/uihelpers/dpadcontextmenuhelper.cpp index e9557756..eac43e6d 100644 --- a/src/uihelpers/dpadcontextmenuhelper.cpp +++ b/src/uihelpers/dpadcontextmenuhelper.cpp @@ -24,6 +24,7 @@ #include #include + DPadContextMenuHelper::DPadContextMenuHelper(JoyDPad *dpad, QObject *parent) : QObject(parent) { diff --git a/src/uihelpers/dpadeditdialoghelper.cpp b/src/uihelpers/dpadeditdialoghelper.cpp index 95b425c6..18fdfa99 100644 --- a/src/uihelpers/dpadeditdialoghelper.cpp +++ b/src/uihelpers/dpadeditdialoghelper.cpp @@ -23,6 +23,7 @@ #include #include + DPadEditDialogHelper::DPadEditDialogHelper(JoyDPad *dpad, QObject *parent) : QObject(parent) { diff --git a/src/uihelpers/gamecontrollermappingdialoghelper.cpp b/src/uihelpers/gamecontrollermappingdialoghelper.cpp index f72cdf7e..bfbbcd25 100644 --- a/src/uihelpers/gamecontrollermappingdialoghelper.cpp +++ b/src/uihelpers/gamecontrollermappingdialoghelper.cpp @@ -22,6 +22,7 @@ #include + GameControllerMappingDialogHelper::GameControllerMappingDialogHelper(InputDevice *device, QObject *parent) : QObject(parent) diff --git a/src/uihelpers/joyaxiscontextmenuhelper.cpp b/src/uihelpers/joyaxiscontextmenuhelper.cpp index 778f7438..9a20a327 100644 --- a/src/uihelpers/joyaxiscontextmenuhelper.cpp +++ b/src/uihelpers/joyaxiscontextmenuhelper.cpp @@ -22,6 +22,7 @@ #include + JoyAxisContextMenuHelper::JoyAxisContextMenuHelper(JoyAxis *axis, QObject *parent) : QObject(parent) { diff --git a/src/uihelpers/joycontrolstickcontextmenuhelper.cpp b/src/uihelpers/joycontrolstickcontextmenuhelper.cpp index 521d0a44..faa2a067 100644 --- a/src/uihelpers/joycontrolstickcontextmenuhelper.cpp +++ b/src/uihelpers/joycontrolstickcontextmenuhelper.cpp @@ -24,6 +24,7 @@ #include #include + JoyControlStickContextMenuHelper::JoyControlStickContextMenuHelper(JoyControlStick *stick, QObject *parent) : QObject(parent) { diff --git a/src/uihelpers/joycontrolstickeditdialoghelper.cpp b/src/uihelpers/joycontrolstickeditdialoghelper.cpp index 51c37ac2..6686b421 100644 --- a/src/uihelpers/joycontrolstickeditdialoghelper.cpp +++ b/src/uihelpers/joycontrolstickeditdialoghelper.cpp @@ -23,6 +23,7 @@ #include + JoyControlStickEditDialogHelper::JoyControlStickEditDialogHelper(JoyControlStick *stick, QObject *parent) : QObject(parent) { diff --git a/src/uihelpers/joytabwidgethelper.cpp b/src/uihelpers/joytabwidgethelper.cpp index efeb9512..9f4f5e86 100644 --- a/src/uihelpers/joytabwidgethelper.cpp +++ b/src/uihelpers/joytabwidgethelper.cpp @@ -26,6 +26,7 @@ #include + JoyTabWidgetHelper::JoyTabWidgetHelper(InputDevice *device, QObject *parent) : QObject(parent) {