From 6c9b969351160bf9a71d1550de358df8a0a2d1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 31 Mar 2021 14:10:29 -0400
Subject: [PATCH] project: misc fixups
Change-Id: I97f256873bbffd79eb08707f0a809172bca06e6b
---
src/avadapter.cpp | 2 +-
src/main.cpp | 3 +++
src/mainapplication.cpp | 1 +
src/qmlregister.h | 4 ++++
src/qrimageprovider.h | 14 +++++++-------
src/systemtray.h | 2 ++
6 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/avadapter.cpp b/src/avadapter.cpp
index 1a984138e..7b0898cbe 100644
--- a/src/avadapter.cpp
+++ b/src/avadapter.cpp
@@ -290,7 +290,7 @@ AvAdapter::getScreenNumber() const
// Get display
QString display_env {getenv("DISPLAY")};
if (!display_env.isEmpty()) {
- auto list = display_env.split(":", Qt::SkipEmptyParts);
+ auto list = display_env.split(':', QString::SplitBehavior::SkipEmptyParts);
// Should only be one display, so get the first one
if (list.size() > 0) {
display = list.at(0).toInt();
diff --git a/src/main.cpp b/src/main.cpp
index 195945c18..f73fdbfd6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,6 +23,7 @@
#include "version.h"
#include <QCryptographicHash>
+#include <QApplication>
#include <QtWebEngine>
#include <clocale>
@@ -60,8 +61,10 @@ main(int argc, char* argv[])
QApplication::setQuitOnLastWindowClosed(false);
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
QCoreApplication::setApplicationVersion(QString(VERSION_STRING));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+#endif
QtWebEngine::initialize();
char ARG_DISABLE_WEB_SECURITY[] = "--disable-web-security";
diff --git a/src/mainapplication.cpp b/src/mainapplication.cpp
index 812e6a0d9..76e22e9ce 100644
--- a/src/mainapplication.cpp
+++ b/src/mainapplication.cpp
@@ -48,6 +48,7 @@
#include <QQmlContext>
#include <locale.h>
+#include <thread>
#ifdef Q_OS_WIN
#include <windows.h>
diff --git a/src/qmlregister.h b/src/qmlregister.h
index 48591c30d..a77d6bcb9 100644
--- a/src/qmlregister.h
+++ b/src/qmlregister.h
@@ -18,6 +18,10 @@
#pragma once
+#include <QJSEngine>
+#include <QQmlEngine>
+#include <QObject>
+
#define NS_MODELS "net.jami.Models"
#define NS_ADAPTERS "net.jami.Adapters"
#define NS_CONSTANTS "net.jami.Constants"
diff --git a/src/qrimageprovider.h b/src/qrimageprovider.h
index 9af5c51d7..d148873d9 100644
--- a/src/qrimageprovider.h
+++ b/src/qrimageprovider.h
@@ -29,8 +29,8 @@ class QrImageProvider : public QuickImageProviderBase
public:
QrImageProvider(LRCInstance* instance = nullptr)
: QuickImageProviderBase(QQuickImageProvider::Image,
- QQmlImageProviderBase::ForceAsynchronousImageLoading,
- instance)
+ QQmlImageProviderBase::ForceAsynchronousImageLoading,
+ instance)
{}
enum class QrType { Account, Contact };
@@ -43,11 +43,11 @@ public:
*/
QPair<QrType, QString> getIndexFromID(const QString& id)
{
- auto list = id.split('_', Qt::SkipEmptyParts);
+ auto list = id.split('_', QString::SplitBehavior::SkipEmptyParts);
if (list.size() < 2)
- return QPair(QrType::Account, "");
+ return {QrType::Account, ""};
if (list.contains("account") && list.size() > 1) {
- return QPair(QrType::Account, list[1]);
+ return {QrType::Account, list[1]};
} else if (list.contains("contact") && list.size() > 1) {
/*
* For contact_xxx, xxx is "" initially
@@ -55,9 +55,9 @@ public:
const auto& convInfo = lrcInstance_->getConversationFromConvUid(list[1]);
auto contact = lrcInstance_->getCurrentAccountInfo().contactModel->getContact(
convInfo.participants.at(0));
- return QPair(QrType::Contact, contact.profileInfo.uri);
+ return {QrType::Contact, contact.profileInfo.uri};
}
- return QPair(QrType::Account, "");
+ return {QrType::Account, ""};
}
QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize) override
diff --git a/src/systemtray.h b/src/systemtray.h
index 558715b8c..8b9078a52 100644
--- a/src/systemtray.h
+++ b/src/systemtray.h
@@ -20,6 +20,8 @@
#include <QSystemTrayIcon>
+#include <functional>
+
class AppSettingsManager;
class SystemTray final : public QSystemTrayIcon
--
GitLab