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

8 files changed, 16 insertions, 16 deletions

diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
index a838d041..e264689a 100644
--- a/kpovmodeler/CMakeLists.txt
+++ b/kpovmodeler/CMakeLists.txt
@@ -114,7 +114,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
     pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
     pmpartiface.skel
   VERSION 0.0.0
-  LINK kparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES}
+  LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kpovmodeler/Makefile.am b/kpovmodeler/Makefile.am
index 01c8a959..18f0e782 100644
--- a/kpovmodeler/Makefile.am
+++ b/kpovmodeler/Makefile.am
@@ -227,7 +227,7 @@ libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 bin_PROGRAMS = kpovmodeler
 
 kpovmodeler_SOURCES = main.cpp
-kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kpovmodeler_LDADD = libkpovmodeler.la
 
 dummy.cpp:
diff --git a/kpovmodeler/kdoc.rules b/kpovmodeler/kdoc.rules
index 7a8d984d..ca8abb0d 100644
--- a/kpovmodeler/kdoc.rules
+++ b/kpovmodeler/kdoc.rules
@@ -6,5 +6,5 @@
 kde_MODULES = kpovmodeler
 
 kpovmodeler_FILES = *.h 
-kpovmodeler_LIBS = -ltdeui -lkparts -ltdecore -ldcop -lkfile -lkio -lqt -p
+kpovmodeler_LIBS = -ltdeui -ltdeparts -ltdecore -ldcop -lkfile -lkio -lqt -p
 kpovmodeler_PATH = .
\ No newline at end of file
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index fb66ace6..e3e3c7b4 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -48,10 +48,10 @@
 
 #include "pmdebug.h"
 
-#include <kparts/event.h>
-#include <kparts/part.h>
+#include <tdeparts/event.h>
+#include <tdeparts/part.h>
 #include <kaccel.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kstatusbar.h>
 #include <kinstance.h>
 #include <khelpmenu.h>
@@ -151,7 +151,7 @@ PMDockMainWindow::~PMDockMainWindow()
    delete d;
 }
 
-// kparts/dockmainwindow stuff
+// tdeparts/dockmainwindow stuff
 void PMDockMainWindow::createGUI( Part * part )
 {
   kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L") << endl;
@@ -245,7 +245,7 @@ void PMDockMainWindow::createShellGUI( bool create )
     }
     accel()->setAutoUpdate( bAccelAutoUpdate );
 }
-// end kparts/dockmainwindow
+// end tdeparts/dockmainwindow
 
 void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw )
 {
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 4378d282..18aa1db6 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -46,7 +46,7 @@
 
 /*
   MODIFICATIONS (zehender)
-  Added kparts ability from kparts/dockmainwindow
+  Added tdeparts ability from tdeparts/dockmainwindow
 */
 
 #define _JOWENN_EXPERIMENTAL_
@@ -74,7 +74,7 @@
 #include "dummykmainwindow.h"
 #endif
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 using namespace KParts;
 
 class PMDockSplitter;
@@ -1369,7 +1369,7 @@ protected slots:
     */
    void slotDockWidgetUndocked();
 
-   // kparts/dockmainwindow stuff
+   // tdeparts/dockmainwindow stuff
 protected slots:
 
   /**
@@ -1391,7 +1391,7 @@ protected slots:
 
 protected:
    virtual void createShellGUI( bool create = true );
-   // end kparts/dockmainwindow stuff
+   // end tdeparts/dockmainwindow stuff
 
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h
index fd147aaa..77821f1b 100644
--- a/kpovmodeler/pmfactory.h
+++ b/kpovmodeler/pmfactory.h
@@ -20,7 +20,7 @@
 #ifndef PMFACTORY_H
 #define PMFACTORY_H
 
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 class TDEAboutData;
 class TDEInstance;
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index 7c14cbf9..9a4444bd 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -28,8 +28,8 @@
 #include <kapplication.h>
 #include <kaccel.h>
 #include <kurl.h>
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
diff --git a/kpovmodeler/pmpluginmanager.cpp b/kpovmodeler/pmpluginmanager.cpp
index f3a41686..f7313675 100644
--- a/kpovmodeler/pmpluginmanager.cpp
+++ b/kpovmodeler/pmpluginmanager.cpp
@@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include <tqapplication.h>
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kxmlguifactory.h>
 #include <kconfig.h>