1 files changed, 6 insertions, 6 deletions

diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index c1020fa..8e529a3 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -209,6 +209,6 @@ void MainWindow::initUI() {
 
     m_kb = new FunctionKeyboard(m_keyBar);
-    connect(m_kb, SIGNAL(keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort)),
-            this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort)));
+    connect(m_kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)),
+            this, SLOT(slotKeyReceived(FKey, ushort, ushort, bool)));
 
     m_buttonBar = new QToolBar( this );
@@ -217,7 +217,9 @@ void MainWindow::initUI() {
     m_buttonBar->hide();
 
+    /*
     m_qb = new QuickButton( m_buttonBar );
     connect( m_qb, SIGNAL( keyPressed( ushort, ushort, bool, bool, bool) ),
             this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) );
+    */
 
 
@@ -521,7 +523,5 @@ void MainWindow::slotFullscreen() {
 
 
-void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, ushort, ushort) {
-
-    //qWarning("unicode: %x, qkey: %x, %s", u, q, pressed ? "pressed" : "released");
+void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
 
     if ( m_curSession ) {
@@ -532,5 +532,5 @@ void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, u
         else state = QEvent::KeyRelease;
 
-        QKeyEvent ke(state, q, u, 0, QString(QChar(u)));
+        QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
 
         // where should i send this event? doesnt work sending it here