From kde-commits  Sat Mar 31 23:26:00 2007
From: David Faure <faure () kde ! org>
Date: Sat, 31 Mar 2007 23:26:00 +0000
To: kde-commits
Subject: KDE/kdegames
Message-Id: <1175383560.812445.32201.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117538342917176

SVN commit 648667 by dfaure:

perl $KDESRC/4/kdesdk/scripts/qt4/convert-kkeydialog.pl `wcgrep -r -l KKeyChooser` `wcgrep -r -l KKeyDialog`


 M  +2 -2      kasteroids/toplevel.cpp  
 M  +2 -2      kgoldrunner/src/kgoldrunner.cpp  
 M  +2 -2      kmines/main.cpp  
 M  +2 -2      kshisen/app.cpp  
 M  +2 -2      kspaceduel/topwidget.cpp  
 M  +2 -2      libksirtet/base/main.cpp  
 M  +2 -2      libksirtet/base/main.h  
 M  +2 -2      libksirtet/common/mainwindow.cpp  
 M  +1 -1      libksirtet/common/mainwindow.h  
 M  +1 -1      libksirtet/lib/TODO  
 M  +2 -2      libksirtet/lib/keys.cpp  
 M  +1 -1      libksirtet/lib/keys.h  
 M  +2 -2      libksirtet/lib/mp_interface.cpp  
 M  +2 -2      libksirtet/lib/mp_interface.h  
 M  +1 -1      libksirtet/lib/mp_simple_interface.cpp  
 M  +1 -1      libksirtet/lib/mp_simple_interface.h  


--- trunk/KDE/kdegames/kasteroids/toplevel.cpp #648666:648667
@@ -23,7 +23,7 @@
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kstandardgameaction.h>
@@ -600,7 +600,7 @@
 
 void KAstTopLevel::slotKeyConfig()
 {
-    KKeyDialog::configure( actionCollection(), KKeyChooser::LetterShortcutsAllowed, this );
+    KShortcutsDialog::configure( actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this );
     if ( waitShip ) view->showText( i18n( "Press %1 to launch." ,
                      launchAction->shortcuts()[0].toString()),
                     Qt::yellow, false );
--- trunk/KDE/kdegames/kgoldrunner/src/kgoldrunner.cpp #648666:648667
@@ -23,7 +23,7 @@
 
 #include <kglobal.h>
 #include <kstatusbar.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 
 #include <kconfig.h>
 #include <kconfiggroup.h>
@@ -884,7 +884,7 @@
 
 void KGoldrunner::optionsConfigureKeys()
 {
-    KKeyDialog::configure(actionCollection());
+    KShortcutsDialog::configure(actionCollection());
 
     // Update the PAUSE/RESUME message in the status bar.
     pauseKeys = myPause->shortcut().toString();
--- trunk/KDE/kdegames/kmines/main.cpp #648666:648667
@@ -27,7 +27,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kstandardaction.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kstandardgameaction.h>
 #include <kaction.h>
 #include <kactioncollection.h>
@@ -207,7 +207,7 @@
 
 void MainWidget::configureKeys()
 {
-    KKeyDialog d(KKeyChooser::AllActions, KKeyChooser::LetterShortcutsAllowed, this);
+    KShortcutsDialog d(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this);
     d.addCollection(_keybCollection, i18n("Keyboard game"));
     d.addCollection(actionCollection(), i18n("General"));
     d.configure();
--- trunk/KDE/kdegames/kshisen/app.cpp #648666:648667
@@ -47,7 +47,7 @@
 #include <kstandardgameaction.h>
 #include <khighscore.h>
 #include <kdebug.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kmenu.h>
 #include <kstatusbar.h>
 #include <klocale.h>
@@ -719,7 +719,7 @@
 
 void App::keyBindings()
 {
-	KKeyDialog::configure( actionCollection(), KKeyChooser::LetterShortcutsAllowed, this );
+	KShortcutsDialog::configure( actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this );
 
 }
 
--- trunk/KDE/kdegames/kspaceduel/topwidget.cpp #648666:648667
@@ -18,7 +18,7 @@
 #include <QLayout>
 
 #include <kicon.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klocale.h>
 #include <kstandardaction.h>
 #include <kstandardgameaction.h>
@@ -178,7 +178,7 @@
 void MyTopLevelWidget::keySetup()
 {
    playfield->pause();
-   KKeyDialog::configure( actionCollection( ), KKeyChooser::LetterShortcutsAllowed, this, true );
+   KShortcutsDialog::configure( actionCollection( ), KShortcutsEditor::LetterShortcutsAllowed, this, true );
 }
 
 #include "topwidget.moc"
--- trunk/KDE/kdegames/libksirtet/base/main.cpp #648666:648667
@@ -9,7 +9,7 @@
 #include <kstandardgameaction.h>
 #include <kactioncollection.h>
 #include <ktoggleaction.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klocale.h>
 #include <knotifyconfigwidget.h>
 #include <kexthighscore.h>
@@ -95,7 +95,7 @@
 
 void BaseMainWindow::configureKeys()
 {
-    KKeyDialog d(KKeyChooser::AllActions, KKeyChooser::LetterShortcutsAllowed, this);
+    KShortcutsDialog d(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this);
     addKeys(d);
     d.addCollection(actionCollection());
     d.configure(false);
--- trunk/KDE/kdegames/libksirtet/base/main.h #648666:648667
@@ -7,7 +7,7 @@
 
 class BaseInterface;
 class KToggleAction;
-class KKeyDialog;
+class KShortcutsDialog;
 class KConfigDialog;
 
 class KSIRTETLIB_EXPORT BaseMainWindow : public KZoomMainWindow
@@ -34,7 +34,7 @@
 
     void buildGUI(QWidget *widget);
     virtual void addConfig(KConfigDialog *) {}
-    virtual void addKeys(KKeyDialog &) {}
+    virtual void addKeys(KShortcutsDialog &) {}
     virtual void saveKeys() {}
     
     virtual void writeZoomSetting(uint zoom);
--- trunk/KDE/kdegames/libksirtet/common/mainwindow.cpp #648666:648667
@@ -5,7 +5,7 @@
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kstandardaction.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kconfigdialog.h>
 
 #include "inter.h"
@@ -50,7 +50,7 @@
             inter, SLOT(settingsChangedSlot()));
 }
 
-void MainWindow::addKeys(KKeyDialog &d)
+void MainWindow::addKeys(KShortcutsDialog &d)
 {
     static_cast<Interface *>(_inter)->addKeys(d);
 }
--- trunk/KDE/kdegames/libksirtet/common/mainwindow.h #648666:648667
@@ -15,7 +15,7 @@
 protected:
     void init();
     void addConfig(KConfigDialog *);
-    void addKeys(KKeyDialog &);
+    void addKeys(KShortcutsDialog &);
     void saveKeys();
     virtual void focusInEvent(QFocusEvent *e);
 };
--- trunk/KDE/kdegames/libksirtet/lib/TODO #648666:648667
@@ -14,5 +14,5 @@
 * test option widget in netmeeting (--> needs fixing in NetMeeting class)
 * test of options for players and computers
 
-* keys configuration : probably need to change KKeyDialog (the msgbox for
+* keys configuration : probably need to change KShortcutsDialog (the msgbox for
   duplicate keys is so annoying ...) + unused key finder
--- trunk/KDE/kdegames/libksirtet/lib/keys.cpp #648666:648667
@@ -3,7 +3,7 @@
 
 //Added by qt3to4:
 #include <kconfig.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klocale.h>
 #include <kactioncollection.h>
 
@@ -82,7 +82,7 @@
     }
 }
 
-void KeyData::addKeys(KKeyDialog &d)
+void KeyData::addKeys(KShortcutsDialog &d)
 {
     for (int i=0; i<_cols.size(); i++)
         d.addCollection(_cols[i], i18n("Shortcuts for player #%1/%2", i+1,
--- trunk/KDE/kdegames/libksirtet/lib/keys.h #648666:648667
@@ -24,7 +24,7 @@
     void clear();
     void createActionCollection(int index, QWidget *receiver);
     void setEnabled(uint index, bool enabled);
-    void addKeys(KKeyDialog &);
+    void addKeys(KShortcutsDialog &);
     void save();
 
     void keyEvent(QKeyEvent *e, bool pressed);
--- trunk/KDE/kdegames/libksirtet/lib/mp_interface.cpp #648666:648667
@@ -8,7 +8,7 @@
 
 #include <klocale.h>
 #include <kapplication.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kglobal.h>
 #include <kconfiggroup.h>
 
@@ -188,7 +188,7 @@
     _keyData->setKeycodes(nb, i, def);
 }
 
-void MPInterface::addKeys(KKeyDialog &d)
+void MPInterface::addKeys(KShortcutsDialog &d)
 {
     _keyData->addKeys(d);
 }
--- trunk/KDE/kdegames/libksirtet/lib/mp_interface.h #648666:648667
@@ -15,7 +15,7 @@
 class RemoteHostData;
 class KeyData;
 class KeyCollection;
-class KKeyDialog;
+class KShortcutsDialog;
 class KAction;
 
 struct ActionData {
@@ -102,7 +102,7 @@
 	void dialog();
 
  public:
-    virtual void addKeys(KKeyDialog &);
+    virtual void addKeys(KShortcutsDialog &);
     void saveKeys();
 
 	/** Called when a new game is created. At this point
--- trunk/KDE/kdegames/libksirtet/lib/mp_simple_interface.cpp #648666:648667
@@ -43,7 +43,7 @@
 	immediateWrite();
 }
 
-void MPSimpleInterface::addKeys(KKeyDialog &d)
+void MPSimpleInterface::addKeys(KShortcutsDialog &d)
 {
     if ( !isPaused() ) pause();
     MPInterface::addKeys(d);
--- trunk/KDE/kdegames/libksirtet/lib/mp_simple_interface.h #648666:648667
@@ -19,7 +19,7 @@
  public slots:
 	void start();
 	void pause();
-	void addKeys(KKeyDialog &);
+	void addKeys(KShortcutsDialog &);
 
  protected:
 	virtual void _init() = 0;