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

2 files changed, 64 insertions, 64 deletions

diff --git a/smoke/kde/generate.pl.in b/smoke/kde/generate.pl.in
index 6365c739..1dfd3fd5 100644
--- a/smoke/kde/generate.pl.in
+++ b/smoke/kde/generate.pl.in
@@ -99,13 +99,13 @@ my %kdeexcludes = (
 #	These headers currently give problems
 	'tdescreensaver.h' => 1,
 	'kdirnotify_stub.h' => 1,
-	'kio/uiserver_stub.h' => 1,
-	'kio/uiserver.h' => 1,
-	'kio/tdesasl.h' => 1,
-	'kio/kpac.h' => 1,
-	'kio/thumbcreator.h' => 1,
-	'kio/file.h' => 1,
-	'kio/chmodjob.h' => 1,
+	'tdeio/uiserver_stub.h' => 1,
+	'tdeio/uiserver.h' => 1,
+	'tdeio/tdesasl.h' => 1,
+	'tdeio/kpac.h' => 1,
+	'tdeio/thumbcreator.h' => 1,
+	'tdeio/file.h' => 1,
+	'tdeio/chmodjob.h' => 1,
 	'tdeparts/genericfactory.h' => 1,
 	'tdeparts/pluginselectormodule.h' => 1,
 	'kopenssl.h' => 1,
diff --git a/smoke/kde/kde_header_list b/smoke/kde/kde_header_list
index ba1c2e9f..9f78c9c3 100644
--- a/smoke/kde/kde_header_list
+++ b/smoke/kde/kde_header_list
@@ -93,12 +93,12 @@ kcombobox.h
 kcommand.h
 kcompletionbox.h
 kcompletion.h
-kconfigdialog.h
-kconfigskeleton.h
-kconfigbackend.h
-kconfigbase.h
-kconfigdata.h
-kconfig.h
+tdeconfigdialog.h
+tdeconfigskeleton.h
+tdeconfigbackend.h
+tdeconfigbase.h
+tdeconfigdata.h
+tdeconfig.h
 kcpuinfo.h
 kcrash.h
 kcursor.h
@@ -140,21 +140,21 @@ kedittoolbar.h
 kemailsettings.h
 kextendedsocket.h
 kextsock.h
-kfiledetailview.h
-kfiledialog.h
-kfilefiltercombo.h
-kfilefilter.h
-kfile.h
-kfileiconview.h
-kfileitem.h
-kfilemetainfo.h
-kfilepreview.h
-kfilesharedlg.h
-kfileshare.h
-kfiletreebranch.h
-kfiletreeview.h
-kfiletreeviewitem.h
-kfileview.h
+tdefiledetailview.h
+tdefiledialog.h
+tdefilefiltercombo.h
+tdefilefilter.h
+tdefile.h
+tdefileiconview.h
+tdefileitem.h
+tdefilemetainfo.h
+tdefilepreview.h
+tdefilesharedlg.h
+tdefileshare.h
+tdefiletreebranch.h
+tdefiletreeview.h
+tdefiletreeviewitem.h
+tdefileview.h
 kfilterbase.h
 kfilterdev.h
 kfinddialog.h
@@ -394,42 +394,42 @@ tdeparts/partmanager.h
 tdeparts/plugin.h
 tdeparts/pluginselectormodule.h
 tdeparts/statusbarextension.h
-kio/authinfo.h
-kio/chmodjob.h
-kio/connection.h
-kio/davjob.h
-kio/defaultprogress.h
-kio/file.h
-kio/global.h
-kio/http.h
-kio/http_slave_defaults.h
-kio/ioslave_defaults.h
-kio/jobclasses.h
-kio/job.h
-kio/tdesasl.h
-kio/kmdbase.h
-kio/kmdcodec.h
-kio/kpac.h
-kio/metainfojob.h
-kio/netaccess.h
-kio/observer.h
-kio/passdlg.h
-kio/paste.h
-kio/previewjob.h
-kio/progressbase.h
-kio/renamedlg.h
-kio/scheduler.h
-kio/sessiondata.h
-kio/skipdlg.h
-kio/slavebase.h
-kio/slaveconfig.h
-kio/slave.h
-kio/slaveinterface.h
-kio/statusbarprogress.h
-kio/tcpslavebase.h
-kio/thumbcreator.h
-kio/uiserver.h
-kio/uiserver_stub.h
+tdeio/authinfo.h
+tdeio/chmodjob.h
+tdeio/connection.h
+tdeio/davjob.h
+tdeio/defaultprogress.h
+tdeio/file.h
+tdeio/global.h
+tdeio/http.h
+tdeio/http_slave_defaults.h
+tdeio/ioslave_defaults.h
+tdeio/jobclasses.h
+tdeio/job.h
+tdeio/tdesasl.h
+tdeio/kmdbase.h
+tdeio/kmdcodec.h
+tdeio/kpac.h
+tdeio/metainfojob.h
+tdeio/netaccess.h
+tdeio/observer.h
+tdeio/passdlg.h
+tdeio/paste.h
+tdeio/previewjob.h
+tdeio/progressbase.h
+tdeio/renamedlg.h
+tdeio/scheduler.h
+tdeio/sessiondata.h
+tdeio/skipdlg.h
+tdeio/slavebase.h
+tdeio/slaveconfig.h
+tdeio/slave.h
+tdeio/slaveinterface.h
+tdeio/statusbarprogress.h
+tdeio/tcpslavebase.h
+tdeio/thumbcreator.h
+tdeio/uiserver.h
+tdeio/uiserver_stub.h
 netwm_def.h
 netwm.h
 knewstuff/knewstuff.h