mirror/antimicrox
1
0
Fork 0
mirror of https://github.com/AntiMicroX/antimicrox.git synced 2026-07-31 17:46:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changes to remove some warnings. Changes based on platform testing.

Browse Source
This commit is contained in:
Travis Nickles
2015-08-05 02:39:32 -05:00
parent 6fcdbe70e0
commit fd1b06ff16
14 changed files with 466 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/joyaxiscontextmenu.cpp
View File

@@ -294,20 +294,28 @@ void JoyAxisContextMenu::setAxisPreset()
if (nbuttonslot)
{
JoyAxisButton *button = axis->getNAxisButton();
QMetaObject::invokeMethod(button, "clearSlotsEventReset", Qt::BlockingQueuedConnection,
QMetaObject::invokeMethod(button, "clearSlotsEventReset",
Q_ARG(bool, false));
//button->clearSlotsEventReset(false);
button->setAssignedSlot(nbuttonslot->getSlotCode(), nbuttonslot->getSlotCodeAlias(), nbuttonslot->getSlotMode());
QMetaObject::invokeMethod(button, "setAssignedSlot", Qt::BlockingQueuedConnection,
Q_ARG(int, nbuttonslot->getSlotCode()),
Q_ARG(unsigned int, nbuttonslot->getSlotCodeAlias()),
Q_ARG(JoyButtonSlot::JoySlotInputAction, nbuttonslot->getSlotMode()));
//button->setAssignedSlot(nbuttonslot->getSlotCode(), nbuttonslot->getSlotCodeAlias(), nbuttonslot->getSlotMode());
nbuttonslot->deleteLater();
}
if (pbuttonslot)
{
JoyAxisButton *button = axis->getPAxisButton();
QMetaObject::invokeMethod(button, "clearSlotsEventReset", Qt::BlockingQueuedConnection,
QMetaObject::invokeMethod(button, "clearSlotsEventReset",
Q_ARG(bool, false));
//button->clearSlotsEventReset(false);
button->setAssignedSlot(pbuttonslot->getSlotCode(), pbuttonslot->getSlotCodeAlias(), pbuttonslot->getSlotMode());
QMetaObject::invokeMethod(button, "setAssignedSlot", Qt::BlockingQueuedConnection,
Q_ARG(int, pbuttonslot->getSlotCode()),
Q_ARG(unsigned int, pbuttonslot->getSlotCodeAlias()),
Q_ARG(JoyButtonSlot::JoySlotInputAction, pbuttonslot->getSlotMode()));
//button->setAssignedSlot(pbuttonslot->getSlotCode(), pbuttonslot->getSlotCodeAlias(), pbuttonslot->getSlotMode());
pbuttonslot->deleteLater();
}
@@ -410,10 +418,14 @@ void JoyAxisContextMenu::setTriggerPreset()
if (pbuttonslot)
{
JoyAxisButton *button = axis->getPAxisButton();
QMetaObject::invokeMethod(button, "clearSlotsEventReset", Qt::BlockingQueuedConnection,
QMetaObject::invokeMethod(button, "clearSlotsEventReset",
Q_ARG(bool, false));
//button->clearSlotsEventReset(false);
button->setAssignedSlot(pbuttonslot->getSlotCode(), pbuttonslot->getSlotCodeAlias(), pbuttonslot->getSlotMode());
QMetaObject::invokeMethod(button, "setAssignedSlot", Qt::BlockingQueuedConnection,
Q_ARG(int, pbuttonslot->getSlotCode()),
Q_ARG(unsigned int, pbuttonslot->getSlotCodeAlias()),
Q_ARG(JoyButtonSlot::JoySlotInputAction, pbuttonslot->getSlotMode()));
//button->setAssignedSlot(pbuttonslot->getSlotCode(), pbuttonslot->getSlotCodeAlias(), pbuttonslot->getSlotMode());
pbuttonslot->deleteLater();
}
}