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

2 files changed, 43 insertions, 43 deletions

diff --git a/smoke/kde/generate.pl.in b/smoke/kde/generate.pl.in
index 3aa180da..6365c739 100644
--- a/smoke/kde/generate.pl.in
+++ b/smoke/kde/generate.pl.in
@@ -97,7 +97,7 @@ my %kdeexcludes = (
 	'kdirnotify_stub.h' => 1,
 
 #	These headers currently give problems
-	'kscreensaver.h' => 1,
+	'tdescreensaver.h' => 1,
 	'kdirnotify_stub.h' => 1,
 	'kio/uiserver_stub.h' => 1,
 	'kio/uiserver.h' => 1,
@@ -106,8 +106,8 @@ my %kdeexcludes = (
 	'kio/thumbcreator.h' => 1,
 	'kio/file.h' => 1,
 	'kio/chmodjob.h' => 1,
-	'kparts/genericfactory.h' => 1,
-	'kparts/pluginselectormodule.h' => 1,
+	'tdeparts/genericfactory.h' => 1,
+	'tdeparts/pluginselectormodule.h' => 1,
 	'kopenssl.h' => 1,
 	'kautomount.h' => 1,
 	'kimagefilepreview.h' => 1,
diff --git a/smoke/kde/kde_header_list b/smoke/kde/kde_header_list
index 7546ab1c..ba1c2e9f 100644
--- a/smoke/kde/kde_header_list
+++ b/smoke/kde/kde_header_list
@@ -168,11 +168,11 @@ kglobal.h
 kglobalsettings.h
 kguiitem.h
 khelpmenu.h
-khtmldefaults.h
-khtml_events.h
-khtml_part.h
-khtml_settings.h
-khtmlview.h
+tdehtmldefaults.h
+tdehtml_events.h
+tdehtml_part.h
+tdehtml_settings.h
+tdehtmlview.h
 kicondialog.h
 kiconeffect.h
 kiconloader.h
@@ -204,17 +204,17 @@ kmainwindow.h
 kmainwindowiface.h
 kmanagerselection.h
 kmdcodec.h
-kmdichildarea.h
-kmdichildfrmcaption.h
-kmdichildfrm.h
-kmdichildview.h
-kmdidefines.h
-kmdiiterator.h
-kmdilistiterator.h
-kmdimainfrm.h
-kmdinulliterator.h
-kmditaskbar.h
-kmditoolviewaccessor.h
+tdemdichildarea.h
+tdemdichildfrmcaption.h
+tdemdichildfrm.h
+tdemdichildview.h
+tdemdidefines.h
+tdemdiiterator.h
+tdemdilistiterator.h
+tdemdimainfrm.h
+tdemdinulliterator.h
+tdemditaskbar.h
+tdemditoolviewaccessor.h
 kmenubar.h
 kmessagebox.h
 kmimemagic.h
@@ -222,8 +222,8 @@ kmimesourcefactory.h
 kmimetype.h
 kmimetyperesolver.h
 kmountpoint.h
-kmultipledrag.h
-kmultitabbar.h
+tdemultipledrag.h
+tdemultitabbar.h
 knotifyclient.h
 knotifydialog.h
 knuminput.h
@@ -276,8 +276,8 @@ krun.h
 ksavefile.h
 kscan.h
 ksconfig.h
-kscreensaver.h
-kscreensaver_vroot.h
+tdescreensaver.h
+tdescreensaver_vroot.h
 kselect.h
 kseparator.h
 kservicegroup.h
@@ -296,8 +296,8 @@ ksockaddr.h
 ksock.h
 ksocks.h
 ksortablevaluelist.h
-kspelldlg.h
-kspell.h
+tdespelldlg.h
+tdespell.h
 ksqueezedtextlabel.h
 ksslall.h
 ksslcertchain.h
@@ -332,9 +332,9 @@ kstdguiitem.h
 kstringhandler.h
 kstringvalidator.h
 kstyle.h
-ksycocaentry.h
-ksycoca.h
-ksycocatype.h
+tdesycocaentry.h
+tdesycoca.h
+tdesycocatype.h
 ksyntaxhighlighter.h
 ksystemtray.h
 ktabbar.h
@@ -379,21 +379,21 @@ kxmlguiclient.h
 kxmlguifactory.h
 kxmlgui.h
 kzip.h
-kparts/browserextension.h
-kparts/browserinterface.h
-kparts/browserrun.h
-kparts/componentfactory.h
-kparts/dockmainwindow.h
-kparts/event.h
-kparts/factory.h
-kparts/genericfactory.h
-kparts/historyprovider.h
-kparts/mainwindow.h
-kparts/part.h
-kparts/partmanager.h
-kparts/plugin.h
-kparts/pluginselectormodule.h
-kparts/statusbarextension.h
+tdeparts/browserextension.h
+tdeparts/browserinterface.h
+tdeparts/browserrun.h
+tdeparts/componentfactory.h
+tdeparts/dockmainwindow.h
+tdeparts/event.h
+tdeparts/factory.h
+tdeparts/genericfactory.h
+tdeparts/historyprovider.h
+tdeparts/mainwindow.h
+tdeparts/part.h
+tdeparts/partmanager.h
+tdeparts/plugin.h
+tdeparts/pluginselectormodule.h
+tdeparts/statusbarextension.h
 kio/authinfo.h
 kio/chmodjob.h
 kio/connection.h