From kde-commits  Sat Mar 31 22:36:28 2007
From: David Faure <faure () kde ! org>
Date: Sat, 31 Mar 2007 22:36:28 +0000
To: kde-commits
Subject: KDE/kdemultimedia
Message-Id: <1175380588.964668.27294.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117538047515456

SVN commit 648654 by dfaure:

Ported to KShortcutsDialog
Next failure is again some fileplugin stuff :(


 M  +1 -1      juk/keydialog.cpp  
 M  +2 -2      juk/keydialog.h  
 M  +2 -2      kscd/kscd.cpp  


--- trunk/KDE/kdemultimedia/juk/keydialog.cpp #648653:648654
@@ -127,7 +127,7 @@
     m_actionCollection = actionCollection;
 
     // Create key chooser and show it in the widget stack
-    m_pKeyChooser = new KKeyChooser(actionCollection, this);
+    m_pKeyChooser = new KShortcutsEditor(actionCollection, this);
     m_widgetStack->addWidget(m_pKeyChooser);
     m_widgetStack->raiseWidget(m_pKeyChooser);
 
--- trunk/KDE/kdemultimedia/juk/keydialog.h #648653:648654
@@ -18,7 +18,7 @@
 
 #include <kdeversion.h>
 #include <kglobalaccel.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kshortcut.h>
 
 #include <qbuttongroup.h>
@@ -72,7 +72,7 @@
 
 private:
     KActionCollection *m_actionCollection;
-    KKeyChooser       *m_pKeyChooser;
+    KShortcutsEditor       *m_pKeyChooser;
     QButtonGroup      *m_group;
     Q3WidgetStack     *m_widgetStack;
 
--- trunk/KDE/kdemultimedia/kscd/kscd.cpp #648653:648654
@@ -50,7 +50,7 @@
 #include <kemailsettings.h>
 #include <kglobal.h>
 #include <khelpmenu.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <klocale.h>
@@ -819,7 +819,7 @@
 
 void KSCD::configureKeys()
 {
-    KKeyDialog::configure(m_actions, KKeyChooser::LetterShortcutsAllowed, this);
+    KShortcutsDialog::configure(m_actions, KShortcutsEditor::LetterShortcutsAllowed, this);
 }
 
 void KSCD::setDevicePaths()