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

1 files changed, 41 insertions, 41 deletions

diff --git a/pytde352.prj b/pytde352.prj
index f32ee60..b648841 100644
--- a/pytde352.prj
+++ b/pytde352.prj
@@ -66,7 +66,7 @@ module = tdecore
 
 source     = $SRC/tdecore
 ignore     = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h  ksockaddr.h kextsock.h ksocks.h
-ignore     = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
+ignore     = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h
 ignore     = kgenericfactory.h ktypelist.h kvmallocator.h  ksortablevaluelist.h
 ignore     = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
 ignore     = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
@@ -142,7 +142,7 @@ module = tdeui
 
 source     = $SRC/tdeui/
 ignore     = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
-ignore     = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
+ignore     = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
 compare    = $COMP
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -196,11 +196,11 @@ retain
 
 // -----------------------------------------
 
-module = kresources
+module = tderesources
 
-source     = $SRC/kresources
+source     = $SRC/tderesources
 ignore     =
-compare    = $COMP $COMP/kresources
+compare    = $COMP $COMP/tderesources
 subst      =
 ignore     = manager.h manageriface.h managerimpl.h
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -232,7 +232,7 @@ import     = tdecoremod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
-import     = kresourcesmod.sip
+import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
 define     = "KDE_DEPRECATED", ""
@@ -243,9 +243,9 @@ retain
 
 // -----------------------------------------
 
-module = kutils
+module = tdeutils
 
-source     = $SRC/kutils/
+source     = $SRC/tdeutils/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde352
@@ -258,12 +258,12 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkutils
+             -ltdeutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
 define     = "class\ KMultiTabBarTab\ \*", "KMultiTabBarTab *"
 
@@ -295,11 +295,11 @@ retain
 
 // -----------------------------------------
 
-module = kparts
+module = tdeparts
 
-source     = $SRC/kparts
+source     = $SRC/tdeparts
 ignore     = componentfactory.h
-compare    = $COMP/kparts
+compare    = $COMP/tdeparts
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -311,18 +311,18 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
 
 // -----------------------------------------
 
-module = khtml
+module = tdehtml
 
-source     = $SRC/khtml $SRC/khtml/dom
-ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
+source     = $SRC/tdehtml $SRC/tdehtml/dom
+ignore     = tdehtmldefaults.h dom_core.h dom_html.h tdehtml_events.h
 compare    = $COMP  $COMP/dom
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -332,15 +332,15 @@ import     = tdecore
 import     = tdefx
 import     = tdeui
 import     = kio
-import     = kutils
-import     = kparts
+import     = tdeutils
+import     = tdeparts
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
+include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
-            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
+            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
 retain
@@ -360,24 +360,24 @@ retain
 //import     = tdefx
 //import     = tdeui
 //import     = kio
-//import     = kparts
-//import     = khtml
+//import     = tdeparts
+//import     = tdehtml
 //importpath = $IMP
 //include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
-//             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
+//             -ltdeuicmodule -ltdecorecmodule -ltdehtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
 
 // -----------------------------------------
 
-module = kspell
+module = tdespell
 
 ignore     =
-source     = $DST/extra/kde352/kspell
+source     = $DST/extra/kde352/tdespell
 compare    = $COMP
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -392,9 +392,9 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
-sipslot    = obj slot kspell
+sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
@@ -429,9 +429,9 @@ retain
 
 // -----------------------------------------
 
-module = kmdi
+module = tdemdi
 
-source     = $SRC/kmdi/
+source     = $SRC/tdemdi/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde352
@@ -443,14 +443,14 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
-ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
+ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkmdi
+             -ltdemdi
 define     = "TQT_VERSION", "301"
 define     = "TQMainWindow::ToolBarDock", "TQt::Dock"
 
@@ -459,9 +459,9 @@ retain
 
 // -----------------------------------------
 
-//module = kspell2
+//module = tdespell2
 
-//source     = $SRC/kspell2/
+//source     = $SRC/tdespell2/
 //ignore     =
 //compare    = $COMP
 //subst      = $DST/extra/kde352
@@ -473,12 +473,12 @@ retain
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
 ////import     = kfilemod.sip
-////import     = kpartsmod.sip
+////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-//             -lkspell2
+//             -ltdespell2
 //
 //retain