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

30 files changed, 32 insertions, 32 deletions

diff --git a/ksystemlog/src/acpid/acpidOptions.cpp b/ksystemlog/src/acpid/acpidOptions.cpp
index cf97bfb..0fc7996 100644
--- a/ksystemlog/src/acpid/acpidOptions.cpp
+++ b/ksystemlog/src/acpid/acpidOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/acpid/acpidOptions.h b/ksystemlog/src/acpid/acpidOptions.h
index 44267eb..7047b2b 100644
--- a/ksystemlog/src/acpid/acpidOptions.h
+++ b/ksystemlog/src/acpid/acpidOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/apache/apacheOptions.cpp b/ksystemlog/src/apache/apacheOptions.cpp
index 9705b19..dda4969 100644
--- a/ksystemlog/src/apache/apacheOptions.cpp
+++ b/ksystemlog/src/apache/apacheOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/apache/apacheOptions.h b/ksystemlog/src/apache/apacheOptions.h
index 2ae9e37..b79131e 100644
--- a/ksystemlog/src/apache/apacheOptions.h
+++ b/ksystemlog/src/apache/apacheOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp b/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
index 7ef49a4..9779584 100644
--- a/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
+++ b/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
@@ -29,7 +29,7 @@
 #include <tqtooltip.h>
 
 //KDE includes
-#include <kfile.h>
+#include <tdefile.h>
 #include <klocale.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/bootauth/bootAuthenticationOptions.h b/ksystemlog/src/bootauth/bootAuthenticationOptions.h
index f660c79..b3c5402 100644
--- a/ksystemlog/src/bootauth/bootAuthenticationOptions.h
+++ b/ksystemlog/src/bootauth/bootAuthenticationOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 #include <tqbuttongroup.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
  
 #include <kurlrequester.h>
diff --git a/ksystemlog/src/cron/cronOptions.cpp b/ksystemlog/src/cron/cronOptions.cpp
index 68ef2e5..a5571ee 100644
--- a/ksystemlog/src/cron/cronOptions.cpp
+++ b/ksystemlog/src/cron/cronOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/cron/cronOptions.h b/ksystemlog/src/cron/cronOptions.h
index 206800b..7622f8f 100644
--- a/ksystemlog/src/cron/cronOptions.h
+++ b/ksystemlog/src/cron/cronOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/cups/cupsOptions.cpp b/ksystemlog/src/cups/cupsOptions.cpp
index 786011c..5ff562b 100644
--- a/ksystemlog/src/cups/cupsOptions.cpp
+++ b/ksystemlog/src/cups/cupsOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/cups/cupsOptions.h b/ksystemlog/src/cups/cupsOptions.h
index a7e56c5..2caa523 100644
--- a/ksystemlog/src/cups/cupsOptions.h
+++ b/ksystemlog/src/cups/cupsOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/daemon/daemonOptions.cpp b/ksystemlog/src/daemon/daemonOptions.cpp
index 0c5864f..09d4bc9 100644
--- a/ksystemlog/src/daemon/daemonOptions.cpp
+++ b/ksystemlog/src/daemon/daemonOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/daemon/daemonOptions.h b/ksystemlog/src/daemon/daemonOptions.h
index ed99981..6b88537 100644
--- a/ksystemlog/src/daemon/daemonOptions.h
+++ b/ksystemlog/src/daemon/daemonOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/fileList.cpp b/ksystemlog/src/fileList.cpp
index 6caa8d8..9f5e650 100644
--- a/ksystemlog/src/fileList.cpp
+++ b/ksystemlog/src/fileList.cpp
@@ -35,7 +35,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/generalOptions.h b/ksystemlog/src/generalOptions.h
index 0df1752..c1fd068 100644
--- a/ksystemlog/src/generalOptions.h
+++ b/ksystemlog/src/generalOptions.h
@@ -26,7 +26,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 
 #include "globals.h"
diff --git a/ksystemlog/src/kernel/kernelOptions.cpp b/ksystemlog/src/kernel/kernelOptions.cpp
index f1afa4d..c9286db 100644
--- a/ksystemlog/src/kernel/kernelOptions.cpp
+++ b/ksystemlog/src/kernel/kernelOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/kernel/kernelOptions.h b/ksystemlog/src/kernel/kernelOptions.h
index 72f9b61..b49db5f 100644
--- a/ksystemlog/src/kernel/kernelOptions.h
+++ b/ksystemlog/src/kernel/kernelOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/ksystemlog.cpp b/ksystemlog/src/ksystemlog.cpp
index 83bbeb1..9289edb 100644
--- a/ksystemlog/src/ksystemlog.cpp
+++ b/ksystemlog/src/ksystemlog.cpp
@@ -47,11 +47,11 @@
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kaccel.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 //For compatibility with old versions of KDE
 #include <tdeversion.h>
diff --git a/ksystemlog/src/ksystemlog.h b/ksystemlog/src/ksystemlog.h
index fda49de..224872f 100644
--- a/ksystemlog/src/ksystemlog.h
+++ b/ksystemlog/src/ksystemlog.h
@@ -34,7 +34,7 @@
 //KDE includes
 #include <kapplication.h>
 #include <kmainwindow.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktabwidget.h>
 #include <kactionclasses.h>
 #include <kpopupmenu.h>
diff --git a/ksystemlog/src/logManager.cpp b/ksystemlog/src/logManager.cpp
index e28e358..3ef2902 100644
--- a/ksystemlog/src/logManager.cpp
+++ b/ksystemlog/src/logManager.cpp
@@ -27,10 +27,10 @@
 #include <klocale.h>
 #include <kapplication.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kfilterdev.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 //Project includes
diff --git a/ksystemlog/src/mail/mailOptions.cpp b/ksystemlog/src/mail/mailOptions.cpp
index 0a8119a..46b3456 100644
--- a/ksystemlog/src/mail/mailOptions.cpp
+++ b/ksystemlog/src/mail/mailOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/mail/mailOptions.h b/ksystemlog/src/mail/mailOptions.h
index 818a93d..75dcdf5 100644
--- a/ksystemlog/src/mail/mailOptions.h
+++ b/ksystemlog/src/mail/mailOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/options.h b/ksystemlog/src/options.h
index 59ed781..c94a432 100644
--- a/ksystemlog/src/options.h
+++ b/ksystemlog/src/options.h
@@ -25,7 +25,7 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 
 
diff --git a/ksystemlog/src/samba/sambaOptions.cpp b/ksystemlog/src/samba/sambaOptions.cpp
index aa78c59..1c22ed5 100644
--- a/ksystemlog/src/samba/sambaOptions.cpp
+++ b/ksystemlog/src/samba/sambaOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/samba/sambaOptions.h b/ksystemlog/src/samba/sambaOptions.h
index 8fb10b7..0daa09e 100644
--- a/ksystemlog/src/samba/sambaOptions.h
+++ b/ksystemlog/src/samba/sambaOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/specificFileList.cpp b/ksystemlog/src/specificFileList.cpp
index 92ffb35..000118b 100644
--- a/ksystemlog/src/specificFileList.cpp
+++ b/ksystemlog/src/specificFileList.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/system/systemOptions.cpp b/ksystemlog/src/system/systemOptions.cpp
index 6c04af2..ded47fb 100644
--- a/ksystemlog/src/system/systemOptions.cpp
+++ b/ksystemlog/src/system/systemOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/system/systemOptions.h b/ksystemlog/src/system/systemOptions.h
index 05e3b49..8951285 100644
--- a/ksystemlog/src/system/systemOptions.h
+++ b/ksystemlog/src/system/systemOptions.h
@@ -26,7 +26,7 @@
 
 #include <tqcheckbox.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
diff --git a/ksystemlog/src/view.h b/ksystemlog/src/view.h
index 50cd8af..d88ca85 100644
--- a/ksystemlog/src/view.h
+++ b/ksystemlog/src/view.h
@@ -39,7 +39,7 @@
 #include "logLineFilter.h"
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <ksystemlogiface.h>
 #include <tdeparts/part.h>
diff --git a/ksystemlog/src/xorg/xorgOptions.cpp b/ksystemlog/src/xorg/xorgOptions.cpp
index 182997d..49818c9 100644
--- a/ksystemlog/src/xorg/xorgOptions.cpp
+++ b/ksystemlog/src/xorg/xorgOptions.cpp
@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/ksystemlog/src/xorg/xorgOptions.h b/ksystemlog/src/xorg/xorgOptions.h
index 057bc72..fa7dbca 100644
--- a/ksystemlog/src/xorg/xorgOptions.h
+++ b/ksystemlog/src/xorg/xorgOptions.h
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>