Rename a number of libraries and executables to avoid conflicts with KDE4

src/ldapcontroller.cpp

@@ -35,7 +35,7 @@
 #include <klistview.h>
 #include <kopenwith.h>
 #include <kpropertiesdialog.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqdir.h>
 #include <tqheader.h>
 #include <kcombobox.h>
@@ -45,7 +45,7 @@
 #include <kprocess.h>
 #include <tdesu/process.h>
 #include <libtdeldap.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpassdlg.h>
 
 #include "sha1.h"

src/ldapcontroller.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell ldapcontroller
+Exec=tdecmshell ldapcontroller
 Icon=tdmconfig
 Type=Application
 

src/ldapcontroller.h

@@ -25,12 +25,12 @@
 #include <kaboutdata.h>
 #include <kpushbutton.h>
 #include <klistview.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqtimer.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 #include <libtdeldap.h>
 

src/primaryrealmwizard/primaryrealmwizard.cpp

@@ -40,7 +40,7 @@
 #include <klistview.h>
 #include <krun.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <klineedit.h>
 #include <ktextedit.h>

src/processingdialog.cpp

@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdialog.h>
 #include <klocale.h>

src/secondaryrealmwizard/secondaryrealmwizard.cpp

@@ -40,7 +40,7 @@
 #include <klistview.h>
 #include <krun.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <klineedit.h>
 #include <ktextedit.h>