Beautification

Akaflieg-Freiburg · Oct 14, 2021 · 176f56d · 176f56d
1 parent c08acc1
commit 176f56d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt
@@ -18,7 +18,7 @@ add_subdirectory(${qhttpengine_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qhttpengi
 #
 
 if (ANDROID)
-  set(openssl_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android_openssl/latest CACHE INTERNAL "" FORCE)
+  add_subdirectory(android_openssl)
 endif()
 
 

diff --git a/3rdParty/android_openssl b/3rdParty/android_openssl
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -234,17 +234,17 @@ if( ANDROID )
     add_compile_definitions(MANUAL_LOCATION="/android_asset/manual")
 
     # The android target depends on our own copy of openssl
-    set(ANDROID_EXTRA_LIBS
-        ${openssl_SOURCE_DIR}/arm/libcrypto_1_1.so
-        ${openssl_SOURCE_DIR}/arm/libssl_1_1.so
-        ${openssl_SOURCE_DIR}/arm64/libcrypto_1_1.so
-        ${openssl_SOURCE_DIR}/arm64/libssl_1_1.so
-        ${openssl_SOURCE_DIR}/x86/libcrypto_1_1.so
-        ${openssl_SOURCE_DIR}/x86/libssl_1_1.so
-        ${openssl_SOURCE_DIR}/x86_64/libcrypto_1_1.so
-        ${openssl_SOURCE_DIR}/x86_64/libssl_1_1.so
-        CACHE INTERNAL ""
-        )
+#    set(ANDROID_EXTRA_LIBS
+ #       ${openssl_SOURCE_DIR}/arm/libcrypto_1_1.so
+  #      ${openssl_SOURCE_DIR}/arm/libssl_1_1.so
+   #     ${openssl_SOURCE_DIR}/arm64/libcrypto_1_1.so
+    #    ${openssl_SOURCE_DIR}/arm64/libssl_1_1.so
+     #   ${openssl_SOURCE_DIR}/x86/libcrypto_1_1.so
+      #  ${openssl_SOURCE_DIR}/x86/libssl_1_1.so
+       # ${openssl_SOURCE_DIR}/x86_64/libcrypto_1_1.so
+        #${openssl_SOURCE_DIR}/x86_64/libssl_1_1.so
+    #    CACHE INTERNAL ""
+     #   )
 
     # The android target is a library, not an executable
     add_library(${PROJECT_NAME} SHARED ${SOURCES} ${ANDROID_EXTRA_SOURCES})

diff --git a/src/Global.cpp b/src/Global.cpp
@@ -76,7 +76,6 @@ Global::Global(QObject *parent) : QObject(parent)
 }
 
 
-#warning docu
 bool Global::ready()
 {
     if (isConstructing) {

diff --git a/src/dataManagement/Downloadable.cpp b/src/dataManagement/Downloadable.cpp
@@ -240,11 +240,7 @@ void DataManagement::Downloadable::startFileDownload() {
     connect(_networkReplyDownloadFile, &QNetworkReply::finished, this, &Downloadable::downloadFileFinished);
     connect(_networkReplyDownloadFile, &QNetworkReply::readyRead, this, &Downloadable::downloadFilePartialDataReceiver);
     connect(_networkReplyDownloadFile, &QNetworkReply::downloadProgress, this, &Downloadable::downloadFileProgressReceiver);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     connect(_networkReplyDownloadFile, &QNetworkReply::errorOccurred, this, &Downloadable::downloadFileErrorReceiver);
-#else
-    connect(_networkReplyDownloadFile, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), this, &Downloadable::downloadFileErrorReceiver);
-#endif
     _downloadProgress = 0;
 
     // Emit signals as appropriate

diff --git a/src/geomaps/GeoMapProvider.cpp b/src/geomaps/GeoMapProvider.cpp
@@ -23,11 +23,12 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QLockFile>
 #include <QQmlEngine>
 #include <QRandomGenerator>
 #include <QSqlDatabase>
 #include <QSqlQuery>
-#include <QtConcurrent/QtConcurrent>
+#include <QtConcurrent/QtConcurrentRun>
 #include <chrono>
 
 #include "GeoMapProvider.h"
-Original file line number
+Diff line change
@@ Expand Up @@
     #
     if (ANDROID)
-      set(openssl_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android_openssl/latest CACHE INTERNAL "" FORCE)
+      add_subdirectory(android_openssl)
     endif()
@@ Expand Down @@