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

6 files changed, 13 insertions, 13 deletions

diff --git a/kfaxview/CMakeLists.txt b/kfaxview/CMakeLists.txt
index 55d83905..b01047b8 100644
--- a/kfaxview/CMakeLists.txt
+++ b/kfaxview/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES kfaxmultipage.desktop kfaxmultipage_tiff.desktop DESTINATION ${SE
 
 tde_add_kpart( kfaxviewpart AUTOMOC
   SOURCES faxmultipage.cpp faxrenderer.cpp
-  LINK kmultipage-shared kfaximage-static kparts-shared
+  LINK tdemultipage-shared kfaximage-static tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -48,6 +48,6 @@ tde_add_kpart( kfaxviewpart AUTOMOC
 
 tde_add_executable( kfaxview AUTOMOC
   SOURCES main.cpp
-  LINK kviewshell-static kio-shared kparts-shared
+  LINK kviewshell-static kio-shared tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kfaxview/Makefile.am b/kfaxview/Makefile.am
index 884c503a..d42c6ed9 100644
--- a/kfaxview/Makefile.am
+++ b/kfaxview/Makefile.am
@@ -12,8 +12,8 @@ METASOURCES = AUTO
 
 bin_PROGRAMS = kfaxview
 kfaxview_SOURCES = main.cpp
-kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts
+kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -ltdeparts
 
 # this is where the desktop file will go
 kde_services_DATA = kfaxmultipage.desktop kfaxmultipage_tiff.desktop
@@ -23,7 +23,7 @@ shellrcdir = $(kde_datadir)/kfaxview
 
 kde_module_LTLIBRARIES = kfaxviewpart.la
 kfaxviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kfaxviewpart_la_LIBADD = -ltdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libkfaximage/libkfaximage.la
+kfaxviewpart_la_LIBADD = -ltdeprint -ltdeparts $(top_builddir)/kviewshell/libtdemultipage.la libkfaximage/libkfaximage.la
 kfaxviewpart_la_SOURCES = faxmultipage.cpp faxrenderer.cpp
 
 partdir = $(kde_datadir)/kfaxview
diff --git a/kfaxview/faxmultipage.cpp b/kfaxview/faxmultipage.cpp
index d052b51b..b01d4577 100644
--- a/kfaxview/faxmultipage.cpp
+++ b/kfaxview/faxmultipage.cpp
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include <kfiledialog.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 
 #include "faxmultipage.h"
 
@@ -35,7 +35,7 @@ FaxMultiPage::FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObj
                              const char *name, const TQStringList&)
   : KMultiPage(parentWidget, widgetName, parent, name), faxRenderer(parentWidget)
 {
-  /* This is kparts wizardry that cannot be understood by man. Simply
+  /* This is tdeparts wizardry that cannot be understood by man. Simply
      change the names to match your implementation.  */
   setInstance(FaxMultiPageFactory::instance());
   faxRenderer.setName("Fax renderer");
@@ -43,7 +43,7 @@ FaxMultiPage::FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObj
   setXMLFile("kfaxview.rc");
 
   /* It is very important that this method is called in the
-     constructor. Otherwise kmultipage does not know how to render
+     constructor. Otherwise tdemultipage does not know how to render
      files, and crashes may result. */
   setRenderer(&faxRenderer);
 }
diff --git a/kfaxview/faxmultipage.h b/kfaxview/faxmultipage.h
index a6e471e8..d9888d7c 100644
--- a/kfaxview/faxmultipage.h
+++ b/kfaxview/faxmultipage.h
@@ -23,7 +23,7 @@
 
 #include <tqstringlist.h>
 
-#include "kmultipage.h"
+#include "tdemultipage.h"
 #include "faxrenderer.h"
 
 
@@ -87,7 +87,7 @@ public:
   /** Constructor
       
   The constructor needs to initialize several members of the
-  kmultipage. Please have a look at the constructor's source code to
+  tdemultipage. Please have a look at the constructor's source code to
   see how to adjust this for your implementation.
   */
   FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
diff --git a/kfaxview/libkfaximage/CMakeLists.txt b/kfaxview/libkfaximage/CMakeLists.txt
index 636eacae..f217b3b0 100644
--- a/kfaxview/libkfaximage/CMakeLists.txt
+++ b/kfaxview/libkfaximage/CMakeLists.txt
@@ -32,7 +32,7 @@ tde_add_library( kfaximage STATIC_PIC AUTOMOC
 tde_add_library( kfaximage SHARED AUTOMOC
   SOURCES kfaximage.cpp faxexpand.cpp faxinit.cpp
   VERSION 1.0.0
-  LINK kparts-shared ${TQT_LIBRARIES}
+  LINK tdeparts-shared ${TQT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index 7f4fbeee..70921c9c 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -125,7 +125,7 @@ int main(int argc, char** argv)
           TQDataStream arg(data, IO_WriteOnly);
           bool result;
           arg << qualPath.stripWhiteSpace();
-          if (!app.dcopClient()->call( *it, "kmultipage", "is_file_loaded(TQString)", data, replyType, replyData))
+          if (!app.dcopClient()->call( *it, "tdemultipage", "is_file_loaded(TQString)", data, replyType, replyData))
             kdError(4300) << "There was an error using DCOP." << endl;
           else 
           {
@@ -135,7 +135,7 @@ int main(int argc, char** argv)
               reply >> result;
               if (result == true) 
               {
-                if (app.dcopClient()->send( *it, "kmultipage", "jumpToReference(TQString)", url.ref()) == true)
+                if (app.dcopClient()->send( *it, "tdemultipage", "jumpToReference(TQString)", url.ref()) == true)
                 {
                   app.dcopClient()->detach();
                   return 0;