SVN commit 648666 by dfaure:

KKeyDialog api changes; there's still a kkeybutton in there though.


 M  +3 -3      akregator/src/mainwindow.cpp  
 M  +2 -2      kaddressbook/kaddressbookmain.cpp  
 M  +2 -2      kalarm/mainwindow.cpp  
 M  +2 -2      kleopatra/certmanager.cpp  
 M  +2 -2      kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp  
 M  +3 -3      kmail/kmcomposewin.cpp  
 M  +3 -3      kmail/kmmainwidget.cpp  
 M  +2 -2      knode/kncomposer.cpp  
 M  +2 -2      knode/knode.cpp  
 M  +3 -3      knotes/knotesapp.cpp  
 M  +2 -2      kontact/src/mainwindow.cpp  
 M  +3 -3      korganizer/actionmanager.cpp  
 M  +3 -3      korganizer/korganizer.cpp  
 M  +2 -2      ktimetracker/mainwindow.cpp  
 M  +2 -2      ktnef/ktnefmain.cpp  


--- trunk/KDE/kdepim/akregator/src/mainwindow.cpp #648665:648666
@@ -36,7 +36,7 @@
 #include <kedittoolbar.h>
 #include <kfiledialog.h>
 #include <kglobal.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -190,8 +190,8 @@
 
 void MainWindow::optionsConfigureKeys()
 {
-    KKeyDialog dlg( KKeyChooser::AllActions,
-      KKeyChooser::LetterShortcutsDisallowed, this );
+    KShortcutsDialog dlg( KShortcutsEditor::AllActions,
+      KShortcutsEditor::LetterShortcutsDisallowed, this );
 
     dlg.addCollection(actionCollection());
     if (m_part)
--- trunk/KDE/kdepim/kaddressbook/kaddressbookmain.cpp #648665:648666
@@ -22,7 +22,7 @@
 */
 
 #include <kedittoolbar.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -154,7 +154,7 @@
 
 void KAddressBookMain::configureKeyBindings()
 {
-  KKeyDialog::configure( actionCollection(), KKeyChooser::LetterShortcutsAllowed, this );
+  KShortcutsDialog::configure( actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this );
 }
 
 void KAddressBookMain::configureToolbars()
--- trunk/KDE/kdepim/kalarm/mainwindow.cpp #648665:648666
@@ -42,7 +42,7 @@
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kconfiggroup.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kedittoolbar.h>
 #include <kxmlguifactory.h>
 #include <kaboutdata.h>
@@ -1077,7 +1077,7 @@
 */
 void MainWindow::slotConfigureKeys()
 {
-	KKeyDialog::configure(actionCollection(), KKeyChooser::LetterShortcutsAllowed, this);
+	KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this);
 }
 
 /******************************************************************************
--- trunk/KDE/kdepim/kleopatra/certmanager.cpp #648665:648666
@@ -78,7 +78,7 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <ktemporaryfile.h>
 #include <kio/job.h>
 #include <kio/jobuidelegate.h>
@@ -404,7 +404,7 @@
 }
 
 void CertManager::slotEditKeybindings() {
-  KKeyDialog::configure( actionCollection(), KKeyChooser::LetterShortcutsAllowed );
+  KShortcutsDialog::configure( actionCollection(), KShortcutsEditor::LetterShortcutsAllowed );
 }
 
 void CertManager::slotShowConfigurationDialog() {
--- trunk/KDE/kdepim/kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp #648665:648666
@@ -48,7 +48,7 @@
 #include <kconfig.h>
 #include <kfiledialog.h>
 #include <kedittoolbar.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 
 #include <QTextEdit>
 #include <QDir>
@@ -123,7 +123,7 @@
 
 void KWatchGnuPGMainWindow::configureShortcuts()
 {
-  KKeyDialog::configure( actionCollection(), KKeyChooser::LetterShortcutsAllowed, this );
+  KShortcutsDialog::configure( actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this );
 }
 
 void KWatchGnuPGMainWindow::slotConfigureToolbars()
--- trunk/KDE/kdepim/kmail/kmcomposewin.cpp #648665:648666
@@ -86,7 +86,7 @@
 #include <kmenu.h>
 #include <kmimetypetrader.h>
 #include <kedittoolbar.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
 #include <ktoolbar.h>
@@ -4572,8 +4572,8 @@
 
 void KMComposeWin::slotEditKeys()
 {
-  KKeyDialog::configure( actionCollection(),
-    KKeyChooser::LetterShortcutsDisallowed );
+  KShortcutsDialog::configure( actionCollection(),
+    KShortcutsEditor::LetterShortcutsDisallowed );
 }
 
 void KMComposeWin::setReplyFocus( bool hasMessage )
--- trunk/KDE/kdepim/kmail/kmmainwidget.cpp #648665:648666
@@ -35,7 +35,7 @@
 #include <kacceleratormanager.h>
 #include <kglobalsettings.h>
 #include <kstandardshortcut.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
@@ -3305,8 +3305,8 @@
 
 void KMMainWidget::slotEditKeys()
 {
-  KKeyDialog::configure( actionCollection(),
-    KKeyChooser::LetterShortcutsAllowed );
+  KShortcutsDialog::configure( actionCollection(),
+    KShortcutsEditor::LetterShortcutsAllowed );
 }
 
 //-----------------------------------------------------------------------------
--- trunk/KDE/kdepim/knode/kncomposer.cpp #648665:648666
@@ -40,7 +40,7 @@
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kstandardaction.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kedittoolbar.h>
 #include <kmenu.h>
 #include <kfiledialog.h>
@@ -1428,7 +1428,7 @@
 
 void KNComposer::slotConfKeys()
 {
-  KKeyDialog::configure(actionCollection(), KKeyChooser::LetterShortcutsAllowed, this, true);
+  KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this, true);
 }
 
 
--- trunk/KDE/kdepim/knode/knode.cpp #648665:648666
@@ -16,7 +16,7 @@
 
 #include <QApplication>
 
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kedittoolbar.h>
 #include <kstandardaction.h>
 #include <kdebug.h>
@@ -88,7 +88,7 @@
 
 void KNMainWindow::slotConfKeys()
 {
-  KKeyDialog::configure(actionCollection(), KKeyChooser::LetterShortcutsAllowed);
+  KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed);
 }
 
 bool KNMainWindow::queryClose()
--- trunk/KDE/kdepim/knotes/knotesapp.cpp #648665:648666
@@ -40,7 +40,7 @@
 #include <khelpmenu.h>
 #include <kfind.h>
 #include <kfinddialog.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kglobalaccel.h>
 #include <kconfig.h>
 #include <kwin.h>
@@ -78,7 +78,7 @@
 #ifdef __GNUC__
 #warning Port me!
 #endif
-//        m_keyChooser = new KKeyChooser( globals, this );
+        //m_keyChooser = new KShortcutsEditor( globals, this );
         setMainWidget( m_keyChooser );
         connect( this, SIGNAL(defaultClicked()), m_keyChooser, SLOT(allDefault()) );
     }
@@ -95,7 +95,7 @@
     }
 
 private:
-    KKeyChooser *m_keyChooser;
+    KShortcutsEditor *m_keyChooser;
 };
 
 
--- trunk/KDE/kdepim/kontact/src/mainwindow.cpp #648665:648666
@@ -38,7 +38,7 @@
 #include <kguiitem.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klibloader.h>
 #include <ktoolbar.h>
 #include <klocale.h>
@@ -779,7 +779,7 @@
 
 void MainWindow::configureShortcuts()
 {
-  KKeyDialog dialog( KKeyChooser::AllActions ,KKeyChooser::LetterShortcutsAllowed, this );
+  KShortcutsDialog dialog( KShortcutsEditor::AllActions ,KShortcutsEditor::LetterShortcutsAllowed, this );
   dialog.addCollection( actionCollection() );
 
   if ( mCurrentPlugin && mCurrentPlugin->part() )
--- trunk/KDE/kdepim/korganizer/actionmanager.cpp #648665:648666
@@ -55,7 +55,7 @@
 #include <kactioncollection.h>
 #include <kfiledialog.h>
 #include <kio/netaccess.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kmenu.h>
 #include <kstandarddirs.h>
 #include <ktip.h>
@@ -1487,8 +1487,8 @@
 
 void ActionManager::keyBindings()
 {
-  KKeyDialog dlg( KKeyChooser::AllActions,
-    KKeyChooser::LetterShortcutsDisallowed, view() );
+  KShortcutsDialog dlg( KShortcutsEditor::AllActions,
+    KShortcutsEditor::LetterShortcutsDisallowed, view() );
   if ( mMainWindow )
     dlg.addCollection( mMainWindow->getActionCollection() );
 
--- trunk/KDE/kdepim/korganizer/korganizer.cpp #648665:648666
@@ -71,7 +71,7 @@
 #include <ktip.h>
 #include <KStandardGuiItem>
 #include <kstatusbar.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <QCursor>
 #include <QTimer>
 #include <q3vbox.h>
@@ -216,8 +216,8 @@
 
 void KOrganizer::slotEditKeys()
 {
-  KKeyDialog::configure( actionCollection(),
-    KKeyChooser::LetterShortcutsDisallowed );
+  KShortcutsDialog::configure( actionCollection(),
+    KShortcutsEditor::LetterShortcutsDisallowed );
 }
 
 bool KOrganizer::queryClose()
--- trunk/KDE/kdepim/ktimetracker/mainwindow.cpp #648665:648666
@@ -12,7 +12,7 @@
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klocale.h>            // i18n
 #include <kmessagebox.h>
 #include <kstatusbar.h>         // statusBar()
@@ -237,7 +237,7 @@
 
 void MainWindow::keyBindings()
 {
-  KKeyDialog::configure( actionCollection(), KKeyChooser::LetterShortcutsAllowed, this );
+  KShortcutsDialog::configure( actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this );
 }
 
 void MainWindow::startNewSession()
--- trunk/KDE/kdepim/ktnef/ktnefmain.cpp #648665:648666
@@ -48,7 +48,7 @@
 #include <kstandardaction.h>
 #include <kdialog.h>
 #include <ktemporaryfile.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 
 #ifdef KDE_NO_COMPAT
 #undef KDE_NO_COMPAT
@@ -142,7 +142,7 @@
 
 void KTNEFMain::slotConfigureKeys()
 {
-  KKeyDialog::configure( actionCollection(), KKeyChooser::LetterShortcutsAllowed, this );
+  KShortcutsDialog::configure( actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this );
 }