From 84a793f7efdfa7fa02b278a2639eb00063fb608c Mon Sep 17 00:00:00 2001
From: zhangliangliang <zhangliangliang@uniontech.com>
Date: Sat, 26 Sep 2020 16:10:07 +0800
Subject: [PATCH 1/2] Eliminate the warning when implicit type conversion

---
 global.cpp | 4 ++--
 main.cpp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/global.cpp b/global.cpp
index 78a75ecd..9b650dc1 100644
--- a/global.cpp
+++ b/global.cpp
@@ -217,8 +217,8 @@ void Global::setup(StartupConfig startupConfig, bool guiAvailable) {
         // QWebkit DPI is hard coded to 96. Hence, we calculate the correct
         // font size based on desktop logical DPI.
         settings->setFontSize(QWebSettings::DefaultFontSize,
-            defaultFontSize * (QApplication::desktop()->logicalDpiX() / 96.0)
-            );
+            int(defaultFontSize * (QApplication::desktop()->logicalDpiX() / 96.0))
+            );	
     }
     if (defaultFont != "" && defaultFontSize <= 0 && this->guiAvailable) {
         QWebSettings *settings = QWebSettings::globalSettings();
diff --git a/main.cpp b/main.cpp
index abebae42..ad58c1b4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
         if (host.trimmed() != "")
             proxy.setHostName(host.trimmed());
         if (port > 0)
-            proxy.setPort(port);
+            proxy.setPort(quint16(port));
         if (user.trimmed() != "")
             proxy.setUser(user.trimmed());
         if (password.trimmed() != "")

From f4e0f3a0ed9cb4f24601914b73179404417f4fe4 Mon Sep 17 00:00:00 2001
From: zhangliangliang <zhangliangliang@uniontech.com>
Date: Sat, 26 Sep 2020 16:15:38 +0800
Subject: [PATCH 2/2] Remove extra Spaces

---
 global.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.cpp b/global.cpp
index 9b650dc1..612a9c85 100644
--- a/global.cpp
+++ b/global.cpp
@@ -218,7 +218,7 @@ void Global::setup(StartupConfig startupConfig, bool guiAvailable) {
         // font size based on desktop logical DPI.
         settings->setFontSize(QWebSettings::DefaultFontSize,
             int(defaultFontSize * (QApplication::desktop()->logicalDpiX() / 96.0))
-            );	
+            );
     }
     if (defaultFont != "" && defaultFontSize <= 0 && this->guiAvailable) {
         QWebSettings *settings = QWebSettings::globalSettings();