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

7 files changed, 13 insertions, 13 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8acde74..9587a94 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,7 +54,7 @@ tde_add_executable( tdesvnaskpass AUTOMOC
 
 tde_add_executable( tdesvn AUTOMOC
   SOURCES main.cpp tdesvn.cpp urldlg.cpp commandline.cpp
-  LINK tdecore-shared tdeui-shared kparts-shared DCOP-shared kio-shared
+  LINK tdecore-shared tdeui-shared tdeparts-shared DCOP-shared kio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -84,7 +84,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdecore-shared kio-shared kparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend
+  LINK tdecore-shared kio-shared tdeparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -180,7 +180,7 @@ tde_add_library( svnfrontend SHARED AUTOMOC
     commandline_part.cpp
     tdesvnview.cpp
     tdesvn_part.cpp
-  LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets kio-shared kparts-shared
+  LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets kio-shared tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/src/README b/src/README
index 69e9ac5..f7d3506 100644
--- a/src/README
+++ b/src/README
@@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/src/ksvnwidgets/pwstorage.cpp b/src/ksvnwidgets/pwstorage.cpp
index 16c421f..706705e 100644
--- a/src/ksvnwidgets/pwstorage.cpp
+++ b/src/ksvnwidgets/pwstorage.cpp
@@ -21,7 +21,7 @@
 #include "tdesvn-config.h"
 #include "tdesvnsettings.h"
 
-#include <kwallet.h>
+#include <tdewallet.h>
 #include <twin.h>
 #include <kapp.h>
 
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index a765807..17deee8 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -1556,7 +1556,7 @@ TQDragObject* tdesvnfilelist::dragObject()
     if (( urls.count() > 1 ) || (pixmap0Invalid)) {
       int iconSize = Kdesvnsettings::listview_icon_size();;
       iconSize = iconSize ? iconSize : tdesvnPartFactory::instance()->iconLoader()->currentSize( KIcon::Small ); // Default = small
-      pixmap2 = DesktopIcon( "kmultiple", iconSize );
+      pixmap2 = DesktopIcon( "tdemultiple", iconSize );
       if ( pixmap2.isNull() ) {
           kdWarning() << "Could not find multiple pixmap" << endl;
       }
diff --git a/src/tdesvn.h b/src/tdesvn.h
index d3f80b4..47d9f23 100644
--- a/src/tdesvn.h
+++ b/src/tdesvn.h
@@ -25,7 +25,7 @@
 #include "tdesvn-config.h"
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <tqtimer.h>
 #include <kbookmarkmanager.h>
 
diff --git a/src/tdesvn_part.h b/src/tdesvn_part.h
index 394bd10..e4b0cf4 100644
--- a/src/tdesvn_part.h
+++ b/src/tdesvn_part.h
@@ -23,11 +23,11 @@
 
 #include "tdesvn-config.h"
 
-#include <kparts/part.h>
-#include <kparts/genericfactory.h>
-#include <kparts/factory.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/browserextension.h>
 
 class tdesvnView;
 class TQPainter;
diff --git a/src/tdesvnview.h b/src/tdesvnview.h
index 75fcee2..1e0bbbd 100644
--- a/src/tdesvnview.h
+++ b/src/tdesvnview.h
@@ -24,7 +24,7 @@
 
 #include "repositorylistener.hpp"
 #include <tqwidget.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQPainter;
 class KURL;