From 7ed106bc79c222586279d4351db1c5f005b0b1f3 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Tue, 24 Mar 2015 21:53:40 +0100
Subject: -Add listaliasnode to list all alias.

---
 main.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 986bc2c..0dac21c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,8 +39,8 @@ int main(int argc, char *argv[])
 
     QStringList commands;
 
-    commands << "1L[cheminée,chocolat,épée,arc,chute de pierre]" ;
-            /*<< "10d10c[>=6]-@c[=1]"
+	commands << "1L[cheminée,chocolat,épée,arc,chute de pierre]"
+			<< "10d10c[>=6]-@c[=1]"
              << "10d10c[>=6]-@c[=1]-@c[=1]"
              << "10d10c[>6]+@c[=10]"
              << "1+1D10"
@@ -59,9 +59,11 @@ int main(int argc, char *argv[])
             << "10D10e10s"
             << "10D10s"
             << "15D10e10c[8-10]"
-            << "x"
+			<< "10d10e11"
             << "1D8+2D6+7"
             << "D25"
+			<< "D25+D10"
+			<< "D25;D10"
             << "8+8+8"
             << "1D20-88"
             << "100*1D20*2D6"
@@ -69,7 +71,9 @@ int main(int argc, char *argv[])
             << "100/8"
             << "100*3*8"
             << "help"
-            << "100*3*8";*/
+			<< "la"
+			<< "400000D20/400000"
+			<< "100*3*8";
 
     if(argc>1)
     {
-- 
cgit v1.2.3-70-g09d2


From 88edfa144f4da3880168a8def910561f5df203a0 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Tue, 31 Mar 2015 23:44:10 +0200
Subject: -add feature to list aliases.

---
 diceparser.cpp | 4 ++--
 main.cpp       | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'main.cpp')

diff --git a/diceparser.cpp b/diceparser.cpp
index 1e23c6b..23e40cd 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -72,8 +72,8 @@ DiceParser::DiceParser()
 
 
 	m_commandList = new QStringList();
-    m_commandList->append(tr("help"));
-    m_commandList->append(tr("la"));
+    m_commandList->append(QObject::tr("help"));
+    m_commandList->append(QObject::tr("la"));
 
 }
 
diff --git a/main.cpp b/main.cpp
index 0dac21c..926e3d4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -83,8 +83,6 @@ int main(int argc, char *argv[])
             commands << QString::fromLatin1(argv[i]);
         }
     }
-
-
     foreach(QString cmd, commands)
     {
         if(myParser->parseLine(cmd))
-- 
cgit v1.2.3-70-g09d2