From 675b67f7b2e9aaef768ee9026a3afc31c8e8a882 Mon Sep 17 00:00:00 2001
From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Thu, 27 Aug 2015 20:10:33 +0200
Subject: [PATCH] "val kid children" replace every occurence of "kid" by
 "chilren" from now in every action, not into the DB (warning ! kidding will
 be replaced by childrending)

---
 mainwindow.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4660929..9830b1e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -165,13 +165,6 @@ int unsigned MainWindow::addWidget(const QString &key, const CLabel *a){
     if(key.contains(QString("idem"))){
         key.replace(QString("idem"), a->text());
     }
-    for(QMap<QString, QString>::iterator b=valeur->begin();b!=valeur->end();b++){
-        if(key.contains(b.key())){//key.replace(b.key(), b.value());
-            QString keybefore=key;
-            QString keyafter=key.replace(b.key(), b.value());
-            if(deb)QMessageBox::information(this, trUtf8("valeur replace", "box title to debug valeur replace"), QString(keybefore+"->"+keyafter));
-        }
-    }
     int c=grid->count(), maxc=conf->value(QString("maxcolumn")).toInt(), maxl=conf->value(QString("maxline")).toInt();
     grid->addWidget(a, c/maxc, c%maxc, 1, 1, Qt::AlignJustify| Qt::AlignVCenter | Qt::AlignHCenter);
     QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map()));
@@ -187,13 +180,21 @@ void MainWindow::action(const QString &a){
     qDebug()<<"action("<<a<<")";
     if(deb)QMessageBox::information(this, trUtf8("action", "box title to debug action"), a);
     QStringList b=a.split(QString(" "));
-    QString c=a;
+    QString c=a, aa=a;
     bool ok=1;
     c.remove(0,4);
-    int bs=b.size(), part=a.count(conf->value(QString("sepcmd")).toString());
+    for(QMap<QString, QString>::iterator b=valeur->begin();b!=valeur->end();b++){
+        if(a.contains(b.key())){//key.replace(b.key(), b.value());
+            QString abefore=a;
+            aa=a.replace(b.key(), b.value());
+            c=c.replace(b.key(), b.value());
+            if(deb)QMessageBox::information(this, trUtf8("valeur replace", "box title to debug valeur replace"), QString(abefore+"->"+aa));
+        }
+    }
+    int bs=b.size(), part=aa.count(conf->value(QString("sepcmd")).toString());
     if(part){
         for(int d=0; d<=part; d++){
-            action(a.split(conf->value(QString("sepcmd")).toString())[d]);
+            action(aa.split(conf->value(QString("sepcmd")).toString())[d]);
         }
     }
     else if(b[0]==QString("set")){
@@ -425,11 +426,11 @@ void MainWindow::action(const QString &a){
     else if(b[0]==QString("use")){
         use(c);
     }
-    else if(b[0]==QString("sup")){
+/*    else if(b[0]==QString("sup")){
         system("su");
         action(c);
         system("exit");
-    }
+    }*/
     else if(b[0]==QString("cal")){
         QString d="service call phone 2 s16 "+c;
         qDebug()<<"d : "<<d;
@@ -437,7 +438,7 @@ void MainWindow::action(const QString &a){
     }
     else if(b[0]==QString("val")){
         if(bs!=1){
-            if((b[1]==QString("list"))&&(bs==2)){
+            if(b[1]==QString("list")){
                 flush();
                 QList<QString> tmpkeys=valeur->keys();
                 QList<QString> tmpvalues=valeur->values();
-- 
2.45.1