Index: topwidget.cpp
===================================================================
--- topwidget.cpp	(Revision 611318)
+++ topwidget.cpp	(Arbeitskopie)
@@ -71,7 +71,7 @@ void MyTopLevelWidget::initActions( )
    KStdGameAction::quit(this, SLOT(close()), actionCollection());
    KStdGameAction::gameNew(playfield, SLOT(newGame()), actionCollection());
    KAction* newRoundAct = new KAction( KIcon("spnewround"), i18n( "&New Round" ), actionCollection(), "new_round" );
-   newRoundAct->setShortcut( Qt::CTRL + Qt::Key_N );
+   newRoundAct->setShortcut( Qt::CTRL + Qt::Key_R );
    connect( newRoundAct, SIGNAL( triggered(bool) ), playfield, SLOT( newRound( ) ) );
 
    MyMainView::pauseAction =
Index: mainview.cpp
===================================================================
--- mainview.cpp	(Revision 611318)
+++ mainview.cpp	(Arbeitskopie)
@@ -15,6 +15,7 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <klocale.h>
+#include <kactioncollection.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <kconfig.h>
@@ -242,55 +243,49 @@ void MyMainView::keyPressEvent(QKeyEvent
 {
    if((gameEnd<=0.0)&&(gameEnd>-2.0))
    {
-      /*
-      if(key==options.functionKey[FunctionKeyStart])
+      
+      //if(key==options.functionKey[FunctionKeyStart])
+       if (ev->key() == GAME_START_SHORTCUT)
          newRound();
-      */
    }
    else if(waitForStart)
    {
-      /*
-      if((key==options.functionKey[FunctionKeyStart])
-         && (!functionKeyPressed[FunctionKeyStart]))
+      if (ev->key() == GAME_START_SHORTCUT)
+      //if((key==options.functionKey[FunctionKeyStart])
+      //   && (!functionKeyPressed[FunctionKeyStart]))
       {
-         functionKeyPressed[FunctionKeyStart]=true;
+     //    functionKeyPressed[FunctionKeyStart]=true;
          resume();
       }
-      */
+      
    }
    else
    {
      bool accept=true;
 
-#ifdef __GNUC__
-#warning KKey does no longer exist
-#endif
-#if 0
-      KKey key(ev);
-
-      if(actionCollection->action("P1KeyLeft")->shortcut().contains(key))
+      if(actionCollection->action("P1KeyLeft")->shortcuts().contains(ev->key()))
             playerKeyPressed[0][PlayerKeyLeft]=true;
-      else if(actionCollection->action("P2KeyLeft")->shortcut().contains(key))
+      else if(actionCollection->action("P2KeyLeft")->shortcuts().contains(ev->key()))
             playerKeyPressed[1][PlayerKeyLeft]=true;
       
-      else if(actionCollection->action("P1KeyRight")->shortcut().contains(key))
+      else if(actionCollection->action("P1KeyRight")->shortcuts().contains(ev->key()))
             playerKeyPressed[0][PlayerKeyRight]=true;
-      else if(actionCollection->action("P2KeyRight")->shortcut().contains(key))
+      else if(actionCollection->action("P2KeyRight")->shortcuts().contains(ev->key()))
             playerKeyPressed[1][PlayerKeyRight]=true;
       
-      else if(actionCollection->action("P1KeyAcc")->shortcut().contains(key))
+      else if(actionCollection->action("P1KeyAcc")->shortcuts().contains(ev->key()))
             playerKeyPressed[0][PlayerKeyAcc]=true;
-      else if(actionCollection->action("P2KeyAcc")->shortcut().contains(key))
+      else if(actionCollection->action("P2KeyAcc")->shortcuts().contains(ev->key()))
             playerKeyPressed[1][PlayerKeyAcc]=true;
       
-      else if(actionCollection->action("P1Shot")->shortcut().contains(key))
+      else if(actionCollection->action("P1Shot")->shortcuts().contains(ev->key()))
             playerKeyPressed[0][PlayerKeyShot]=true;
-      else if(actionCollection->action("P2Shot")->shortcut().contains(key))
+      else if(actionCollection->action("P2Shot")->shortcuts().contains(ev->key()))
             playerKeyPressed[1][PlayerKeyShot]=true;
       
-      else if(actionCollection->action("P1Mine")->shortcut().contains(key))
+      else if(actionCollection->action("P1Mine")->shortcuts().contains(ev->key()))
             playerKeyPressed[0][PlayerKeyMine]=true;
-      else if(actionCollection->action("P2Mine")->shortcut().contains(key))
+      else if(actionCollection->action("P2Mine")->shortcuts().contains(ev->key()))
             playerKeyPressed[1][PlayerKeyMine]=true;
       else
         accept = false;
@@ -302,51 +297,45 @@ void MyMainView::keyPressEvent(QKeyEvent
          pause();
       }
       */
-#endif
+
       if(!accept)
 	ev->ignore();
    }
 }
 
-void MyMainView::keyReleaseEvent(QKeyEvent *)
+void MyMainView::keyReleaseEvent(QKeyEvent *ev)
 {
-#ifdef __GNUC__
-#warning KKey does no longer exist
-#endif
-#if 0
    bool accept=true;
-   KKey key(ev);
 
-   if(actionCollection->action("P1KeyLeft")->shortcut().contains(key))
+   if(actionCollection->action("P1KeyLeft")->shortcuts().contains(ev->key()))
       playerKeyPressed[0][PlayerKeyLeft]=false;
-   else if(actionCollection->action("P2KeyLeft")->shortcut().contains(key))
+   else if(actionCollection->action("P2KeyLeft")->shortcuts().contains(ev->key()))
       playerKeyPressed[1][PlayerKeyLeft]=false;
       
-   else if(actionCollection->action("P1KeyRight")->shortcut().contains(key))
+   else if(actionCollection->action("P1KeyRight")->shortcuts().contains(ev->key()))
       playerKeyPressed[0][PlayerKeyRight]=false;
-   else if(actionCollection->action("P2KeyRight")->shortcut().contains(key))
+   else if(actionCollection->action("P2KeyRight")->shortcuts().contains(ev->key()))
       playerKeyPressed[1][PlayerKeyRight]=false;
       
-   else if(actionCollection->action("P1KeyAcc")->shortcut().contains(key))
+   else if(actionCollection->action("P1KeyAcc")->shortcuts().contains(ev->key()))
       playerKeyPressed[0][PlayerKeyAcc]=false;
-   else if(actionCollection->action("P2KeyAcc")->shortcut().contains(key))
+   else if(actionCollection->action("P2KeyAcc")->shortcuts().contains(ev->key()))
       playerKeyPressed[1][PlayerKeyAcc]=false;
       
-   else if(actionCollection->action("P1Shot")->shortcut().contains(key))
+   else if(actionCollection->action("P1Shot")->shortcuts().contains(ev->key()))
       playerKeyPressed[0][PlayerKeyShot]=false;
-   else if(actionCollection->action("P2Shot")->shortcut().contains(key))
+   else if(actionCollection->action("P2Shot")->shortcuts().contains(ev->key()))
       playerKeyPressed[1][PlayerKeyShot]=false;
       
-   else if(actionCollection->action("P1Mine")->shortcut().contains(key))
+   else if(actionCollection->action("P1Mine")->shortcuts().contains(ev->key()))
       playerKeyPressed[0][PlayerKeyMine]=false;
-   else if(actionCollection->action("P2Mine")->shortcut().contains(key))
+   else if(actionCollection->action("P2Mine")->shortcuts().contains(ev->key()))
       playerKeyPressed[1][PlayerKeyMine]=false;
    else
       accept = false;
 
    if(!accept)
      ev->ignore();
-#endif
 }
 
 void MyMainView::pause()
@@ -510,7 +499,7 @@ void MyMainView::newRound()
    QString str = i18n("Press %1 to start",
                   KShortcut(GAME_START_SHORTCUT).toString());
    emit(setStatusText(str,IDS_MAIN));
-   emit( setStatusText( "", IDS_PAUSE ) );
+   emit(setStatusText( "", IDS_PAUSE ) );
    stop( );
 }
 
