Merge pull request #36 from nemerle/qt6_plus_some_other_things

Switch to qt6 and update jcon

Author: nemerle

3rd_party/ExternalProject_JCON.cmake

@@ -1,5 +1,5 @@
 libname(jcon jcon)
-find_package(Qt5 COMPONENTS Network WebSockets Test REQUIRED)
+find_package(Qt6 COMPONENTS Network WebSockets Test REQUIRED)
 
 ExternalProject_Add(
    jcon_BUILD
@@ -18,4 +18,4 @@ add_dependencies(jcon_IMP jcon_BUILD)
 file(MAKE_DIRECTORY ${ThirdParty_Install_Dir}/include)
 set_property(TARGET jcon_IMP PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ThirdParty_Install_Dir}/include)
 SET_PROPERTY(TARGET jcon_IMP APPEND PROPERTY IMPORTED_LOCATION ${jcon_LIBRARY_STATIC} )
-set_property(TARGET jcon_IMP APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qt5::Network Qt5::WebSockets Qt5::Test)
+set_property(TARGET jcon_IMP APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qt6::Network Qt6::WebSockets Qt6::Test)

3rd_party/jcon-cpp/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 cmake_policy(SET CMP0043 NEW)
 cmake_policy(SET CMP0053 NEW)
 
@@ -24,7 +24,7 @@ if(MINGW)
 endif()
 
 if(APPLE OR UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-conversion -Wno-sign-compare -Wno-strict-aliasing")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-conversion -Wno-sign-compare -Wno-strict-aliasing") #-Werror 
 endif()
 
 if(APPLE)

3rd_party/jcon-cpp/jcon/CMakeLists.txt

@@ -1,7 +1,11 @@
 project(jcon)
 
+set(QTDIR $ENV{QTDIR})
+set(QT5_DIR $ENV{QTDIR})
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_PREFIX_PATH ${QTDIR})
 
 file(GLOB ${PROJECT_NAME}_headers *.h)
 file(GLOB ${PROJECT_NAME}_sources *.cpp)
@@ -10,13 +14,13 @@ file(GLOB ${PROJECT_NAME}_sources *.cpp)
 
 add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_headers} ${${PROJECT_NAME}_sources})
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${${PROJECT_NAME}_headers}")
-find_package(Qt5 COMPONENTS Core Network WebSockets)
-target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network)
 
+find_package(Qt6 COMPONENTS  Core Network Test WebSockets)
 install(TARGETS ${PROJECT_NAME}
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib
 		PUBLIC_HEADER DESTINATION include/jcon
 )
 target_compile_definitions(jcon PUBLIC NDEBUG)
+target_link_libraries(jcon PUBLIC Qt6::Core Qt6::Network Qt6::WebSockets)

3rd_party/jcon-cpp/jcon/CMakeLists.txt.autosave

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtCore/qglobal.h>
+#include <QtGlobal>
 
 //#ifndef JCON_DLL
 //#define JCON_DLL

3rd_party/jcon-cpp/jcon/jcon.h

@@ -4,6 +4,7 @@
 #include "jcon_assert.h"
 #include "string_util.h"
 
+
 #include <QUuid>
 #include <QEventLoop>
 #include <QCoreApplication>
@@ -13,6 +14,8 @@
 
 namespace jcon {
 
+const QString JsonRpcClient::InvalidRequestId = "";
+
 JsonRpcClient::JsonRpcClient(std::shared_ptr<JsonRpcSocket> socket,
                              QObject* parent,
                              std::shared_ptr<JsonRpcLogger> logger,
@@ -157,7 +160,6 @@ JsonRpcClient::doCallNamedParams(const QString& method,
 
     return request;
 }
-
 int JsonRpcClient::outstandingRequestCount() const
 {
     return m_outstanding_request_count;

3rd_party/jcon-cpp/jcon/json_rpc_client.cpp

@@ -97,7 +97,7 @@ private slots:
     void jsonResponseReceived(const QJsonObject& obj);
 
 private:
-    const QString InvalidRequestId = "";
+    static const QString InvalidRequestId;
 
     static QString formatLogMessage(const QString& method,
                                     const QVariantList& args,

3rd_party/jcon-cpp/jcon/json_rpc_client.h

@@ -10,6 +10,7 @@
 #include <QJsonObject>
 #include <QVariant>
 #include <QMetaMethod>
+#include <QMetaType>
 
 namespace {
     QString logInvoke(const QMetaMethod& meta_method,
@@ -376,8 +377,8 @@ bool JsonRpcServer::doCall(QObject* object,
     }
 
     const char* return_type_name = meta_method.typeName();
-    int return_type = QMetaType::type(return_type_name);
-    if (return_type != QMetaType::Void) {
+    QMetaType return_type = QMetaType::fromName(return_type_name);
+    if (return_type.id() != QMetaType::Void) {
         return_value = QVariant(return_type, nullptr);
     }
 

3rd_party/jcon-cpp/jcon/json_rpc_server.cpp

@@ -1,3 +1,5 @@
+#include <QtGlobal>
+
 #include "json_rpc_websocket.h"
 #include "jcon_assert.h"
 
@@ -41,7 +43,7 @@ void JsonRpcWebSocket::setupSocket()
             this, &JsonRpcWebSocket::dataReady);
 
     void (QWebSocket::*errorPtr)(QAbstractSocket::SocketError) =
-        &QWebSocket::error;
+        &QWebSocket::errorOccurred;
     connect(m_socket, errorPtr, this,
             [this](QAbstractSocket::SocketError error) {
                 emit socketError(m_socket, error);

3rd_party/jcon-cpp/jcon/json_rpc_websocket.cpp

@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.8)
-PROJECT(SEGS-Client)
+PROJECT(SEGSClient)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -45,7 +45,7 @@ add_subdirectory(3rd_party)
 link_directories(${PROJECT_SOURCE_DIR}/lib) # ERICEDIT: Changed to lowercase.
 
 include(LocateQt5)
-find_package(Qt5 COMPONENTS Core Sql REQUIRED)
+find_package(Qt6 COMPONENTS Core Sql REQUIRED)
 
 link_directories(${ThirdParty_Install_Dir}/lib)
 include_directories(SYSTEM ${ThirdParty_Install_Dir}/include)

CMakeLists.txt

@@ -10,7 +10,7 @@ IF(MSVC)
     # get root path so we can search for 5.3, 5.4, 5.5, etc
     STRING(REPLACE "/Tools" ";" QT_BIN "${QT_BIN}")
     LIST(GET QT_BIN 0 QT_BIN)
-    FILE(GLOB QT_VERSIONS "${QT_BIN}/5.*")
+    FILE(GLOB QT_VERSIONS "${QT_BIN}/6.*")
     LIST(SORT QT_VERSIONS)
 
     # assume the latest version will be last alphabetically
@@ -44,11 +44,11 @@ ENDMACRO(TO_NATIVE_PATH)
 # use Qt_DIR approach so you can find Qt after cmake has been invoked
 IF(NOT QT_MISSING)
     MESSAGE("-- Qt found: ${QT_PATH}")
-    SET(Qt5_DIR "${QT_PATH}/lib/cmake/Qt5/")
-    SET(Qt5Test_DIR "${QT_PATH}/lib/cmake/Qt5Test")
+    SET(Qt6_DIR "${QT_PATH}/lib/cmake/Qt6/")
+    SET(Qt6Test_DIR "${QT_PATH}/lib/cmake/Qt6Test")
 ENDIF()
-find_package(Qt5 REQUIRED COMPONENTS Core)
-get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
-get_filename_component(Qt5_BIN_DIR "${_qmake_executable}" DIRECTORY)
-TO_NATIVE_PATH("${Qt5_BIN_DIR}" Qt5_BIN_DIR)
+find_package(Qt6 REQUIRED COMPONENTS Core)
+get_target_property(_qmake_executable Qt6::qmake IMPORTED_LOCATION)
+get_filename_component(Qt6_BIN_DIR "${_qmake_executable}" DIRECTORY)
+TO_NATIVE_PATH("${Qt6_BIN_DIR}" Qt6_BIN_DIR)
 

CMakeScripts/LocateQt5.cmake

@@ -20,11 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-find_package(Qt5Core REQUIRED)
+find_package(Qt6 COMPONENTS Core REQUIRED)
 
 # Retrieve the absolute path to qmake and then use that path to find
 # the windeployqt binary
-get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+get_target_property(_qmake_executable Qt6::qmake IMPORTED_LOCATION)
 get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
 find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
 

CMakeScripts/Windeployqt.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.14)
 
 
 project(SEGSLauncher LANGUAGES CXX)
@@ -7,14 +7,10 @@ project(SEGSLauncher LANGUAGES CXX)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
-#set(CMAKE_AUTOUIC ON)
 
-find_package(Qt5 COMPONENTS Core Quick Multimedia REQUIRED)
+find_package(Qt6 COMPONENTS Core Quick Multimedia Network REQUIRED)
 set(CMAKE_DEBUG_POSTFIX "d")
 
-#include_directories(${Qt5Widgets_INCLUDE_DIRS} ${QtQml_INCLUDE_DIRS})
-#add_definitions(${Qt5Widgets_DEFINITIONS} ${QtQml_DEFINITIONS} ${${Qt5Quick_DEFINITIONS}})
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
 set(SEGSLAUNCHER_SOURCES
     main.cpp
@@ -29,7 +25,7 @@ set(SEGSLAUNCHER_SOURCES
 
 add_executable(${PROJECT_NAME} WIN32 ${SEGSLAUNCHER_SOURCES})
 target_compile_definitions(${PROJECT_NAME} PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Quick Qt5::Multimedia jcon_IMP)
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Quick Qt6::Multimedia Qt6::Network jcon_IMP)
 
 
 #message("Copying required Qt libraries and binaries to output directory....")

SEGSLauncher/CMakeLists.txt

@@ -1,4 +1,3 @@
-//#include "version.h"
 #include "Launcher.h"
 #include "Worker.h"
 
@@ -10,12 +9,15 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QJsonDocument>
+#include <QJsonArray>
 #include <QTimer>
 #include <QDir>
 
 
+const QVersionNumber Launcher::m_version = QVersionNumber(0,0,1);
 Launcher::Launcher(QObject *parent) : QObject(parent)
 {
+    m_update_channel = "stable";
     // Worker thread for getting server status (RPC call)
     Worker *worker = new Worker;
     worker->moveToThread(&worker_thread);
@@ -37,8 +39,10 @@ void Launcher::launch_cox()
     settings.beginGroup("LauncherConfig");
     QString cox_dir = settings.value("CoxDir", "").toString();
     settings.endGroup();
-    QStringList arguments;
-    arguments<<"-project"<< "SEGS";
+    QStringList arguments = {
+        "-project",
+        "SEGS"
+    };
     QString program = cox_dir + "/CoX.exe";
 
     m_start_cox = new QProcess(this);
@@ -52,7 +56,7 @@ void Launcher::launch_segsadmin()
 
     m_start_segsadmin = new QProcess(this);
     m_start_segsadmin->setWorkingDirectory(QDir::currentPath());
-    m_start_segsadmin->start(program);
+    m_start_segsadmin->start(program,QStringList());
 
     qDebug()<<"launch_segsadmin";
 }
@@ -118,7 +122,8 @@ void Launcher::set_server(QVariantMap server_details)
     settings.setValue("LastServerIP", server_details["server_ip"]);
     settings.endGroup();
 
-    QSettings segs_settings(QString("HKEY_CURRENT_USER\\Software\\Cryptic\\%1").arg("SEGS"), QSettings::NativeFormat);
+    QSettings segs_settings(QString(R"(HKEY_CURRENT_USER\Software\Cryptic\%1)").arg("SEGS"),
+                            QSettings::NativeFormat);
     segs_settings.setValue("Auth", server_details["server_ip"]);
 }
 
@@ -147,7 +152,7 @@ QJsonObject Launcher::get_server_list()
     settings.beginGroup("ServerConfig");
     settings.beginGroup("CommunityServers");
 
-    foreach (const QString &group, settings.childGroups())
+    for(const QString &group : settings.childGroups())
     {
         QJsonObject server;
         settings.beginGroup(group);
@@ -164,7 +169,7 @@ QJsonObject Launcher::get_server_list()
     // Get local servers
     settings.beginGroup("LocalServers");
 
-    foreach (const QString &group, settings.childGroups())
+    for(const QString &group : settings.childGroups())
     {
         QJsonObject server;
         settings.beginGroup(group);
@@ -194,7 +199,7 @@ QJsonObject Launcher::get_server_information()
     settings.beginGroup("ServerConfig");
     settings.beginGroup("CommunityServers");
 
-    foreach (const QString &group, settings.childGroups())
+    for(const QString &group : settings.childGroups())
     {
         QJsonObject server;
         settings.beginGroup(group);
@@ -326,7 +331,8 @@ void Launcher::add_local_server(QVariantMap server)
 // Write launcher / game settings to QSettings
 void Launcher::set_launcher_game_settings(QVariantMap settings)
 {
-    QSettings segs_settings(QString("HKEY_CURRENT_USER\\Software\\Cryptic\\%1").arg("SEGS"), QSettings::NativeFormat);
+    QSettings segs_settings(QString(R"(HKEY_CURRENT_USER\Software\Cryptic\%1)").arg("SEGS"),
+                            QSettings::NativeFormat);
     segs_settings.setValue("screenX", settings["screenX"].toString());
     segs_settings.setValue("screenY", settings["screenY"].toString());
     segs_settings.setValue("fullscreen", settings["fullscreen"].toString());