From 81e0ed8a19e0f6f4d9dfb3e5cf97657c4babd3a1 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Fri, 26 Mar 2021 17:18:29 +0300
Subject: [PATCH] change params map to QString map

---
 params.cpp | 26 +++++++++++---------------
 params.h   | 28 ++++++++++------------------
 2 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/params.cpp b/params.cpp
index 65cc162..07b8a86 100644
--- a/params.cpp
+++ b/params.cpp
@@ -25,7 +25,7 @@
 
 using namespace QuasarAppUtils;
 
-static QVariantMap params = QVariantMap();
+static QMap<QString, QString> params = QMap<QString, QString>();
 static int _argc = 0;
 
 
@@ -99,7 +99,7 @@ void Params::showHelp() {
     Help::print(getparamsHelp());
 }
 
-QVariantMap Params::getUserParamsMap() {
+QMap<QString, QString> Params::getUserParamsMap() {
     auto result = params;
     result.remove(APP_PATH);
     result.remove(APP_NAME);
@@ -113,11 +113,11 @@ void Params::clearParsedData() {
 }
 
 QString Params::getCurrentExecutable() {
-    return getCurrentExecutableDir() + "/" + getStrArg(APP_NAME);
+    return getCurrentExecutableDir() + "/" + getArg(APP_NAME);
 }
 
 QString Params::getCurrentExecutableDir() {
-    return getStrArg(APP_PATH);
+    return getArg(APP_PATH);
 }
 
 int Params::size() {
@@ -163,9 +163,9 @@ bool Params::writeLoginFile(const QString &log, VerboseLvl vLvl) {
     if (isEndable("fileLog")) {
 
         QString path = getCurrentExecutable() + ".log";
-        auto file =  getStrArg("fileLog");
+        auto file =  getArg("fileLog");
         if (file.size()) {
-            QString path = file;
+            path = file;
         }
 
         QFile logFile(path);
@@ -228,7 +228,7 @@ bool Params::parseParams(const QStringList &paramsArray) {
 
 #endif
 
-    if (!getStrArg(APP_PATH).size()) {
+    if (!getArg(APP_PATH).size()) {
         return false;
     }
 
@@ -256,12 +256,12 @@ void Params::printWorkingOptions() {
     QuasarAppUtils::Params::log("--- Working options table start ---",
                                 QuasarAppUtils::Debug);
 
-    QVariantMap::const_iterator iter = params.constBegin();
+    QMap<QString, QString>::const_iterator iter = params.constBegin();
     while (iter != params.constEnd()) {
 
         QString row = QString{"Option[%0]"}.arg(iter.key());
 
-        QString value = iter.value().toString();
+        QString value = iter.value();
         if (!value.isEmpty()) {
             row += QString{": %1"}.arg(value);
         }
@@ -275,15 +275,11 @@ void Params::printWorkingOptions() {
                                 QuasarAppUtils::Debug);
 }
 
-QString Params::getStrArg(const QString& key, const QString &def) {
-    return params.value(key, def).toString();
-}
-
-QVariant Params::getArg(const QString& key,const QVariant& def) {
+QString Params::getArg(const QString& key,const QString& def) {
     return params.value(key, def);
 }
 
-void Params::setArg(const QString &key, const QVariant &val) {
+void Params::setArg(const QString &key, const QString &val) {
     params.insert(key, val);
 }
 
diff --git a/params.h b/params.h
index 1f36b37..4b63f73 100644
--- a/params.h
+++ b/params.h
@@ -66,30 +66,22 @@ public:
      */
     static bool parseParams(const QStringList& paramsArray);
 
-    /**
-     * @brief getStrArg - get string value of key
-     * @param key
-     * @param def - default value
-     * @return string value of argument
-     */
-    static QString getStrArg(const QString& key, const QString& def = "");
-
     /**
      * @brief getArg - get string value of key
-     * @param key
+     * @param key This is key of the parameter.
      * @param def - default value
      * @return string value of argument
      */
-    static QVariant getArg(const QString& key, const QVariant &def = {});
+    static QString getArg(const QString& key, const QString &def = {});
 
     /**
-     * @brief setArg - set value of key
-     * @param key
+     * @brief setArg - sets value of key
+     * @param key This is new value of the @a key
      */
-    static void setArg(const QString& key, const QVariant& val);
+    static void setArg(const QString& key, const QString& val);
 
     /**
-     * @brief setArg - set boolean value of key
+     * @brief setArg - sets boolean value of key
      * @param key
      * @param enable - new value of key
      */
@@ -127,7 +119,7 @@ public:
     static void showHelp(const Help::Charters& help);
 
     /**
-     * @brief getVerboseLvl
+     * @brief getVerboseLvl This method return the verbose log level.
      * @return verbose lvl
      */
     static VerboseLvl getVerboseLvl();
@@ -146,13 +138,13 @@ public:
 
 
     /**
-     * @brief size
+     * @brief size This method return size of all params array
      * @return size of all params array
      */
     static int size();
 
     /**
-     * @brief customParamasSize
+     * @brief customParamasSize This method return a size of params entered in conosole
      * @return size of params entered in conosole
      */
     static int customParamasSize();
@@ -166,7 +158,7 @@ public:
      * @brief getUserParamsMap
      * @return QVariantMap with user params
      */
-    static QVariantMap getUserParamsMap();
+    static QMap<QString, QString> getUserParamsMap();
 
     /**
      * @brief clearParsedData - this method clear allparsed data.