summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:55:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:55:52 -0600
commita2eb3bdf7452bf39fe829ffc9a0309c2324c3ec8 (patch)
treef3b247a73eacb6ce11aff9beea65c4c159a3a551
parente25fe07beb129ca34871e330e7e1b6aa35606665 (diff)
downloadksystemlog-a2eb3bdf7452bf39fe829ffc9a0309c2324c3ec8.tar.gz
ksystemlog-a2eb3bdf7452bf39fe829ffc9a0309c2324c3ec8.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--acinclude.m48
-rw-r--r--aclocal.m48
-rw-r--r--ksystemlog/doc/Makefile2
-rw-r--r--ksystemlog/doc/en/Makefile2
-rw-r--r--ksystemlog/po/Makefile2
-rw-r--r--ksystemlog/src/acpid/acpidOptions.cpp2
-rw-r--r--ksystemlog/src/acpid/acpidOptions.h2
-rw-r--r--ksystemlog/src/apache/apacheOptions.cpp2
-rw-r--r--ksystemlog/src/apache/apacheOptions.h2
-rw-r--r--ksystemlog/src/bootauth/bootAuthenticationOptions.cpp2
-rw-r--r--ksystemlog/src/bootauth/bootAuthenticationOptions.h2
-rw-r--r--ksystemlog/src/cron/cronOptions.cpp2
-rw-r--r--ksystemlog/src/cron/cronOptions.h2
-rw-r--r--ksystemlog/src/cups/cupsOptions.cpp2
-rw-r--r--ksystemlog/src/cups/cupsOptions.h2
-rw-r--r--ksystemlog/src/daemon/daemonOptions.cpp2
-rw-r--r--ksystemlog/src/daemon/daemonOptions.h2
-rw-r--r--ksystemlog/src/fileList.cpp2
-rw-r--r--ksystemlog/src/generalOptions.h2
-rw-r--r--ksystemlog/src/kernel/kernelOptions.cpp2
-rw-r--r--ksystemlog/src/kernel/kernelOptions.h2
-rw-r--r--ksystemlog/src/ksystemlog.cpp4
-rw-r--r--ksystemlog/src/ksystemlog.h2
-rw-r--r--ksystemlog/src/logManager.cpp4
-rw-r--r--ksystemlog/src/mail/mailOptions.cpp2
-rw-r--r--ksystemlog/src/mail/mailOptions.h2
-rw-r--r--ksystemlog/src/options.h2
-rw-r--r--ksystemlog/src/samba/sambaOptions.cpp2
-rw-r--r--ksystemlog/src/samba/sambaOptions.h2
-rw-r--r--ksystemlog/src/specificFileList.cpp2
-rw-r--r--ksystemlog/src/system/systemOptions.cpp2
-rw-r--r--ksystemlog/src/system/systemOptions.h2
-rw-r--r--ksystemlog/src/view.h2
-rw-r--r--ksystemlog/src/xorg/xorgOptions.cpp2
-rw-r--r--ksystemlog/src/xorg/xorgOptions.h2
35 files changed, 43 insertions, 43 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index ccfe24d..950f4ca 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -572,7 +572,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$trinity2ornewer"; then
- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+ KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
@@ -1733,7 +1733,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
- kde_check_lib="libkio.la"
+ kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@@ -2029,7 +2029,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KFILE, "-lkfile")
+ AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2039,7 +2039,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
diff --git a/aclocal.m4 b/aclocal.m4
index 06fc077..146906d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -584,7 +584,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$trinity2ornewer"; then
- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+ KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
@@ -1745,7 +1745,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
- kde_check_lib="libkio.la"
+ kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@@ -2041,7 +2041,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KFILE, "-lkfile")
+ AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2051,7 +2051,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
diff --git a/ksystemlog/doc/Makefile b/ksystemlog/doc/Makefile
index 62cd49d..1629b12 100644
--- a/ksystemlog/doc/Makefile
+++ b/ksystemlog/doc/Makefile
@@ -85,7 +85,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
KDECONFIG = /usr/bin/tde-config
KDE_EXTRA_RPATH =
KDE_INCLUDES = -I/usr/include/tde
diff --git a/ksystemlog/doc/en/Makefile b/ksystemlog/doc/en/Makefile
index 5400834..5e95fdb 100644
--- a/ksystemlog/doc/en/Makefile
+++ b/ksystemlog/doc/en/Makefile
@@ -82,7 +82,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
KDECONFIG = /usr/bin/tde-config
KDE_EXTRA_RPATH =
KDE_INCLUDES = -I/usr/include/tde
diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile
index 9ca6b6e..3f0711c 100644
--- a/ksystemlog/po/Makefile
+++ b/ksystemlog/po/Makefile
@@ -82,7 +82,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
KDECONFIG = /usr/bin/tde-config
KDE_EXTRA_RPATH =
KDE_INCLUDES = -I/usr/include/tde
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>