From 56a2d6451f364f93abc27640124fbfd7011b3fec Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sat, 6 Dec 2014 10:15:34 +0100
Subject: -start irc bot.

---
 main.cpp | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 9dbf847..6c774ec 100644
--- a/main.cpp
+++ b/main.cpp
@@ -19,47 +19,47 @@
 * Free Software Foundation, Inc.,                                          *
 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.                 *
 ***************************************************************************/
-#include <QCoreApplication>
+#include <QApplication>
 
 
 #include <QStringList>
 #include "diceparser.h"
+#include "irc/mainwindow.h"
 
 int main(int argc, char *argv[])
 {
-    // QCoreApplication a(argc, argv);
-
+     QApplication a(argc, argv);
 
 
+    MainWindow main;
     DiceParser* myParser = new DiceParser();
 
     QStringList commands;
 
-    commands<< "1000D10"
-            << "2*(4+4)"
+    commands<< "2*(4+4)"
             << "1+(4*3)D10"
-             << "2+4/4"
+            << "2+4/4"
             << "2D10*2D20*8"
             <<"1+(4*3)D10"
-              <<"(4D6)D10"
-           << "1D100a[>=95]a[>=96]a[>=97]a[>=98]a[>=99]e[>=100]"
-             << "3D100"
-             << "4k3"
-             << "10D10e[>=6]sc[>=6]"
+            <<"(4D6)D10"
+            << "1D100a[>=95]a[>=96]a[>=97]a[>=98]a[>=99]e[>=100]"
+            << "3D100"
+            << "4k3"
+            << "10D10e[>=6]sc[>=6]"
              //<< "100190D6666666s"
-             << "10D10e10s"
+            << "10D10e10s"
             << "10D10s"
-             << "15D10e10c[8-10]"
-             << "15D10c[>7]"
-             << "1D8+2D6+7"
-             << "D25"
-             << "8+8+8"
-             << "1D20-88"
-             << "100*1D20*2D6"
-             << "100/28*3"
-             << "100/8"
-             << "100*3*8"
-             << "100*3*8";
+            << "15D10e10c[8-10]"
+            << "x"
+            << "1D8+2D6+7"
+            << "D25"
+            << "8+8+8"
+            << "1D20-88"
+            << "100*1D20*2D6"
+            << "100/28*3"
+            << "100/8"
+            << "100*3*8"
+            << "100*3*8";
 
     if(argc>1)
     {
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
             myParser->displayResult();
         }
     }
+    main.show();
+    return a.exec();
 
-    //return a.exec();
-    return 0;
 }
-- 
cgit v1.2.3-70-g09d2