diff --git a/QtScrcpy/device/controller/controller.cpp b/QtScrcpy/device/controller/controller.cpp index c47efc6..4f45854 100644 --- a/QtScrcpy/device/controller/controller.cpp +++ b/QtScrcpy/device/controller/controller.cpp @@ -36,7 +36,7 @@ void Controller::postControlMsg(ControlMsg *controlMsg) void Controller::test(QRect rc) { ControlMsg *controlMsg = new ControlMsg(ControlMsg::CMT_INJECT_TOUCH); - controlMsg->setInjectTouchMsgData(POINTER_ID_MOUSE, AMOTION_EVENT_ACTION_DOWN, AMOTION_EVENT_BUTTON_PRIMARY, rc, 1.0f); + controlMsg->setInjectTouchMsgData(static_cast(POINTER_ID_MOUSE), AMOTION_EVENT_ACTION_DOWN, AMOTION_EVENT_BUTTON_PRIMARY, rc, 1.0f); postControlMsg(controlMsg); } diff --git a/QtScrcpy/device/controller/inputconvert/controlmsg.h b/QtScrcpy/device/controller/inputconvert/controlmsg.h index 2dc4267..73f4669 100644 --- a/QtScrcpy/device/controller/inputconvert/controlmsg.h +++ b/QtScrcpy/device/controller/inputconvert/controlmsg.h @@ -11,7 +11,7 @@ #define CONTROL_MSG_TEXT_MAX_LENGTH 300 #define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH 4093 -#define POINTER_ID_MOUSE UINT64_C(-1) +#define POINTER_ID_MOUSE static_cast(-1) // ControlMsg class ControlMsg : public QScrcpyEvent { diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertnormal.cpp b/QtScrcpy/device/controller/inputconvert/inputconvertnormal.cpp index e0898aa..c747a92 100644 --- a/QtScrcpy/device/controller/inputconvert/inputconvertnormal.cpp +++ b/QtScrcpy/device/controller/inputconvert/inputconvertnormal.cpp @@ -43,7 +43,8 @@ void InputConvertNormal::mouseEvent(const QMouseEvent *from, const QSize &frameS if (!controlMsg) { return; } - controlMsg->setInjectTouchMsgData(POINTER_ID_MOUSE, action, convertMouseButtons(from->buttons()), QRect(pos.toPoint(), frameSize), 1.0f); + controlMsg->setInjectTouchMsgData( + static_cast(POINTER_ID_MOUSE), action, convertMouseButtons(from->buttons()), QRect(pos.toPoint(), frameSize), 1.0f); sendControlMsg(controlMsg); } @@ -134,7 +135,7 @@ AndroidMotioneventButtons InputConvertNormal::convertMouseButtons(Qt::MouseButto if (buttonState & Qt::XButton2) { buttons |= AMOTION_EVENT_BUTTON_FORWARD; } - return (AndroidMotioneventButtons)buttons; + return static_cast(buttons); } AndroidKeycode InputConvertNormal::convertKeyCode(int key, Qt::KeyboardModifiers modifiers) @@ -338,5 +339,5 @@ AndroidMetastate InputConvertNormal::convertMetastate(Qt::KeyboardModifiers modi // no mapping? } */ - return (AndroidMetastate)metastate; + return static_cast(metastate); } diff --git a/QtScrcpy/device/stream/stream.cpp b/QtScrcpy/device/stream/stream.cpp index 4e26d34..2611156 100644 --- a/QtScrcpy/device/stream/stream.cpp +++ b/QtScrcpy/device/stream/stream.cpp @@ -230,7 +230,7 @@ bool Stream::recvPacket(AVPacket *packet) quint64 pts = bufferRead64be(header); quint32 len = bufferRead32be(&header[8]); - Q_ASSERT(pts == NO_PTS || (pts & 0x8000000000000000) == 0); + Q_ASSERT(pts == static_cast(NO_PTS) || (pts & 0x8000000000000000) == 0); Q_ASSERT(len); if (av_new_packet(packet, len)) { @@ -244,7 +244,7 @@ bool Stream::recvPacket(AVPacket *packet) return false; } - packet->pts = pts != NO_PTS ? (int64_t)pts : AV_NOPTS_VALUE; + packet->pts = pts != NO_PTS ? static_cast(pts) : static_cast(AV_NOPTS_VALUE); return true; }