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

List:       kde-commits
Subject:    KDE/kdegames/killbots
From:       Parker Coates <parker.coates () gmail ! com>
Date:       2008-11-30 19:43:01
Message-ID: 1228074181.085876.23861.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 890980 by coates:

Removed QAction usage. Killbots is now KAction only.


 M  +5 -4      mainwindow.cpp  
 M  +3 -2      mainwindow.h  


--- trunk/KDE/kdegames/killbots/mainwindow.cpp #890979:890980
@@ -98,8 +98,9 @@
 	KStandardAction::keyBindings( this, SLOT(configureShortcuts()), actionCollection() \
);  KStandardAction::preferences( this, SLOT(configurePreferences()), \
actionCollection() );  
+	m_safeTeleportAction =
+	setupMappedAction( actionCollection(), i18n("Teleport Safely"),              \
"teleport_safely", Qt::Key_Plus,  Qt::Key_T,     TeleportSafely,          \
"games-solve"  );  setupMappedAction( actionCollection(), i18n("Teleport"),           \
"teleport",        Qt::Key_Minus, Qt::Key_R,     Teleport,                "roll"      \
                );
-	setupMappedAction( actionCollection(), i18n("Teleport Safely"),              \
"teleport_safely", Qt::Key_Plus,  Qt::Key_T,     TeleportSafely,          \
"games-solve"  );  setupMappedAction( actionCollection(), i18n("Teleport, Safely If \
Possible"), "teleport_sip",    Qt::Key_0,     Qt::Key_Space, TeleportSafelyIfPossible \
);  setupMappedAction( actionCollection(), i18n("Wait Out Round"),               \
"wait",            Qt::Key_Enter, Qt::Key_Y,     WaitOutRound,            \
"process-stop" );  
@@ -116,13 +117,11 @@
 
 	connect( m_keyboardMapper, SIGNAL(mapped(int)), m_engine, SLOT(requestAction(int)) \
);  
-	m_safeTeleportAction = actionCollection()->action("teleport_safely");
-
 	m_keyboardActions->associateWidget(this);
 }
 
 
-void Killbots::MainWindow::setupMappedAction( KActionCollection * collection, const \
QString & displayName, const QString & internalName, const QKeySequence & \
primaryShortcut, const QKeySequence & alternateShortcut, int mapping, const QString & \
icon ) +KAction * Killbots::MainWindow::setupMappedAction( KActionCollection * \
collection, const QString & displayName, const QString & internalName, const \
QKeySequence & primaryShortcut, const QKeySequence & alternateShortcut, int mapping, \
const QString & icon )  {
 	KAction * action = new KAction( displayName, collection );
 	action->setObjectName( internalName );
@@ -133,6 +132,8 @@
 	connect( action, SIGNAL(triggered()), m_keyboardMapper, SLOT(map()) );
 	m_keyboardMapper->setMapping( action, mapping );
 	collection->addAction( internalName, action );
+
+	return action;
 }
 
 
--- trunk/KDE/kdegames/killbots/mainwindow.h #890979:890980
@@ -21,6 +21,7 @@
 #ifndef KILLBOTS_MAINWINDOW_H
 #define KILLBOTS_MAINWINDOW_H
 
+class KAction;
 class KActionCollection;
 class KScoreDialog;
 #include <KDE/KXmlGuiWindow>
@@ -43,7 +44,7 @@
 
 	private: // functions
 		void setupActions();
-		void setupMappedAction( KActionCollection * collection, const QString & \
displayName, const QString & internalName, const QKeySequence & primaryShortcut, \
const QKeySequence & alternateShortcut, int mapping, const QString & icon = QString() \
); +		KAction * setupMappedAction( KActionCollection * collection, const QString & \
displayName, const QString & internalName, const QKeySequence & primaryShortcut, \
const QKeySequence & alternateShortcut, int mapping, const QString & icon = QString() \
);  void createScoreDialog();
 
 	private slots:
@@ -60,7 +61,7 @@
 		View * m_view;
 		KScoreDialog * m_scoreDialog;
 
-		QAction * m_safeTeleportAction;
+		KAction * m_safeTeleportAction;
 		KActionCollection * m_keyboardActions;
 		QSignalMapper * m_keyboardMapper;
 


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