[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames/ktron
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2006-04-15 10:33:40
Message-ID: 1145097220.751005.13382.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 530085 by aacid:

ktron compiles and seems to work


 M  +20 -23    tron.cpp  


--- trunk/KDE/kdegames/ktron/tron.cpp #530084:530085
@@ -646,30 +646,29 @@
 
 void Tron::keyPressEvent(QKeyEvent *e)
 {
-  KKey key(e);
   if(!players[1].computer)
   {
-      if(actionCollection->action("Pl2Up")->shortcut().contains(key))
+      if(actionCollection->action("Pl2Up")->shortcut().contains(e->key()))
 		{
 	  		switchDir(1,Directions::Up);
 	  		players[1].keyPressed=true;
 		}
-      else if(actionCollection->action("Pl2Left")->shortcut().contains(key))
+      else if(actionCollection->action("Pl2Left")->shortcut().contains(e->key()))
 	   {
 	  		switchDir(1,Directions::Left);
 	  		players[1].keyPressed=true;
 		}
-      else if(actionCollection->action("Pl2Right")->shortcut().contains(key))
+      else if(actionCollection->action("Pl2Right")->shortcut().contains(e->key()))
 		{
 	  		switchDir(1,Directions::Right);
 	  		players[1].keyPressed=true;
 		}
-      else if(actionCollection->action("Pl2Down")->shortcut().contains(key))
+      else if(actionCollection->action("Pl2Down")->shortcut().contains(e->key()))
 		{
 	  		switchDir(1,Directions::Down);
 	  		players[1].keyPressed=true;
 		}
-      else if(actionCollection->action("Pl2Ac")->shortcut().contains(key))
+      else if(actionCollection->action("Pl2Ac")->shortcut().contains(e->key()))
 		{
 		   if(!Settings::acceleratorBlocked())
 	  			players[1].accelerated=true;
@@ -679,27 +678,27 @@
 
   if(!players[0].computer)
   {
-      if(actionCollection->action("Pl1Left")->shortcut().contains(key))
+      if(actionCollection->action("Pl1Left")->shortcut().contains(e->key()))
 		{
 	  		switchDir(0,Directions::Left);
 	  		players[0].keyPressed=true;
 		}
-      else if(actionCollection->action("Pl1Right")->shortcut().contains(key))
+      else if(actionCollection->action("Pl1Right")->shortcut().contains(e->key()))
 		{
 	  		switchDir(0,Directions::Right);
 	  		players[0].keyPressed=true;
 		}
-      else if(actionCollection->action("Pl1Up")->shortcut().contains(key))
+      else if(actionCollection->action("Pl1Up")->shortcut().contains(e->key()))
 		{
 	  		switchDir(0,Directions::Up);
 	  		players[0].keyPressed=true;
 		}
-      else if(actionCollection->action("Pl1Down")->shortcut().contains(key))
+      else if(actionCollection->action("Pl1Down")->shortcut().contains(e->key()))
 		{
 	 		switchDir(0,Directions::Down);
 	  		players[0].keyPressed=true;
 		}
-      else if(actionCollection->action("Pl1Ac")->shortcut().contains(key))
+      else if(actionCollection->action("Pl1Ac")->shortcut().contains(e->key()))
 		{
 		   if(!Settings::acceleratorBlocked())
 	  			players[0].accelerated=true;
@@ -729,31 +728,29 @@
 
 void Tron::keyReleaseEvent(QKeyEvent * e)
 {
-  KKey key(e);
-
   if(!players[1].computer)
   {
-      if(actionCollection->action("Pl2Ac")->shortcut().contains(key))
+      if(actionCollection->action("Pl2Ac")->shortcut().contains(e->key()))
 		{
 			players[1].accelerated=false;
 			return;
   		}
-      else if(actionCollection->action("Pl2Left")->shortcut().contains(key))
+      else if(actionCollection->action("Pl2Left")->shortcut().contains(e->key()))
 		{
 			players[1].keyPressed=false;
 			return;
 		}
-      else if(actionCollection->action("Pl2Right")->shortcut().contains(key))
+      else if(actionCollection->action("Pl2Right")->shortcut().contains(e->key()))
 		{
 	  		players[1].keyPressed=false;
 	  		return;
 		}
-      else if(actionCollection->action("Pl2Up")->shortcut().contains(key))
+      else if(actionCollection->action("Pl2Up")->shortcut().contains(e->key()))
 		{
 	  		players[1].keyPressed=false;
 	  		return;
 		}
-      else if(actionCollection->action("Pl2Down")->shortcut().contains(key))
+      else if(actionCollection->action("Pl2Down")->shortcut().contains(e->key()))
 		{
 		  players[1].keyPressed=false;
 		  return;
@@ -762,27 +759,27 @@
 
    if(!players[0].computer)
    {
-      if(actionCollection->action("Pl1Left")->shortcut().contains(key))
+      if(actionCollection->action("Pl1Left")->shortcut().contains(e->key()))
 		{
 	 		players[0].keyPressed=false;
 	 		return;
 		}
-      else if(actionCollection->action("Pl1Right")->shortcut().contains(key))
+      else if(actionCollection->action("Pl1Right")->shortcut().contains(e->key()))
 		{
 	  		players[0].keyPressed=false;
 	  		return;
 		}
-      else if(actionCollection->action("Pl1Up")->shortcut().contains(key))
+      else if(actionCollection->action("Pl1Up")->shortcut().contains(e->key()))
 		{
 	 		players[0].keyPressed=false;
 	  		return;
 		}
-      else if(actionCollection->action("Pl1Down")->shortcut().contains(key))
+      else if(actionCollection->action("Pl1Down")->shortcut().contains(e->key()))
 		{
 	 		players[0].keyPressed=false;
 	 		return;
 		}
-      else if(actionCollection->action("Pl1Ac")->shortcut().contains(key))
+      else if(actionCollection->action("Pl1Ac")->shortcut().contains(e->key()))
 		{
 	  		players[0].accelerated=false;
 	  		return;
[prev in list] [next in list] [prev in thread] [next in thread]