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/konsole/; revision=721704

src/ColorScheme.cpp

@@ -31,6 +31,8 @@
 #include <KColorScheme>
 #include <KConfig>
 #include <KLocale>
+#include <KDebug>
+#include <KConfigGroup>
 #include <KStandardDirs>
 
 using namespace Konsole;

src/ColorSchemeEditor.cpp

@@ -29,6 +29,7 @@
 
 // KDE
 #include <KColorDialog>
+#include <KDebug>
 #include <KWindowSystem>
 
 // Konsole

src/KeyBindingEditor.cpp

@@ -24,6 +24,8 @@
 #include <QtGui/QHeaderView>
 #include <QtGui/QKeyEvent>
 
+#include <KDebug>
+
 // Konsole
 #include "ui_KeyBindingEditor.h"
 #include "KeyboardTranslator.h"

src/ManageProfilesDialog.cpp

@@ -30,6 +30,8 @@
 #include <QtGui/QShowEvent>
 #include <QtGui/QStandardItem>
 
+#include <KDebug>
+
 // Konsole
 #include "EditProfileDialog.h"
 #include "SessionManager.h"

src/Part.cpp

@@ -25,6 +25,7 @@
 
 // KDE
 #include <KMenuBar>
+#include <KDebug>
 #include <KXMLGUIFactory>
 
 // Konsole

src/Profile.cpp

@@ -33,6 +33,7 @@
 #include <KGlobal>
 #include <KGlobalSettings>
 #include <KLocale>
+#include <KDebug>
 #include <KStandardDirs>
 
 // Konsole

src/SessionController.h

@@ -26,6 +26,7 @@
 #include <QtCore/QPointer>
 #include <QtCore/QString>
 #include <QtCore/QThread>
+#include <QtCore/QHash>
 
 // KDE
 #include <KActionCollection>

src/SessionManager.cpp

@@ -35,6 +35,8 @@
 #include <krun.h>
 #include <kshell.h>
 #include <kconfig.h>
+#include <kdebug.h>
+#include <kconfiggroup.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 

src/TerminalDisplay.cpp

@@ -29,6 +29,7 @@
 #include <QtGui/QClipboard>
 #include <QtGui/QKeyEvent>
 #include <QtCore/QEvent>
+#include <QtCore/QTime>
 #include <QtCore/QFile>
 #include <QtGui/QGridLayout>
 #include <QtGui/QLabel>

src/ViewContainer.cpp

@@ -39,6 +39,8 @@
 #include <kcolorscheme.h>
 #include <kcolorutils.h>
 #include <KIconLoader>
+#include <kdebug.h>
+#include <kconfiggroup.h>
 #include <KLocale>
 #include <KMenu>
 #include <KColorCollection>

src/main.cpp

@@ -19,6 +19,7 @@
 
 // Own
 #include "Application.h"
+#include <KDebug>
 
 // X11
 #ifdef Q_WS_X11