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

5 files changed, 10 insertions, 10 deletions

diff --git a/kviewshell/plugins/djvu/CMakeLists.txt b/kviewshell/plugins/djvu/CMakeLists.txt
index 9a1bfce9..fe9d4ef9 100644
--- a/kviewshell/plugins/djvu/CMakeLists.txt
+++ b/kviewshell/plugins/djvu/CMakeLists.txt
@@ -42,6 +42,6 @@ tde_add_kpart( djvuviewpart AUTOMOC
     kprintDialogPage_DJVUconversionoptions.cpp
     kprintDialogPage_DJVUconversionoptions_basewidget.ui
     pageRangeWidget_base.ui pageRangeWidget.cpp prefs.kcfgc
-  LINK djvu-shared kmultipage-shared
+  LINK djvu-shared tdemultipage-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kviewshell/plugins/djvu/Makefile.am b/kviewshell/plugins/djvu/Makefile.am
index 1dba2502..3f980a6d 100644
--- a/kviewshell/plugins/djvu/Makefile.am
+++ b/kviewshell/plugins/djvu/Makefile.am
@@ -18,7 +18,7 @@ shellrcdir = $(kde_datadir)/kviewshell/plugins/djvu
 
 kde_module_LTLIBRARIES = djvuviewpart.la
 djvuviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-djvuviewpart_la_LIBADD = -ltdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libdjvu/libdjvu.la
+djvuviewpart_la_LIBADD = -ltdeprint -ltdeparts $(top_builddir)/kviewshell/libtdemultipage.la libdjvu/libdjvu.la
 djvuviewpart_la_SOURCES = djvumultipage.cpp djvurenderer.cpp kprintDialogPage_DJVUpageoptions.cpp \
 	kprintDialogPage_DJVUconversionoptions.cpp kprintDialogPage_DJVUconversionoptions_basewidget.ui \
 	pageRangeWidget_base.ui pageRangeWidget.cpp \
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index 591447db..dd6d08b1 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -24,7 +24,7 @@
 #include <kaction.h>
 #include <kdialogbase.h>
 #include <kfiledialog.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kprinter.h>
 #include <ktempfile.h>
 #include "kvsprefs.h"
@@ -51,7 +51,7 @@ DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQO
                              const char *name, const TQStringList&)
   : KMultiPage(parentWidget, widgetName, parent, name), djvuRenderer(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(DjVuMultiPageFactory::instance());
   djvuRenderer.setName("DjVu renderer");
@@ -73,7 +73,7 @@ DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQO
   connect(renderModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRenderMode(int)));
 
   /* 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(&djvuRenderer);
 
diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h
index 163bf474..e6c47b14 100644
--- a/kviewshell/plugins/djvu/djvumultipage.h
+++ b/kviewshell/plugins/djvu/djvumultipage.h
@@ -26,7 +26,7 @@
 
 #include <tqstringlist.h>
 
-#include "kmultipage.h"
+#include "tdemultipage.h"
 #include "djvurenderer.h"
 
 #include "DjVuToPS.h"
@@ -53,7 +53,7 @@ Only the two classes that are absolutely necessary for a working
 plugin are implemented. The only other file that is installed is a
 desktop file, which tells kviewhshell to use the plugin.
 
-- kvsdemo_multipage, an implementation of a kmultipage. In a real
+- kvsdemo_multipage, an implementation of a tdemultipage. In a real
 application, this class would create and manage the GUI elements that
 the plugin adds to the GUI of the kviewshell. This implementation adds
 nothing, and does only the minimal initialization required..
@@ -93,7 +93,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.
   */
   DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
index e6872648..cb932048 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
@@ -80,7 +80,7 @@ void KPrintDialogPage_DJVUPageOptions::getOptions( TQMap<TQString,TQString>& opt
 {
   // Save options, taking default values into consideration. Warning:
   // The default values are also coded into setOptions() and
-  // kmultipage::print(..).
+  // tdemultipage::print(..).
 
   if (checkBox_rotate != 0)
     if (checkBox_rotate->isChecked())
@@ -99,7 +99,7 @@ void KPrintDialogPage_DJVUPageOptions::getOptions( TQMap<TQString,TQString>& opt
 void KPrintDialogPage_DJVUPageOptions::setOptions( const TQMap<TQString,TQString>& opts )
 {
   // Warning: All default values are also coded into getOptions() and
-  // kmultipage::print(..).
+  // tdemultipage::print(..).
 
   // same for rotation
   TQString op = opts[ "kde-kviewshell-rotatepage" ];