Merge pull request #61 from QuasarApp/cheat_card_fixes

Cheat card fixes
QuasarApp · Mar 24, 2023 · 3728e41 · 3728e41
2 parents 9a20532 + cdce342
commit 3728e41
Show file tree

Hide file tree

Showing 158 changed files with 876 additions and 1,054 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2022 QuasarApp.
+# Copyright (C) 2018-2023 QuasarApp.
 # Distributed under the lgplv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.
@@ -33,8 +33,9 @@ else()
 endif()
 # Use only for android debug builds with debugging from usb.
 option(HEART_STATIC_SSL "This option enable or disabled static link ssl libraryes" OFF)
-option(HEART_DEPRECATED_API "This option enable or disabled deprecated command api" OFF)
-option(CMAKE_SHARE "This option enable or disabled ssl functions of nodes" OFF)
+option(HEART_PRINT_PACKAGES "This option enable or disabled log of add incoming network packages" OFF)
+option(HEART_PRINT_SQL_QUERIES "This option enable or disabled log of all sql queries" OFF)
+
 option(BUILD_SHARED_LIBS "Enable or disable shared libraryes" OFF)
 
 if (WIN32)

diff --git a/HeartTests/CMakeLists.txt b/HeartTests/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2022 QuasarApp.
+# Copyright (C) 2018-2023 QuasarApp.
 # Distributed under the lgplv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.

diff --git a/HeartTests/tst_testprotockol.cpp b/HeartTests/tst_testprotockol.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/abstractnodetest.cpp b/HeartTests/units/abstractnodetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/abstractnodetest.h b/HeartTests/units/abstractnodetest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/bigdatatest.cpp b/HeartTests/units/bigdatatest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/bigdatatest.h b/HeartTests/units/bigdatatest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/ecdsaauthtest.cpp b/HeartTests/units/ecdsaauthtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2022 QuasarApp.
+ * Copyright (C) 2022-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/ecdsaauthtest.h b/HeartTests/units/ecdsaauthtest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2022 QuasarApp.
+ * Copyright (C) 2022-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/keystoragetest.h b/HeartTests/units/keystoragetest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/shedullertest.cpp b/HeartTests/units/shedullertest.cpp
@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2022 QuasarApp.
+//# Copyright (C) 2021-2023 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/shedullertest.h b/HeartTests/units/shedullertest.h
@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2022 QuasarApp.
+//# Copyright (C) 2021-2023 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/test.cpp b/HeartTests/units/test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/test.h b/HeartTests/units/test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/testutils.cpp b/HeartTests/units/testutils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/testutils.h b/HeartTests/units/testutils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/HeartTests/units/upgradedatabasetest.cpp b/HeartTests/units/upgradedatabasetest.cpp
@@ -22,7 +22,7 @@ class UpgradableDatabase: public QH::DataBase {
 
     bool checkVersion(int version) {
         QSqlQuery query;
-        if (!db()->doQuery("SELECT * FROM DataBaseAttributes WHERE name='version'", true, &query)){
+        if (!db()->doQuery("SELECT * FROM DataBaseAttributes WHERE name='version'", {},  true, &query)){
             return false;
         };
 
@@ -44,7 +44,7 @@ class UpgradableDatabase: public QH::DataBase {
 
                        [](const QH::iObjectProvider* database) -> bool {
                            QSqlQuery query;
-                           if (!database->doQuery("select * from DataBaseAttributes", true, &query)){
+                           if (!database->doQuery("select * from DataBaseAttributes", {}, true, &query)){
                                return false;
                            };
 
@@ -57,7 +57,7 @@ class UpgradableDatabase: public QH::DataBase {
                        2, // to version
                        [](const QH::iObjectProvider* database) -> bool {
                            QSqlQuery query;
-                           if (!database->doQuery("select * from DataBaseAttributes", true, &query)){
+                           if (!database->doQuery("select * from DataBaseAttributes", {}, true, &query)){
                                return false;
                            };
 
@@ -70,7 +70,7 @@ class UpgradableDatabase: public QH::DataBase {
                        3, // to version
                        [](const QH::iObjectProvider* database) -> bool {
                            QSqlQuery query;
-                           if (!database->doQuery("select * from DataBaseAttributes", true, &query)){
+                           if (!database->doQuery("select * from DataBaseAttributes", {}, true, &query)){
                                return false;
                            };
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2022 QuasarApp.
+# Copyright (C) 2018-2023 QuasarApp.
 # Distributed under the lgplv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.
@@ -17,8 +17,12 @@ set(CMAKE_AUTORCC ON)
 
 add_definitions(-DHEART_LIBRARY)
 
-if (HEART_DEPRECATED_API)
-    add_definitions(-DHEART_DEPRECATED_API)
+if (HEART_PRINT_SQL_QUERIES)
+    add_definitions(-DHEART_PRINT_SQL_QUERIES)
+endif()
+
+if (HEART_PRINT_PACKAGES)
+    add_definitions(-DHEART_PRINT_PACKAGES)
 endif()
 
 set(SLL_DEFINE "WITHOUT_SSL")
@@ -41,13 +45,6 @@ file(GLOB SOURCE_CPP
     "public/hcryptoFeatures/*.cpp" "public/hcryptoFeatures/*.h" "public/hcryptoFeatures/*.qrc"
 )
 
-if (NOT HEART_DEPRECATED_API)
-    file(GLOB SOURCE_CPP_DEPRECATED
-        "private/*_old.cpp" "private/*_old.h"
-    )
-    list(REMOVE_ITEM SOURCE_CPP ${SOURCE_CPP_DEPRECATED})
-endif()
-
 set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/public")
 set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/public/packages")

diff --git a/src/heart.cpp b/src/heart.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/src/heart.h b/src/heart.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/src/heart_global.h.in b/src/heart_global.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 QuasarApp.
+ * Copyright (C) 2018-2023 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

diff --git a/src/private/abstractnodeparser.cpp b/src/private/abstractnodeparser.cpp
@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2022-2022 QuasarApp.
+//# Copyright (C) 2022-2023 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

diff --git a/src/private/abstractnodeparser.h b/src/private/abstractnodeparser.h
@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2022-2022 QuasarApp.
+//# Copyright (C) 2022-2023 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

diff --git a/src/private/abstractnodeparser_old.cpp b/src/private/abstractnodeparser_old.cpp
diff --git a/src/private/abstractnodeparser_old.h b/src/private/abstractnodeparser_old.h
diff --git a/src/private/apiversion.cpp b/src/private/apiversion.cpp
@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2022 QuasarApp.
+//# Copyright (C) 2020-2023 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

diff --git a/src/private/apiversion.h b/src/private/apiversion.h
@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2022 QuasarApp.
+//# Copyright (C) 2020-2023 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.
@@ -30,8 +30,6 @@ class APIVersion: public QH::PKG::AbstractData
     static QString commandText(){return "PROTOCKOL_VERSION_COMMAND";}
     unsigned short cmd() const override {return APIVersion::command();}
 
-    unsigned short cmdOld() const override {return APIVersion::command();}
-
     QString cmdString() const override {return APIVersion::commandText();}
 
     const VersionData &version() const;