Merge the KConfig branch. This are the 3 main modules (+kdeadmin), which are

needed now because friday is the last BC day. The rest of the modules will
follow as fast as my laptop allows.

svn path=/trunk/KDE/kdebase/apps/; revision=721704

diff --git a/src/dolphinapplication.h b/src/dolphinapplication.h
index 982873e28c247884efbbfa3f75b4897825ebe765..8b19e6ef2487fe1df7957840b86817fb90783117 100644 (file)
--- a/src/dolphinapplication.h
+++ b/src/dolphinapplication.h
@@ -23,6 +23,7 @@
 #define _DOLPHIN_APPLICATION_H
 
 #include <kuniqueapplication.h>
+#include <kurl.h>
 
 class DolphinMainWindow;
 class KUrl;

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 45ac393a7c492ce0153fcc71928bccba7e10e68e..89e78b9e1e19ad756739117cea7fa81622831533 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -58,7 +58,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-    saveDialogSize(dialogConfig, KConfigFlags::Persistent);
+    saveDialogSize(dialogConfig);
 }
 
 void DolphinSettingsDialog::slotButtonClicked(int button)

diff --git a/src/main.cpp b/src/main.cpp
index dfe291015ec5188ae31a548d75fca66112e8b0f2..ebbc9a55249b3c0776ce1d7d1d7be74de199bc14 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kmainwindow.h>
+#include <kdebug.h>
 
 int main(int argc, char **argv)
 {

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index a42aaf864c29eb8b13a10e89c7782006f2b00a4b..4dbf16eaa6e272f8fcced52480c81a85dbded61d 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -231,7 +231,7 @@ ViewPropertiesDialog::~ViewPropertiesDialog()
 
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                               "ViewPropertiesDialog");
-    saveDialogSize(dialogConfig, KConfigFlags::Persistent);
+    saveDialogSize(dialogConfig, KConfigBase::Persistent);
 }
 
 void ViewPropertiesDialog::slotOk()