SVN commit 648660 by dfaure:

compile


 M  +2 -2      cervisia/cervisiashell.cpp  
 M  +0 -1      kate/app/kateconfigdialog.cpp  
 M  +2 -2      kate/app/katemainwindow.cpp  
 M  +3 -6      kate/plugins/filebrowser/katefileselector.cpp  


--- trunk/KDE/kdesdk/cervisia/cervisiashell.cpp #648659:648660
@@ -25,7 +25,7 @@
 #include <kconfig.h>
 #include <kedittoolbar.h>
 #include <khelpmenu.h>
-#include <kkeydialog.h>
+#include <kshortcutsdialog.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -141,7 +141,7 @@
 
 void CervisiaShell::slotConfigureKeys()
 {
-    KKeyDialog dlg;
+    KShortcutsDialog dlg;
     dlg.addCollection(actionCollection());
     if( m_part )
         dlg.addCollection(m_part->actionCollection());
--- trunk/KDE/kdesdk/kate/app/kateconfigdialog.cpp #648659:648660
@@ -37,7 +37,6 @@
 #include <KGlobal>
 #include <KGlobalSettings>
 #include <KIconLoader>
-#include <KKeyDialog>
 #include <KListWidget>
 #include <KLocale>
 #include <KConfig>
--- trunk/KDE/kdesdk/kate/app/katemainwindow.cpp #648659:648660
@@ -53,7 +53,7 @@
 #include <KGlobal>
 #include <KGlobalSettings>
 #include <KIconLoader>
-#include <KKeyDialog>
+#include <KShortcutsDialog>
 #include <KLocale>
 #include <KMessageBox>
 #include <KMimeType>
@@ -650,7 +650,7 @@
 
 void KateMainWindow::editKeys()
 {
-  KKeyDialog dlg ( KKeyChooser::AllActions, KKeyChooser::LetterShortcutsDisallowed, this );
+  KShortcutsDialog dlg ( KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsDisallowed, this );
 
   QList<KXMLGUIClient*> clients = guiFactory()->clients();
 
--- trunk/KDE/kdesdk/kate/plugins/filebrowser/katefileselector.cpp #648659:648660
@@ -291,14 +291,11 @@
 void ::KateFileSelector::readConfig(KConfig *config, const QString & name)
 {
   kDebug() << "===================================================================::KateFileSelector::readConfig" << endl;
-#ifdef __GNUC__
-#warning THIS WILL CRASH - setViewConfig keeps the pointer to the KConfigGroup! That API needs to be revised.
-#endif
   KConfigGroup cgView(config, name + ":view");
-  dir->setViewConfig(&cgView );
+  dir->setViewConfig(cgView );
 
   KConfigGroup cgDir(config, name + ":dir");
-  dir->readConfig(&cgDir);
+  dir->readConfig(cgDir);
 
   dir->setView( KFile::Default );
   dir->view()->setSelectionMode(KFile::Extended);
@@ -366,7 +363,7 @@
 void ::KateFileSelector::writeConfig(KConfig *config, const QString & name)
 {
   KConfigGroup cgDir(config, name + ":dir");
-  dir->writeConfig(&cgDir);
+  dir->writeConfig(cgDir);
 
   KConfigGroup cg = KConfigGroup( config, name );