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

1 files changed, 18 insertions, 18 deletions

diff --git a/pytde351.prj b/pytde351.prj
index cd30eb2..dc7f95f 100644
--- a/pytde351.prj
+++ b/pytde351.prj
@@ -170,10 +170,10 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/kde351/kio
+source     = $SRC/tdeio/tdeio  $DST/extra/kde351/tdeio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde351
 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)
@@ -184,7 +184,7 @@ import     = tdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/kde351/kio @KDE_INCLUDEPATH@/kio ../tdecore
+include    = ../extra/kde351/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
@@ -257,7 +257,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
@@ -271,11 +271,11 @@ retain
 
 // -----------------------------------------
 
-module = kfile
+module = tdefile
 
-source     = $SRC/kio/kfile
+source     = $SRC/tdeio/tdefile
 ignore     = kpropsdlg.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde351
 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)
@@ -287,7 +287,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
+include    = @KDE_INCLUDEPATH@/tdeio  ../tdecore  ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
@@ -311,7 +311,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/tdeio  ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
@@ -338,7 +338,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
-             @KDE_INCLUDEPATH@/kio ../tdecore ../kio
+             @KDE_INCLUDEPATH@/tdeio ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
@@ -363,8 +363,8 @@ retain
 //import     = tdeparts
 //import     = tdehtml
 //importpath = $IMP
-//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
-//             ../tdecore  ../kio
+//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/tdeio\
+//             ../tdecore  ../tdeio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
@@ -386,19 +386,19 @@ import     = dcop
 import     = tdecore
 import     = tdefx
 import     = tdeui
-import     = kfile
+import     = tdefile
 importpath = $IMP
-include    = ../tdecore  @KDE_INCLUDEPATH@/kio
+include    = ../tdecore  @KDE_INCLUDEPATH@/tdeio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
-             -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
+             -ltdecorecmodule -ltdeuicmodule -ltdefilecmodule -ldcopcmodule
 sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
-import kfile
+import tdefile
 %End
 end
 
@@ -442,7 +442,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
@@ -472,7 +472,7 @@ retain
 //import     = tdefxmod.sip
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
-////import     = kfilemod.sip
+////import     = tdefilemod.sip
 ////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet