From 8c3d8695b3db8fd8653d178e39c2b27ff7ef7acb Mon Sep 17 00:00:00 2001
From: Gilles Bailly <gilles.bailly@telecom-paristech.fr>
Date: Thu, 15 Mar 2012 09:39:59 +0000
Subject: [PATCH] qstring to int

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@65 47cf9a05-e0a8-4ed5-9e9b-101a649bc004
---
 WidgetKeyboard/example/DynaKeyboard.cpp       | 30 +++++++++----------
 WidgetKeyboard/example/DynaKeyboard.h         | 16 +++++-----
 WidgetKeyboard/example/DynaKeyboardHaptic.cpp |  2 +-
 WidgetKeyboard/example/DynaKeyboardHaptic.h   |  4 +--
 WidgetKeyboard/example/DynaKeyboardVisual.cpp |  2 +-
 WidgetKeyboard/example/DynaKeyboardVisual.h   |  2 +-
 WidgetKeyboard/example/Sheet.cpp              | 24 ++++++++-------
 WidgetKeyboard/example/Sheet.h                |  6 ++--
 8 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/WidgetKeyboard/example/DynaKeyboard.cpp b/WidgetKeyboard/example/DynaKeyboard.cpp
index 5dac04d..c0041fe 100644
--- a/WidgetKeyboard/example/DynaKeyboard.cpp
+++ b/WidgetKeyboard/example/DynaKeyboard.cpp
@@ -7,18 +7,18 @@ DynaKeyboard::DynaKeyboard()
 }
 
 
-void DynaKeyboard::raiseKeys(QVector<QString> keys, bool ctrl, bool shift, bool alt){
+void DynaKeyboard::raiseKeys(QVector<int> keys, bool ctrl, bool shift, bool alt){
 
-    QVector<QString> res = filterRaisedKeys(keys, ctrl, shift, alt);
+    QVector<int> res = filterRaisedKeys(keys, ctrl, shift, alt);
     haptic->raiseKeys(res);
     this->keysRaised(res);
 
 
 }
 
-QVector<QString> DynaKeyboard::filterRaisedKeys(QVector<QString> keys, bool Ctrl, bool Shift, bool Alt)
+QVector<int> DynaKeyboard::filterRaisedKeys(QVector<int> keys, bool Ctrl, bool Shift, bool Alt)
 {
-    QVector<QString> res;
+    QVector<int> res;
     return keys;
 
     if(Ctrl & Shift & Alt) // ctrl shift alt
@@ -42,32 +42,32 @@ QVector<QString> DynaKeyboard::filterRaisedKeys(QVector<QString> keys, bool Ctrl
 }
 
 
-QVector<QString> DynaKeyboard::ctrl(QVector<QString> keys ){
-    QVector<QString> res;
+QVector<int> DynaKeyboard::ctrl(QVector<int> keys ){
+    QVector<int> res;
     return res;
 }
-QVector<QString> DynaKeyboard::ctrlShift(QVector<QString> keys){
-    QVector<QString> res;
+QVector<int> DynaKeyboard::ctrlShift(QVector<int> keys){
+    QVector<int> res;
     return res;
 }
-QVector<QString> DynaKeyboard::ctrlShiftAlt(QVector<QString> keys){
-    QVector<QString> res;
+QVector<int> DynaKeyboard::ctrlShiftAlt(QVector<int> keys){
+    QVector<int> res;
     return res;
 }
-QVector<QString> DynaKeyboard::ctrlAlt(QVector<QString> keys){
-    QVector<QString> res;
+QVector<int> DynaKeyboard::ctrlAlt(QVector<int> keys){
+    QVector<int> res;
     return res;
 }
 
-QVector<QString> DynaKeyboard::alt(QVector<QString> keys){
-    QVector<QString> res;
+QVector<int> DynaKeyboard::alt(QVector<int> keys){
+    QVector<int> res;
     return res;
 }
 
 
 
 //called from thomas
-void DynaKeyboard::keysRaised(QVector<QString> keys)
+void DynaKeyboard::keysRaised(QVector<int> keys)
 {
     visual->raiseKeys(keys);
 }
diff --git a/WidgetKeyboard/example/DynaKeyboard.h b/WidgetKeyboard/example/DynaKeyboard.h
index b164de2..ac9fe84 100644
--- a/WidgetKeyboard/example/DynaKeyboard.h
+++ b/WidgetKeyboard/example/DynaKeyboard.h
@@ -13,20 +13,20 @@ public:
     DynaKeyboardVisual *visual;
     DynaKeyboardHaptic *haptic;
 
-    void raiseKeys(QVector<QString> keys, bool ctrl, bool shift, bool alt); //called by the application
+    void raiseKeys(QVector<int> keys, bool ctrl, bool shift, bool alt); //called by the application
 
     //While the application can have several hotkeys
     //we just want to raise the most frequent ones, or not rising two neighboor keys
-     QVector<QString> filterRaisedKeys(QVector<QString> keys, bool ctrl, bool shift, bool alt);
+     QVector<int> filterRaisedKeys(QVector<int> keys, bool ctrl, bool shift, bool alt);
 
-    void keysRaised(QVector<QString>); //called by thomas with the list of keys
+    void keysRaised(QVector<int>); //called by thomas with the list of keys
 
 protected:
-    QVector<QString> ctrl(QVector<QString> keys );
-    QVector<QString> ctrlShift(QVector<QString> keys);
-    QVector<QString> ctrlShiftAlt(QVector<QString> keys);
-    QVector<QString> ctrlAlt(QVector<QString> keys);
-    QVector<QString> alt(QVector<QString> keys);
+    QVector<int> ctrl(QVector<int> keys );
+    QVector<int> ctrlShift(QVector<int> keys);
+    QVector<int> ctrlShiftAlt(QVector<int> keys);
+    QVector<int> ctrlAlt(QVector<int> keys);
+    QVector<int> alt(QVector<int> keys);
 
 };
 
diff --git a/WidgetKeyboard/example/DynaKeyboardHaptic.cpp b/WidgetKeyboard/example/DynaKeyboardHaptic.cpp
index 23d8d51..9c67213 100644
--- a/WidgetKeyboard/example/DynaKeyboardHaptic.cpp
+++ b/WidgetKeyboard/example/DynaKeyboardHaptic.cpp
@@ -17,7 +17,7 @@ DynaKeyboardHaptic::DynaKeyboardHaptic(DynaKeyboard *dyna)
 
 //you have more keys than solenoids here.
 // ?
-void DynaKeyboardHaptic::raiseKeys(QVector<QString> keys)
+void DynaKeyboardHaptic::raiseKeys(QVector<int> keys)
 {
     if (!_dynamicKeyboardController)
         return;
diff --git a/WidgetKeyboard/example/DynaKeyboardHaptic.h b/WidgetKeyboard/example/DynaKeyboardHaptic.h
index ecb8f1a..7ef6e18 100644
--- a/WidgetKeyboard/example/DynaKeyboardHaptic.h
+++ b/WidgetKeyboard/example/DynaKeyboardHaptic.h
@@ -5,7 +5,7 @@
 #include <QString>
 
 #include <DynamicKeyboardLibrary/DynamicKeyboardController.h>
-
+//#include "../../DynamicKeyboardLib/DynamicKeyboardLibrary/DynamicKeyboardLibrary/DynamicKeyboardConroller.h"
 class DynaKeyboard;
 
 class DynaKeyboardHaptic
@@ -13,7 +13,7 @@ class DynaKeyboardHaptic
 public:
     DynaKeyboardHaptic(DynaKeyboard* dyna);
     void initSolenoidKeyMapping();
-    void raiseKeys(QVector<QString> keys);
+    void raiseKeys(QVector<int> keys);
 
     DynaKeyboard *dynaKeyboard;
 
diff --git a/WidgetKeyboard/example/DynaKeyboardVisual.cpp b/WidgetKeyboard/example/DynaKeyboardVisual.cpp
index 3c20b11..679af5f 100644
--- a/WidgetKeyboard/example/DynaKeyboardVisual.cpp
+++ b/WidgetKeyboard/example/DynaKeyboardVisual.cpp
@@ -73,7 +73,7 @@ void DynaKeyboardVisual::raisAll(){
 }
 
 
-void DynaKeyboardVisual::raiseKeys(QVector<QString> keys){
+void DynaKeyboardVisual::raiseKeys(QVector<int> keys){
     reset();
     for(int i=0; i<keys.size();i++){
         raiseKey(keys.at(i));
diff --git a/WidgetKeyboard/example/DynaKeyboardVisual.h b/WidgetKeyboard/example/DynaKeyboardVisual.h
index 7f5929e..6d52822 100644
--- a/WidgetKeyboard/example/DynaKeyboardVisual.h
+++ b/WidgetKeyboard/example/DynaKeyboardVisual.h
@@ -23,7 +23,7 @@ public slots:
     void lowerKey(int);
     void raiseKey(QString c);
     void lowerKey(QString c);
-    void raiseKeys(QVector<QString> keys);
+    void raiseKeys(QVector<int> keys);
 
 protected:
     void updateAll(bool);
diff --git a/WidgetKeyboard/example/Sheet.cpp b/WidgetKeyboard/example/Sheet.cpp
index 59fd406..fa546ef 100644
--- a/WidgetKeyboard/example/Sheet.cpp
+++ b/WidgetKeyboard/example/Sheet.cpp
@@ -98,8 +98,8 @@ void Sheet::createMenuBar()
 
 }
 
-QVector<QString> Sheet::getCtrlHotkeys(){
-    QVector<QString> hotkeys;
+QVector<int> Sheet::getCtrlHotkeys(){
+    QVector<int> hotkeys;
     bool ctrl2 = false;
     bool shift2 =false;
     bool alt2 =false;
@@ -114,19 +114,21 @@ QVector<QString> Sheet::getCtrlHotkeys(){
         alt2 = str.contains("Alt");
         valid = seq.count();
         if(ctrl2 == ctrl && shift2 == shift && alt2 == alt && valid){
-            hotkeys.append(QString(str[str.length()-1]));
+            hotkeys.append(str[str.length()-1].unicode());
+            //hotkeys.append(seq[seq.count()-1]);
+            //hotkeys.append()
 
         }
 
     }
 
-    qDebug()<< hotkeys;
+    qDebug()<< hotkeys << "test s: "<<Qt::Key_S;
     return hotkeys;
 
 }
 
-QVector<QString> Sheet::getAltHotkeys(){
-    QVector<QString> hotkeys;
+QVector<int> Sheet::getAltHotkeys(){
+    QVector<int> hotkeys;
     if (window->menuBar()->activeAction())
         return hotkeys;
 
@@ -139,7 +141,8 @@ QVector<QString> Sheet::getAltHotkeys(){
         alt2 = str.contains("Alt");
 
         if(alt2 == alt){
-            hotkeys.append(QString(str[str.length()-1]));
+            hotkeys.append(str[str.length()-1].unicode());
+            //hotkeys.append(seq[seq.count()-1]);
 
         }
 
@@ -149,8 +152,8 @@ QVector<QString> Sheet::getAltHotkeys(){
 
 }
 
-QVector<QString> Sheet::getImplicitAndAltHotkeys(){
-    QVector<QString> hotkeys;
+QVector<int> Sheet::getImplicitAndAltHotkeys(){
+    QVector<int> hotkeys;
 
     QAction *action = window->menuBar()->activeAction();
     if(!action)
@@ -165,7 +168,8 @@ QVector<QString> Sheet::getImplicitAndAltHotkeys(){
                  QKeySequence seq = actionList.at(i)->shortcut();
                  QString str = seq.mnemonic(actionList.at(i)->text()).toString();
                  if(str.contains("Alt"))
-                    hotkeys.append(QString(str[str.length()-1]));
+                    hotkeys.append(str[str.length()-1].unicode());
+                    //hotkeys.append(seq[seq.count()-1]);
              }
          }
     }
diff --git a/WidgetKeyboard/example/Sheet.h b/WidgetKeyboard/example/Sheet.h
index 257ae9a..edd5eab 100644
--- a/WidgetKeyboard/example/Sheet.h
+++ b/WidgetKeyboard/example/Sheet.h
@@ -29,9 +29,9 @@ public:
     void raiseCtrlShiftAlt();
     void raiseCtrlAlt();
 
-    QVector<QString> getCtrlHotkeys();
-    QVector<QString> getAltHotkeys();
-    QVector<QString> getImplicitAndAltHotkeys();
+    QVector<int> getCtrlHotkeys();
+    QVector<int> getAltHotkeys();
+    QVector<int> getImplicitAndAltHotkeys();
 
 
 public slots:
-- 
2.30.2