From f0adfabd4770fe523f5b7c6bd160c5ed350804ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Haris=20Gu=C5=A1i=C4=87?= <harisgusic.dev@gmail.com>
Date: Fri, 8 Oct 2021 22:08:35 +0200
Subject: [PATCH] Fix failing builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
---
 src/core/capturerequest.cpp           | 13 ++++++++++---
 src/widgets/capture/capturewidget.cpp | 10 +++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/core/capturerequest.cpp b/src/core/capturerequest.cpp
index 6c63ed85..86f9ce26 100644
--- a/src/core/capturerequest.cpp
+++ b/src/core/capturerequest.cpp
@@ -45,7 +45,9 @@ QByteArray CaptureRequest::serialize() const
 {
     QByteArray data;
     QDataStream stream(&data, QIODevice::WriteOnly);
-    stream << m_mode << m_delay << m_tasks << m_data << m_forcedID << m_id
+    // Convert enums to integers
+    qint32 tasks = m_tasks, mode = m_mode;
+    stream << mode << m_delay << tasks << m_data << m_forcedID << m_id
            << m_path;
     return data;
 }
@@ -54,13 +56,18 @@ CaptureRequest CaptureRequest::deserialize(const QByteArray& data)
 {
     QDataStream stream(data);
     CaptureRequest request;
-    stream >> request.m_mode;
+    qint32 tasks, mode;
+    stream >> mode;
     stream >> request.m_delay;
-    stream >> request.m_tasks;
+    stream >> tasks;
     stream >> request.m_data;
     stream >> request.m_forcedID;
     stream >> request.m_id;
     stream >> request.m_path;
+
+    // Convert integers to enums
+    request.m_tasks = static_cast<ExportTask>(tasks);
+    request.m_mode = static_cast<CaptureMode>(mode);
     return request;
 }
 
diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp
index 345eb1d9..2e098efe 100644
--- a/src/widgets/capture/capturewidget.cpp
+++ b/src/widgets/capture/capturewidget.cpp
@@ -319,7 +319,7 @@ void CaptureWidget::initButtons()
 void CaptureWidget::initHelpMessage()
 {
     QList<QPair<QString, QString>> keyMap;
-    keyMap << QPair("Mouse", "Select screenshot area");
+    keyMap << QPair(tr("Mouse"), tr("Select screenshot area"));
     using CT = CaptureTool;
     for (auto toolType : { CT::TYPE_ACCEPT, CT::TYPE_SAVE, CT::TYPE_COPY }) {
         if (!m_tools.contains(toolType)) {
@@ -333,10 +333,10 @@ void CaptureWidget::initHelpMessage()
             keyMap << QPair(shortcut, tool->description());
         }
     }
-    keyMap << QPair("Mouse Wheel", "Change tool size");
-    keyMap << QPair("Right Click", "Show color picker");
-    keyMap << QPair("Space", "Open side panel");
-    keyMap << QPair("Esc", "Exit");
+    keyMap << QPair(tr("Mouse Wheel"), tr("Change tool size"));
+    keyMap << QPair(tr("Right Click"), tr("Show color picker"));
+    keyMap << QPair(tr("Space"), tr("Open side panel"));
+    keyMap << QPair(tr("Esc"), tr("Exit"));
     OverlayMessage::pushKeyMap(keyMap);
 }