From 6b00da458bf17b1bc35167ac3f7e4cb93a489853 Mon Sep 17 00:00:00 2001
From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sat, 7 Dec 2013 19:02:42 +0100
Subject: [PATCH] Clean up the code (a little bit)

---
 mainwindow.cpp | 32 +++++++++-----------------------
 mainwindow.h   |  2 +-
 ui.sql         |  7 ++++++-
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2134c5a..7f52a5b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -51,12 +51,7 @@ MainWindow::MainWindow(QWidget *parent)
 }
 void MainWindow::start(){
     flush();
-    QString t("begin");
-    getButtons(t);
-
-
-
-
+    getButtons(QString("begin"));
 }
 MainWindow::~MainWindow()
 {
@@ -182,10 +177,7 @@ void MainWindow::remWidget(const QString & a){
 }
 void MainWindow::action(const QString & a){
     qDebug()<<"action("<<a<<")";
-    int b=0;
-
     flush();
-
     if (a=="host")choosehost();
     else if (a=="port")chooseport();
     else if (a=="user")chooseuser();
@@ -193,11 +185,6 @@ void MainWindow::action(const QString & a){
     else if (a=="password")choosepass();
     else if (a=="file")choosefile();
     else getButtons(a);
-
-
-    //qDebug()<<"action() end";
-
-
 }
 void MainWindow::createMenuBar(){
     FileMenu=new QMenu(QString("&File"), this);
@@ -255,7 +242,6 @@ CLabel::CLabel( const QString& text, QWidget * parent ) : QLabel(parent)
     setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
-
 }
 CLabel::~CLabel()
 {
@@ -295,12 +281,12 @@ QString MainWindow::getText(const QString &a){
 void MainWindow::connectDB(){
     db = QSqlDatabase::addDatabase("QSQLITE");
     //db = QSqlDatabase::addDatabase("QPSQL");
-    //db.setHostName(host); useless with SQLite
+    db.setHostName(host);
     db.setDatabaseName(database);
-    //db.setUserName(user); useless
-    //db.setPassword(password); same
-    //db.setConnectOptions(QString("requiressl=1 connect_timeout=10000"));//10sec, useless
-    qDebug()<<"db.open() ? "<<db.open()<< ". sqlite file : "<<db.databaseName();
+    db.setUserName(user);
+    db.setPassword(password);
+    db.setConnectOptions(QString("requiressl=1 connect_timeout=10000"));//10sec,
+    qDebug()<<"db.open() ? "<<db.open()<< ". database : "<<db.databaseName();
     q=new QSqlQuery(db);
 
 
@@ -322,9 +308,9 @@ QString &MainWindow::get(int row, int column){
     return tmp;
 }
 int MainWindow::exec(const QString & a){
-    qDebug()<<"exec("<<a<<")";
-    q->prepare(a);// make it
-    q->exec();// do it
+    //qDebug()<<"exec("<<a<<")";
+    q->prepare(a);
+    q->exec();
     QSqlError b=q->lastError();
     if (b.isValid())qDebug()<<"SQL error->exec() :"<<b.text();
     return q->size();
diff --git a/mainwindow.h b/mainwindow.h
index 8046a21..66342fb 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -111,7 +111,7 @@ private:
     QList<QString> way;
     QSqlDatabase db;
     QSqlQuery *q;
-    QSqlRecord r;
+    //QSqlRecord r;
 
 };
 
diff --git a/ui.sql b/ui.sql
index 8ee5b68..9d205a9 100644
--- a/ui.sql
+++ b/ui.sql
@@ -1 +1,6 @@
-insert into ui (keyword, label, action) values ('begin', 'chat', 'select texte from raw')
+INSERT INTO ui VALUES('begin','fille','fille');
+INSERT INTO ui VALUES('fille','aurelie','f-aurelie');
+INSERT INTO ui VALUES('f-aurelie','discours','f-a-discours');
+INSERT INTO ui VALUES('f-a-discours','discours un peu plus long que la moyenne pour voir se qui va se passer','begin');
+INSERT INTO ui VALUES('fille','audrey','f-audrey');
+INSERT INTO ui VALUES('f-audrey','elle se moque de moi, méchante ;-)','begin');
-- 
2.45.1