From aaecbb75bbfe10ec44a3fff83bda6828da4b4518 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Thu, 28 Apr 2022 02:47:01 +0200
Subject: Make sure cli compile with Qt6

---
 cli/displaytoolbox.h |  2 +-
 cli/main.cpp         | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'cli')

diff --git a/cli/displaytoolbox.h b/cli/displaytoolbox.h
index 53a2a56..5a22b0f 100644
--- a/cli/displaytoolbox.h
+++ b/cli/displaytoolbox.h
@@ -4,7 +4,7 @@
 #include <QJsonArray>
 #include <QString>
 
-#include "diceparser.h"
+#include "diceparser/diceparser.h"
 
 class DisplayToolBox
 {
diff --git a/cli/main.cpp b/cli/main.cpp
index 8c298eb..0420ac3 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -30,8 +30,8 @@
 #include <QRegularExpression>
 #include <QSettings>
 #include <QStringList>
-#include <QTextCodec>
 #include <QTextStream>
+#include <set>
 
 #ifdef PAINTER_OP
 #include <QGuiApplication>
@@ -39,11 +39,11 @@
 #include <QCoreApplication>
 #endif
 
-#include "dicealias.h"
-#include "diceparser.h"
+#include "diceparser/dicealias.h"
+#include "diceparser/diceparser.h"
+#include "diceparser/highlightdice.h"
+#include "diceparser/parsingtoolbox.h"
 #include "displaytoolbox.h"
-#include "highlightdice.h"
-#include "parsingtoolbox.h"
 
 /**
  * @page Dice
@@ -308,10 +308,9 @@ int startDiceParsing(QStringList& cmds, bool withColor, QString baseColor, EXPOR
     for(auto alias : array)
     {
         auto objAlias= alias.toObject();
-        auto dice
-            = new DiceAlias(objAlias["pattern"].toString(), objAlias["cmd"].toString(), !objAlias["regexp"].toBool());
-        dice->setComment(objAlias["comment"].toString());
-        parser.insertAlias(dice, i++);
+        parser.insertAlias(new DiceAlias(objAlias["pattern"].toString(), objAlias["cmd"].toString(),
+                                         objAlias["comment"].toString(), !objAlias["regexp"].toBool()),
+                           i++);
     }
 
     int rt= 0;
@@ -466,11 +465,9 @@ int main(int argc, char* argv[])
     QStringList commands;
     QString cmd;
     QString dotFileStr;
-    QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
     bool colorb= true;
     QSettings settings("rolisteam", "diceparser");
     QString formatColor;
-    out.setCodec("UTF-8");
     EXPORTFORMAT format= TERMINAL;
 
     QCommandLineParser optionParser;
-- 
cgit v1.2.3-70-g09d2