mirror of
https://github.com/CalcProgrammer1/OpenRGB.git
synced 2025-12-23 23:37:48 -05:00
Fix warnings in Qt6 builds
This commit is contained in:
committed by
Adam Honse
parent
45af044cd8
commit
a24a497759
2
cli.cpp
2
cli.cpp
@@ -29,7 +29,7 @@
|
||||
\*-------------------------------------------------------------*/
|
||||
#ifdef _WIN32
|
||||
#include <shellapi.h>
|
||||
#define strcasecmp strcmpi
|
||||
#define strcasecmp _strcmpi
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
6
main.cpp
6
main.cpp
@@ -221,8 +221,10 @@ int main(int argc, char* argv[])
|
||||
/*-----------------------------------------------------*\
|
||||
| Enable high DPI scaling support |
|
||||
\*-----------------------------------------------------*/
|
||||
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------*\
|
||||
| Enable high DPI fractional scaling support on Windows |
|
||||
|
||||
@@ -596,10 +596,17 @@ void DeviceView::mousePressEvent(QMouseEvent *event)
|
||||
/*-----------------------------------------------------*\
|
||||
| It's okay if the size becomes negative |
|
||||
\*-----------------------------------------------------*/
|
||||
selectionRect.setLeft(event->x());
|
||||
selectionRect.setTop(event->y());
|
||||
selectionRect.setRight(event->x());
|
||||
selectionRect.setBottom(event->y());
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
selectionRect.setLeft(event->position().x());
|
||||
selectionRect.setTop(event->position().y());
|
||||
selectionRect.setRight(event->position().x());
|
||||
selectionRect.setBottom(event->position().y());
|
||||
#else
|
||||
selectionRect.setLeft(event->x());
|
||||
selectionRect.setTop(event->y());
|
||||
selectionRect.setRight(event->x());
|
||||
selectionRect.setBottom(event->y());
|
||||
#endif
|
||||
|
||||
updateSelection();
|
||||
update();
|
||||
@@ -611,8 +618,14 @@ void DeviceView::mouseMoveEvent(QMouseEvent *event)
|
||||
if(per_led)
|
||||
{
|
||||
lastMousePos = event->pos();
|
||||
selectionRect.setRight(event->x());
|
||||
selectionRect.setBottom(event->y());
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
selectionRect.setRight(event->position().x());
|
||||
selectionRect.setBottom(event->position().y());
|
||||
#else
|
||||
selectionRect.setRight(event->x());
|
||||
selectionRect.setBottom(event->y());
|
||||
#endif
|
||||
|
||||
if(mouseDown)
|
||||
{
|
||||
|
||||
@@ -1641,7 +1641,11 @@ void OpenRGBDialog::onShowDialogMessage()
|
||||
|
||||
DontShowAgain = false;
|
||||
|
||||
QObject::connect(CheckBox_DontShowAgain, &QCheckBox::stateChanged, [this](int state)
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
QObject::connect(CheckBox_DontShowAgain, &QCheckBox::checkStateChanged, [this](Qt::CheckState state)
|
||||
#else
|
||||
QObject::connect(CheckBox_DontShowAgain, &QCheckBox::stateChanged, [this](int state)
|
||||
#endif
|
||||
{
|
||||
if(static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user