From 962b1c82c3d33eed20e7fa947d513c09fe5d5e2f Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Wed, 17 Feb 2021 23:16:00 +0100
Subject: [PATCH] Build system update, minor fix

---
 .ci/windows_docker.sh    | 2 +-
 .ci/wininstall_docker.sh | 2 +-
 .drone.yml               | 4 ++--
 .gitlab-ci.yml           | 4 ++--
 MapLocationDialog.cpp    | 7 +++----
 README.md                | 4 ++--
 main.cpp                 | 1 -
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.ci/windows_docker.sh b/.ci/windows_docker.sh
index 0f600eb..9bcea07 100755
--- a/.ci/windows_docker.sh
+++ b/.ci/windows_docker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DOCKER_IMAGE=sypingauto/gta5view-build:1.9-static
+DOCKER_IMAGE=sypingauto/gta5view-build:1.10-static
 PROJECT_DIR_DOCKER=/gta5view
 
 cd ${PROJECT_DIR} && \
diff --git a/.ci/wininstall_docker.sh b/.ci/wininstall_docker.sh
index 790b1c2..9519744 100755
--- a/.ci/wininstall_docker.sh
+++ b/.ci/wininstall_docker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DOCKER_IMAGE=sypingauto/gta5view-build:1.9-shared
+DOCKER_IMAGE=sypingauto/gta5view-build:1.10-shared
 PROJECT_DIR_DOCKER=/gta5view
 
 cd ${PROJECT_DIR} && \
diff --git a/.drone.yml b/.drone.yml
index c35bafa..7564770 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,7 +6,7 @@ environment:
 
 steps:
 - name: Windows Installer
-  image: sypingauto/gta5view-build:1.9-shared
+  image: sypingauto/gta5view-build:1.10-shared
   environment:
     BUILD_SCRIPT: "wininstall_build.sh"
     QT_SELECT: "qt5-x86_64-w64-mingw32"
@@ -18,7 +18,7 @@ steps:
     - name: gta5view
       path: /srv/gta5view
 - name: Windows Portable
-  image: sypingauto/gta5view-build:1.9-static
+  image: sypingauto/gta5view-build:1.10-static
   environment:
     BUILD_SCRIPT: "windows_build.sh"
     QT_SELECT: "qt5-x86_64-w64-mingw32"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52b2a85..95d03b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
 
 Windows Installer:
   stage: build
-  image: sypingauto/gta5view-build:1.9-shared
+  image: sypingauto/gta5view-build:1.10-shared
   variables:
     BUILD_SCRIPT: "wininstall_build.sh"
     QT_SELECT: "qt5-x86_64-w64-mingw32"
@@ -19,7 +19,7 @@ Windows Installer:
 
 Windows Portable:
   stage: build
-  image: sypingauto/gta5view-build:1.9-static
+  image: sypingauto/gta5view-build:1.10-static
   variables:
     BUILD_SCRIPT: "windows_build.sh"
     QT_SELECT: "qt5-x86_64-w64-mingw32"
diff --git a/MapLocationDialog.cpp b/MapLocationDialog.cpp
index 801177a..1dbed28 100644
--- a/MapLocationDialog.cpp
+++ b/MapLocationDialog.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************************
 * gta5view Grand Theft Auto V Profile Viewer
-* Copyright (C) 2017-2020 Syping
+* Copyright (C) 2017-2021 Syping
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 #include "IconLoader.h"
 #include "AppEnv.h"
 #include <QPainter>
-#include <QDebug>
 #include <QStyle>
 
 MapLocationDialog::MapLocationDialog(double x, double y, QWidget *parent) :
@@ -121,7 +120,7 @@ void MapLocationDialog::updatePosFromEvent(double x, double y)
         x_pos = x_per * 2340; // 2340 is 100% for X (Cayo Perico)
         y_pos = y_per * -2340; // -2340 is 100% for Y (Cayo Perico)
         x_pos = x_pos + 3560; // +3560 gets corrected for X (Cayo Perico)
-        y_pos = y_pos - 3980; // -4000 gets corrected for Y (Cayo Perico)
+        y_pos = y_pos - 3980; // -3980 gets corrected for Y (Cayo Perico)
     }
     else {
         x_pos = x_per * 10000; // 10000 is 100% for X (Los Santos)
@@ -196,7 +195,7 @@ void MapLocationDialog::mouseMoveEvent(QMouseEvent *ev)
 #elif QT_VERSION >= 0x050000
         const QPointF localPos = ev->localPos();
 #else
-        const QPoint localPos = ev->pos();
+        const QPointF localPos = ev->posF();
 #endif
 #ifdef Q_OS_WIN
         qreal screenRatioPR = AppEnv::screenRatioPR();
diff --git a/README.md b/README.md
index da4a2c2..e7ab970 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ Grand Theft Auto V Savegame and Snapmatic viewer/editor
 
     # Note: Install Docker Community Edition and Git before continuing
     git clone https://gitlab.com/Syping/gta5view && cd gta5view
-    docker pull sypingauto/gta5view-build:1.9-static
-    docker run --rm -v ${PWD}:/gta5view -it sypingauto/gta5view-build:1.9-static
+    docker pull sypingauto/gta5view-build:1.10-static
+    docker run --rm -v ${PWD}:/gta5view -it sypingauto/gta5view-build:1.10-static
     cd /gta5view && mkdir -p build && cd build
     mingw64-qt-cmake ../
     make -j $(nproc --all)
diff --git a/main.cpp b/main.cpp
index 6707ec2..b8180d1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -49,7 +49,6 @@
 #include <QLayout>
 #include <QObject>
 #include <QString>
-#include <QDebug>
 #include <QFont>
 #include <QFile>