SVN commit 648665 by dfaure:

perl $KDESRC/4/kdesdk/scripts/qt4/convert-kkeydialog.pl `wcgrep -r -l KKeyChooser` `wcgrep -r -l KKeyDialog`
And fixes for KFileDialog::setViewConfig API change


 M  +1 -1      kiconedit/kiconconfig.h  
 M  +2 -2      kiconedit/kiconeditslots.cpp  
 M  +3 -3      kolourpaint/mainwindow/kpmainwindow_settings.cpp  
 M  +3 -3      kpovmodeler/pmshell.cpp  
 M  +3 -3      kuickshow/src/filewidget.cpp  
 M  +3 -2      kuickshow/src/kuickconfigdlg.cpp  
 M  +3 -3      kuickshow/src/kuickconfigdlg.h  
 M  +2 -2      kuickshow/src/kuickshow.cpp  
 M  +2 -2      ligature/shell/ligature.cpp  


--- trunk/KDE/kdegraphics/kiconedit/kiconconfig.h #648664:648665
@@ -34,7 +34,7 @@
 #include "config.h"
 #endif
 
-class KKeyChooser;
+class KShortcutsEditor;
 class KColorButton;
 class KUrlRequester;
 class QComboBox;
--- trunk/KDE/kdegraphics/kiconedit/kiconeditslots.cpp #648664:648665
@@ -24,7 +24,7 @@
 #include <QDragEnterEvent>
 #include <QDropEvent>
 
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
@@ -323,7 +323,7 @@
 
 void KIconEdit::slotConfigureKeys()
 {
-    KKeyDialog::configure(actionCollection());
+    KShortcutsDialog::configure(actionCollection());
 
     KIconEdit *ki = 0L;
     for (ki = windowList.first(); ki; ki = windowList.next())
--- trunk/KDE/kdegraphics/kolourpaint/mainwindow/kpmainwindow_settings.cpp #648664:648665
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kglobal.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandardaction.h>
@@ -134,8 +134,8 @@
     kDebug () << "kpMainWindow::slotKeyBindings()" << endl;
 #endif
 
-    if (KKeyDialog::configure (actionCollection (),
-            KKeyChooser::LetterShortcutsAllowed,
+    if (KShortcutsDialog::configure (actionCollection (),
+            KShortcutsEditor::LetterShortcutsAllowed,
             this))
     {
     #if DEBUG_KP_MAIN_WINDOW
--- trunk/KDE/kdegraphics/kpovmodeler/pmshell.cpp #648664:648665
@@ -25,7 +25,7 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kmenu.h>
 #include <qtimer.h>
 //Added by qt3to4:
@@ -522,11 +522,11 @@
 
 void PMShell::slotConfigureKeys( )
 {
-   KKeyDialog kd;
+   KShortcutsDialog kd;
    kd.addCollection( m_pPart->actionCollection( ) );
    kd.addCollection( actionCollection( ) );
    kd.configure( true );
-   //KKeyDialog::configure( actionCollection( ) );
+   //KShortcutsDialog::configure( actionCollection( ) );
 }
 
 void PMShell::slotSettings( )
--- trunk/KDE/kdegraphics/kuickshow/src/filewidget.cpp #648664:648665
@@ -52,9 +52,9 @@
 {
     setEnableDirHighlighting( true );
 
-	KConfigGroup group(KGlobal::config(), "Filebrowser");
-    setViewConfig( &group );
-    readConfig( &group );
+    KConfigGroup group(KGlobal::config(), "Filebrowser");
+    setViewConfig( group );
+    readConfig( group );
     setView( KFile::Default );
 
     // setOnlyDoubleClickSelectsFiles( true );
--- trunk/KDE/kdegraphics/kuickshow/src/kuickconfigdlg.cpp #648664:648665
@@ -28,6 +28,7 @@
 
 #include <kconfig.h>
 #include <kglobal.h>
+#include <kshortcutsdialog.h>
 #include <klocale.h>
 
 #include "imagewindow.h"
@@ -66,11 +67,11 @@
     imageWindow = new ImageWindow(); // just to get the accel...
     imageWindow->hide();
 
-    imageKeyChooser = new KKeyChooser( imageWindow->actionCollection(), box );
+    imageKeyChooser = new KShortcutsEditor( imageWindow->actionCollection(), box );
 
     box = new KVBox();
     addPage( box, i18n("Bro&wser Shortcuts") );
-    browserKeyChooser = new KKeyChooser( coll, box );
+    browserKeyChooser = new KShortcutsEditor( coll, box );
 
     connect( this, SIGNAL( defaultClicked() ), SLOT( resetDefaults() ));
 }
--- trunk/KDE/kdegraphics/kuickshow/src/kuickconfigdlg.h #648664:648665
@@ -21,14 +21,14 @@
 
 #include <qevent.h>
 
-#include <kkeydialog.h>
-
 #include <kpagedialog.h>
 
 class GeneralWidget;
 class DefaultsWidget;
 class SlideShowWidget;
 class ImageWindow;
+class KShortcutsEditor;
+class KActionCollection;
 
 class KuickConfigDialog : public KPageDialog
 {
@@ -48,7 +48,7 @@
     DefaultsWidget   *defaultsWidget;
     GeneralWidget    *generalWidget;
     SlideShowWidget  *slideshowWidget;
-    KKeyChooser      *imageKeyChooser, *browserKeyChooser;
+    KShortcutsEditor      *imageKeyChooser, *browserKeyChooser;
     KActionCollection *coll;
 
     ImageWindow      *imageWindow;
--- trunk/KDE/kdegraphics/kuickshow/src/kuickshow.cpp #648664:648665
@@ -1064,9 +1064,9 @@
         kc->writeEntry( "OpenImagesInActiveWindow", oneWindowAction->isChecked() );
 
     if ( fileWidget ) {
-		KConfigGroup group( kc, "Filebrowser" );
+        KConfigGroup group( kc, "Filebrowser" );
         kc->writePathEntry( "CurrentDirectory", fileWidget->url().url() );
-        fileWidget->writeConfig( &group);
+        fileWidget->writeConfig( group);
     }
 
     kc->sync();
--- trunk/KDE/kdegraphics/ligature/shell/ligature.cpp #648664:648665
@@ -22,7 +22,7 @@
 #include <kconfig.h>
 #include <kedittoolbar.h>
 #include <kglobal.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <kicon.h>
 #include <klibloader.h>
 #include <klocale.h>
@@ -416,7 +416,7 @@
 #warning FIXME shortcut configuration
 #endif
   /*
-  KKeyDialog dlg( true, this );
+  KShortcutsDialog dlg( true, this );
 
   dlg.insert( actionCollection() );
   dlg.insert( view->actionCollection() );