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

kcoloredit/Makefile.am

@@ -7,7 +7,7 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \
 	kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
 kcoloredit_METASOURCES = AUTO
 kcoloredit_LDADD = $(LIB_TDEUI) $(LIB_KFILE)
-kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kcoloredit
 rc_DATA = kcoloreditui.rc
@@ -15,7 +15,7 @@ rc_DATA = kcoloreditui.rc
 bin_PROGRAMS = kcoloredit kcolorchooser
 kcolorchooser_SOURCES = kcolorchooser.cpp
 kcolorchooser_LDADD = $(LIB_TDEUI)
-kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \
 	gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \

kdvi/CMakeLists.txt

@@ -75,7 +75,7 @@ tde_add_kpart( kdvipart AUTOMOC
     TeXFont_PFB.cpp TeXFont_TFM.cpp TeXFontDefinition.cpp
     dviWidget.cpp dvisourcesplitter.cpp prefs.kcfgc
   LINK
-    kmultipage-shared tdeprint-shared kparts-shared ${FREETYPE_LIBRARIES}
+    tdemultipage-shared tdeprint-shared tdeparts-shared ${FREETYPE_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -84,7 +84,7 @@ tde_add_kpart( kdvipart AUTOMOC
 
 tde_add_executable( kdvi AUTOMOC
   SOURCES main.cpp
-  LINK kviewshell-static kparts-shared
+  LINK kviewshell-static tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

kdvi/Makefile.am

@@ -30,8 +30,8 @@ kdvipart_la_SOURCES = renderedDviPagePixmap.cpp dviPageCache.cpp \
 kde_kcfg_DATA = kdvi.kcfg
 
 kdvipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -lkparts \
-			$(top_builddir)/kviewshell/libkmultipage.la
+kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -ltdeparts \
+			$(top_builddir)/kviewshell/libtdemultipage.la
 
 # Which sources should be compiled for squeeze.
 squeeze_SOURCES	= squeeze.c
@@ -39,8 +39,8 @@ squeeze_SOURCES	= squeeze.c
 KDE_OPTIONS = nofinal
 
 kdvi_SOURCES = main.cpp 
-kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts
+kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -ltdeparts
 
 ## this option you can leave out. Just, if you use "make dist", you need it
 noinst_HEADERS = dvi.h dviRenderer.h xdvi.h

kdvi/kdvi_multipage.cpp

@@ -15,8 +15,8 @@
 #include <ktip.h>
 #include <tqtimer.h>
 
-#include <kparts/part.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/genericfactory.h>
 
 #include "kdvi_multipage.h"
 #include "documentWidget.h"

kdvi/kdvi_multipage.h

@@ -2,7 +2,7 @@
 #ifndef KDVIMULTIPAGE_H
 #define KDVIMULTIPAGE_H
 
-#include "kmultipage.h"
+#include "tdemultipage.h"
 #include "dviRenderer.h"
 
 #include <tqstringlist.h>

kdvi/main.cpp

@@ -105,7 +105,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 
           {
@@ -115,7 +115,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;

kfax/Makefile.am

@@ -1,4 +1,4 @@
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 LDADD      = $(LIB_KFILE) $(LIB_TDEPRINT) -lm
 INCLUDES   = $(all_includes)
 

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}
 )

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

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);
 }

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,

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}
 )
 

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;

kgamma/kcmkgamma/CMakeLists.txt

@@ -38,6 +38,6 @@ tde_add_kpart( kcm_kgamma AUTOMOC
   SOURCES
     xf86configpath.cpp xvidextwrap.cpp
     displaynumber.cpp gammactrl.cpp kgamma.cpp
-  LINK kparts-shared ${XXF86VM_LIBRARIES}
+  LINK tdeparts-shared ${XXF86VM_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kghostview/CMakeLists.txt

@@ -47,7 +47,7 @@ tde_add_library( kghostviewlib SHARED AUTOMOC
     displayoptions.cpp kpswidget.cpp fullscreenfilter.cpp
     kgvfactory.cpp  generalsettingswidget.ui gssettingswidget.ui
     thumbnailservice.cpp  configuration.kcfgc
-  LINK dscparse-static tdeprint-shared kparts-shared
+  LINK dscparse-static tdeprint-shared tdeparts-shared
   VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )

kghostview/Makefile.am

@@ -28,7 +28,7 @@ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
 libkghostviewpart_la_SOURCES = part_init.cpp
 
 kghostview_SOURCES = main.cpp
-kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kghostview_LDADD = libkghostviewlib.la
 
 libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined

kghostview/kgv_view.h

@@ -23,7 +23,7 @@
 #include <tqfile.h>
 
 #include <kio/job.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <krun.h>
 
 #include "displayoptions.h"

kghostview/kgvfactory.cpp

@@ -1,6 +1,6 @@
 /**
  * Copyright (C) 2003, Luís Pedro Coelho,
- * based on tdelibs/kparts/genericfactory.h
+ * based on tdelibs/tdeparts/genericfactory.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 #include <kdebug.h>

kghostview/kgvfactory.h

@@ -1,6 +1,6 @@
 /**
  * Copyright (C) 2003, Luís Pedro Coelho,
- * based on tdelibs/kparts/genericfactory.h
+ * based on tdelibs/tdeparts/genericfactory.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
 #ifndef KGVPart_H_INCLUDE_GUARD_
 #define KGVPart_H_INCLUDE_GUARD_
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 
 class TDEInstance;
 class TDEAboutData;

kghostview/kgvshell.cpp

@@ -38,7 +38,7 @@
 #include <kicontheme.h>
 #include <kglobal.h>
 #include <kpopupmenu.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <twin.h>
 

kghostview/kgvshell.h

@@ -21,7 +21,7 @@
 
 #include <tqstring.h>
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class TQTimer;
 

kiconedit/Makefile.am

@@ -11,7 +11,7 @@ kiconedit_SOURCES = utils.cpp main.cpp kiconedit.cpp kicongrid.cpp \
 kiconedit_METASOURCES = AUTO
 
 # the library search path. 
-kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kiconedit_LDADD = $(LIB_KFILE) -ltdeprint
 
 DISTCLEANFILES = *~ .deps/* .libs/*

kmrml/kmrml/CMakeLists.txt

@@ -49,7 +49,7 @@ tde_add_kpart( libkmrmlpart AUTOMOC
     mrml_part.cpp mrml_view.cpp loader.cpp mrml_elements.cpp
     mrml_creator.cpp browser.cpp algorithmdialog.cpp collectioncombo.cpp
     algorithmcombo.cpp propertysheet.cpp
-  LINK kmrmlstuff-static kparts-shared
+  LINK kmrmlstuff-static tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 

kmrml/kmrml/browser.h

@@ -19,7 +19,7 @@
 #ifndef BROWSER_H
 #define BROWSER_H
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KMrml
 {

kmrml/kmrml/kcontrol/CMakeLists.txt

@@ -33,6 +33,6 @@ tde_add_kpart( kcm_kmrml AUTOMOC
     kcmkmrml.cpp mainpage.cpp indexer.cpp
     serverconfigwidget.ui indexcleaner.cpp
   LINK
-    kmrmlstuff-static kparts-shared kio-shared
+    kmrmlstuff-static tdeparts-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kmrml/kmrml/mrml_part.cpp

@@ -42,7 +42,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprotocolinfo.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <ktempfile.h>
 
 #include <mrml_utils.h>

kmrml/kmrml/mrml_part.h

@@ -23,8 +23,8 @@
 #include <tqstringlist.h>
 
 #include <kurl.h>
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 
 #include <kmrml_config.h>
 

kmrml/kmrml/server/CMakeLists.txt

@@ -30,6 +30,6 @@ INSTALL( FILES daemonwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 tde_add_kpart( kded_daemonwatcher AUTOMOC
   SOURCES watcher.cpp watcher.skel
-  LINK kmrmlstuff-static kparts-shared kio-shared tdeinit_kded-shared
+  LINK kmrmlstuff-static tdeparts-shared kio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kolourpaint/Makefile.am

@@ -39,7 +39,7 @@ kolourpaint_SOURCES = kolourpaint.cpp \
     kpviewmanager.cpp \
     kpviewscrollablecontainer.cpp \
     kpwidgetmapper.cpp
-kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kolourpaint_LDADD = $(LIB_TDEPRINT) \
     cursors/libkolourpaintcursors.la \
     pixmapfx/libkolourpaintpixmapfx.la \

kooka/CMakeLists.txt

@@ -43,6 +43,6 @@ tde_add_executable( kooka AUTOMOC
     dwmenuaction.cpp kocrbase.cpp kocrgocr.cpp kocrkadmos.cpp
     kadmosocr.cpp ocrword.cpp ocrresedit.cpp kookaprint.cpp
     imgprintdialog.cpp kocrocrad.cpp
-  LINK kscan-shared kparts-shared tdeprint-shared
+  LINK kscan-shared tdeparts-shared tdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

kooka/Makefile.am

@@ -16,8 +16,8 @@ kooka_SOURCES =	main.cpp kooka.cpp kookaview.cpp kookapref.cpp 		\
 		kocrocrad.cpp
 # 		pagesetup.cpp 
 
-kooka_LDADD   = $(LIB_KFILE) -ltdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
-kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kooka_LDADD   = $(LIB_KFILE) -ltdeprint -ltdetexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
+kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES         = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)
 

kooka/kooka.cpp

@@ -53,7 +53,7 @@
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
 #include <kdockwidget.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 #include <kstdaccel.h>
 #include <kaction.h>
 #include <kstdaction.h>

kooka/kooka.h

@@ -34,7 +34,7 @@
 #include <kapplication.h>
 #include <kmainwindow.h>
 #include <kdockwidget.h>
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/dockmainwindow.h>
 
 #define KOOKA_STATE_GROUP "State"
 #define PREFERENCE_DIA_TAB "PreferencesTab"

kooka/kookaview.cpp

@@ -74,7 +74,7 @@
 #include <kdockwidget.h>
 #include <tqobject.h>
 
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <tqimage.h>
 #include <kpopupmenu.h>
 

kooka/kookaview.h

@@ -35,8 +35,8 @@
 #include <tqimage.h>
 #include <tqsplitter.h>
 
-#include <kparts/dockmainwindow.h>
-#include <kparts/part.h>
+#include <tdeparts/dockmainwindow.h>
+#include <tdeparts/part.h>
 
 // application specific includes
 #include "kscandevice.h"

kooka/ksaneocr.cpp

@@ -33,8 +33,8 @@
 #include <ktempfile.h>
 #include <kprocess.h>
 #include <stdlib.h>
-#include <kspell.h>
-#include <kspelldlg.h>
+#include <tdespell.h>
+#include <tdespelldlg.h>
 #include <tqfile.h>
 #include <tqcolor.h>
 #include <stdio.h>
@@ -76,7 +76,7 @@ KSANEOCR::KSANEOCR( TQWidget*, TDEConfig *cfg ):
     m_imgCanvas(0L),
     m_spell(0L),
     m_wantKSpell(true),
-    m_kspellVisible(true),
+    m_tdespellVisible(true),
     m_hideDiaWhileSpellcheck(true),
     m_spellInitialConfig(0L),
     m_parent(0L),
@@ -275,7 +275,7 @@ void KSANEOCR::finishedOCRVisible( bool success )
        {
            m_ocrCurrLine = 0;
            /*
-            * create a new kspell object, based on the config of the base dialog
+            * create a new tdespell object, based on the config of the base dialog
             */
 
            connect( new KSpell( m_parent, i18n("Kooka OCR Dictionary Check"),
@@ -317,7 +317,7 @@ void KSANEOCR::startLineSpellCheck()
 
         // if( list.count() > 0 )
 
-        m_spell->checkList( &m_checkStrings, m_kspellVisible );
+        m_spell->checkList( &m_checkStrings, m_tdespellVisible );
 	kdDebug(28000)<< "Started!" << endl;
         /**
          * This call ends in three slots:

kooka/ksaneocr.h

@@ -260,14 +260,14 @@ private:
 
     KSpell          *m_spell;
     bool             m_wantKSpell;
-    bool             m_kspellVisible;
+    bool             m_tdespellVisible;
     bool             m_hideDiaWhileSpellcheck;
     KSpellConfig    *m_spellInitialConfig;
 
     /* ValueVector of wordLists for every line of ocr results */
     ocrBlock         m_ocrPage; /* one block contains all lines of the page */
     TQWidget          *m_parent;
-    /* current processed line to speed kspell correction */
+    /* current processed line to speed tdespell correction */
     unsigned         m_ocrCurrLine;
     TQStringList      m_checkStrings;
 

kooka/ocrword.cpp

@@ -121,7 +121,7 @@ TQRect ocrWordList::wordListRect()
 
 
 /*
- * since kspell removes , - | / etc. from words while they remain in the words
+ * since tdespell removes , - | / etc. from words while they remain in the words
  * in the ocr wordlist.
  * This search goes through the wordlist and tries to find the words without caring
  * for special chars. It simply removes all chars from the words that are not alphanumeric.

kpdf/CMakeLists.txt

@@ -45,7 +45,7 @@ tde_add_kpart( libkpdfpart AUTOMOC
   LINK
     kpdfconf-static kpdfui-static kpdfcore-static generatorkimgio-static
     generatorpdf-static xpdf-static goo-static splash-static fofi-static
-    kutils-shared tdeprint-shared kparts-shared ${PAPER_LIBRARY} ${XFT_LIBRARIES}
+    tdeutils-shared tdeprint-shared tdeparts-shared ${PAPER_LIBRARY} ${XFT_LIBRARIES}
   DEPENDENCIES kpdfconf-static
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kpdf/core/generator_pdf/generator_pdf.cpp

@@ -20,7 +20,7 @@
 #include <klistview.h>
 #include <klocale.h>
 #include <kpassdlg.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 #include <kprinter.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>

kpdf/part.cpp

@@ -42,7 +42,7 @@
 #include <tdeprint/kprintdialogpage.h>
 #include <kstdaction.h>
 #include <tdeversion.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kurldrag.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>

kpdf/part.h

@@ -16,8 +16,8 @@
 #ifndef _KPDF_PART_H_
 #define _KPDF_PART_H_
 
-#include <kparts/browserextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/part.h>
 #include <tqguardedptr.h>
 #include "core/document.h"
 #include "core/observer.h"

kpdf/shell/CMakeLists.txt

@@ -31,6 +31,6 @@ install( FILES shell.rc DESTINATION ${DATA_INSTALL_DIR}/kpdf )
 
 tde_add_executable( kpdf AUTOMOC
   SOURCES main.cpp shell.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

kpdf/shell/Makefile.am

@@ -5,7 +5,7 @@ METASOURCES = AUTO
 bin_PROGRAMS = kpdf
 
 kpdf_SOURCES = main.cpp shell.cpp
-kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kpdf_LDADD   = $(LIB_KPARTS)
 
 EXTRA_DIST = kpdf.desktop

kpdf/shell/shell.cpp

@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kio/netaccess.h>
 #include <kmainwindowiface.h>
 

kpdf/shell/shell.h

@@ -20,7 +20,7 @@
 #include <config.h>
 #endif
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KPDF
 {

kpdf/ui/pageview.cpp

@@ -650,7 +650,7 @@ void PageView::keyPressEvent( TQKeyEvent * e )
     if ( ( !d->mouseSelectionRect.isNull() && e->key() != TQt::Key_Escape ) || d->mouseMidStartY != -1 )
         return;
 
-    // handle 'find as you type' (based on khtml/khtmlview.cpp)
+    // handle 'find as you type' (based on tdehtml/tdehtmlview.cpp)
     if( d->typeAheadActive )
     {
         // backspace: remove a char and search or terminates search

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}
 )
 

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:

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 = .

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 )
 {

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 );

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;

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>

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>
 

kruler/Makefile.am

@@ -4,7 +4,7 @@ INCLUDES= $(all_includes)
 
 bin_PROGRAMS = kruler
 kruler_METASOURCES = AUTO
-kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kruler_LDADD   = $(LIB_TDEUI)
 kruler_SOURCES = klineal.cpp main.cpp 
 

ksnapshot/Makefile.am

@@ -2,7 +2,7 @@ bin_PROGRAMS= ksnapshot
 
 INCLUDES = -DKSNAPVERSION="\"0.7\"" $(all_includes)
 
-ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 ksnapshot_LDADD = $(LIB_TDEPRINT)
 
 ksnapshot_SOURCES = ksnapshotiface.skel main.cpp ksnapshot.cpp \

ksvg/CMakeLists.txt

@@ -38,6 +38,6 @@ tde_add_library( ksvg SHARED
     ksvgdom-static ksvgdomimpl-static ksvgcore-static ksvgecma-static
     ksvgxrgbrender-static text2path-static ksvgart-static
   LINK
-    khtml-shared ${LCMS_LIBRARY} ${ART_LIBRARIES} ${FRIBIDI_LIBRARIES}
+    tdehtml-shared ${LCMS_LIBRARY} ${ART_LIBRARIES} ${FRIBIDI_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )

ksvg/core/CanvasFactory.cpp

@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "KSVGCanvas.h"
 #include "CanvasFactory.h"

ksvg/ecma/ksvg_window.cpp

@@ -39,7 +39,7 @@
 #include <SVGPaintImpl.h>
 #include <SVGZoomAndPanImpl.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <assert.h>
 #include <kdebug.h>
 #include <tqstylesheet.h>
@@ -70,7 +70,7 @@ using namespace KSVG;
   navigator	KSVG::Window::_Navigator	DontDelete|ReadOnly
   printNode		KSVG::Window::_PrintNode		DontDelete|Function 1
 
-# todo navigator, status/defaultstatus, like in KJS::Window (khtml)
+# todo navigator, status/defaultstatus, like in KJS::Window (tdehtml)
 # todo close
 # todo instancename
 # todo setsrc, getsrc, reload, focus, blur, browsereval, findinstancebyname
@@ -381,7 +381,7 @@ Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args)
 		}
 		case KSVG::Window::_Prompt:
 		{
-		    // mop: from khtml. do we need that?
+		    // mop: from tdehtml. do we need that?
 		    // part->xmlDocImpl()->updateRendering();
 		    bool ok;
 		    TQString str2;

ksvg/ecma/ksvg_window.h

@@ -27,7 +27,7 @@ namespace KSVG {
 class SVGDocumentImpl;
 class WindowQObject;
 
-// This is currently a fork of khtml's Window object, simplified.
+// This is currently a fork of tdehtml's Window object, simplified.
 // However in the long run it could become a base class for it.
 // Author: David Faure <faure@kde.org>
 class Window : public KJS::ObjectImp {

ksvg/impl/SVGElementImpl.cc

@@ -325,7 +325,7 @@ TQDict<DOM::DOMString> &SVGElementImpl::attributes()
 	return m_attributes;
 }
 
-// khtml overrides
+// tdehtml overrides
 void SVGElementImpl::setAttribute(const DOM::DOMString &name, const DOM::DOMString &value)
 {
 	m_attributes.replace(name.string(), new DOM::DOMString(value));

ksvg/impl/SVGElementImpl.h

@@ -62,7 +62,7 @@ public:
 	virtual ~SVGElementImpl();
 
 	// Attribute setting
-	// "Override" khtml's functions with ours
+	// "Override" tdehtml's functions with ours
 	void setAttribute(const DOM::DOMString &name, const DOM::DOMString &value);
 	void setAttributeInternal(const DOM::DOMString &name, const DOM::DOMString &value);
 	DOM::DOMString getAttribute(const DOM::DOMString &name) const;

ksvg/impl/SVGEventImpl.cc

@@ -346,7 +346,7 @@ SVGKeyEventImpl::SVGKeyEventImpl(TQKeyEvent *key, DOM::AbstractView &view, SVGEv
 	qKeyEvent = new TQKeyEvent(key->type(), key->key(), key->ascii(), key->state(), key->text(), key->isAutoRepeat(), key->count());
 
 	// Events are supposed to be accepted by default in TQt!
-	// This line made TQLineEdit's keyevents be ignored, so they were sent to the khtmlview
+	// This line made TQLineEdit's keyevents be ignored, so they were sent to the tdehtmlview
 	// (and e.g. space would make it scroll down)
 	//qKeyEvent->ignore();
 

ksvg/plugin/ksvg_factory.h

@@ -21,8 +21,8 @@
 #ifndef KSVGFactory_H
 #define KSVGFactory_H
 
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 
 class TDEAboutData;
 class TDEInstance;

ksvg/plugin/ksvg_plugin.h

@@ -22,7 +22,7 @@
 #define KSVGPlugin_H
 
 #include <tqobject.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 namespace KSVG
 {

ksvg/test/external/Makefile.am

@@ -6,8 +6,8 @@ bin_PROGRAMS = svgdisplay printnodetest
 
 svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc
 svgdisplay_LDADD =  $(LIB_TDECORE) ../../libksvg.la
-svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 printnodetest_SOURCES = printnodetest.cpp
 printnodetest_LDADD =  $(LIB_TDECORE) ../../libksvg.la
-printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

kview/CMakeLists.txt

@@ -39,5 +39,5 @@ install( FILES kviewui.rc DESTINATION ${DATA_INSTALL_DIR}/kview )
 
 tde_add_tdeinit_executable( kview AUTOMOC
   SOURCES kview.cpp main.cpp
-  LINK kparts-shared kutils-shared
+  LINK tdeparts-shared tdeutils-shared
 )

kview/config/plugins/CMakeLists.txt

@@ -29,6 +29,6 @@ install( FILES kviewpluginsconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kc
 
 tde_add_kpart( kcm_kviewpluginsconfig AUTOMOC
   SOURCES kviewpluginsconfig.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/kimageviewer/CMakeLists.txt

@@ -32,6 +32,6 @@ install( FILES
 tde_add_library( kimageviewer SHARED AUTOMOC
   SOURCES canvas.cpp viewer.cpp
   VERSION 0.0.0
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )

kview/kimageviewer/viewer.h

@@ -21,7 +21,7 @@
 #ifndef KIMAGEVIEWER_VIEWER_H
 #define KIMAGEVIEWER_VIEWER_H
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdemacros.h>
 namespace KParts
 {

kview/kview.cpp

@@ -25,9 +25,9 @@
 #include <kurl.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
-#include <kparts/plugin.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/part.h>
 #include <kapplication.h>
 #include <kaction.h>
 #include <kstdaction.h>

kview/kview.h

@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KParts {
 	class ReadWritePart;

kview/kviewcanvas/CMakeLists.txt

@@ -32,6 +32,6 @@ install( FILES kviewcanvas.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( libkviewcanvas AUTOMOC
   SOURCES kimageholder.cpp kimagecanvas.cpp
-  LINK kimageviewer-shared kutils-shared
+  LINK kimageviewer-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/kviewcanvas/test/Makefile.am

@@ -5,5 +5,5 @@ METASOURCES = AUTO
 check_PROGRAMS = test
 
 test_SOURCES = main.cpp test.cpp
-test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test_LDADD   = $(LIB_KPARTS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la

kview/kviewcanvas/test/test.cpp

@@ -9,7 +9,7 @@
 #include <kurl.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqimage.h>
 

kview/kviewcanvas/test/test.h

@@ -6,7 +6,7 @@
 #endif 
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
  
 namespace KImageViewer { class Canvas; };
 

kview/kviewviewer/CMakeLists.txt

@@ -35,6 +35,6 @@ tde_add_kpart( libkviewviewer AUTOMOC
   SOURCES
     printimagesettings.ui imagesettings.cpp
     kviewkonqextension.cpp kviewviewer.cpp
-  LINK kimageviewer-shared kutils-shared tdeprint-shared
+  LINK kimageviewer-shared tdeutils-shared tdeprint-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/kviewviewer/config/CMakeLists.txt

@@ -31,6 +31,6 @@ install( FILES
 
 tde_add_kpart( kcm_kviewviewerpluginsconfig AUTOMOC
   SOURCES kviewviewerpluginsconfig.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/kviewviewer/kviewkonqextension.h

@@ -20,7 +20,7 @@
 #ifndef __kviewkonqextension_h__
 #define __kviewkonqextension_h__
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KImageViewer { class Canvas; }
 class KViewViewer;

kview/kviewviewer/kviewviewer.cpp

@@ -40,9 +40,9 @@
 #include <kio/job.h>
 #include <kxmlguifactory.h>
 #include <kfiledialog.h>
-#include <kparts/genericfactory.h>
-#include <kparts/componentfactory.h>
-#include <kparts/plugin.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/plugin.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kapplication.h>
@@ -595,7 +595,7 @@ void KViewViewer::slotData( TDEIO::Job *, const TQByteArray & data )
 
 	//show partial image XXX: is this really the way to do it?
 	//No. :) It takes forever like this.
-	//OK. So I really have to look at khtml...
+	//OK. So I really have to look at tdehtml...
 	//later...
 	//m_pCanvas->setImage( TQImage( m_pBuffer->buffer() ) );
 }

kview/kviewviewer/test/Makefile.am

@@ -5,5 +5,5 @@ METASOURCES = AUTO
 check_PROGRAMS = test
 
 test_SOURCES = main.cpp test.cpp
-test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test_LDADD   = $(LIB_KPARTS)

kview/kviewviewer/test/test.cpp

@@ -8,7 +8,7 @@
 #include <kurl.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kapplication.h>
 
 #include <tqimage.h>

kview/kviewviewer/test/test.h

@@ -6,7 +6,7 @@
 #endif 
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KParts { class ReadWritePart; }
  

kview/modules/browser/CMakeLists.txt

@@ -33,6 +33,6 @@ install( FILES
 tde_add_kpart( kview_browserplugin AUTOMOC
   SOURCES
     kmyfileitemlist.cpp kviewbrowser.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/modules/browser/kviewbrowser.cpp

@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kimageviewer/viewer.h>
 #include <kimageviewer/canvas.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kapplication.h>
 #include <kimageio.h>
 

kview/modules/browser/kviewbrowser.h

@@ -20,7 +20,7 @@
 #ifndef __kviewbrowser_h
 #define __kviewbrowser_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kfileitem.h>
 
 namespace KImageViewer { class Viewer; }

kview/modules/effects/CMakeLists.txt

@@ -32,6 +32,6 @@ install( FILES
 
 tde_add_kpart( kview_effectsplugin AUTOMOC
   SOURCES kvieweffects.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/modules/effects/kvieweffects.h

@@ -5,7 +5,7 @@
 #ifndef KVIEWEFFECTS_H
 #define KVIEWEFFECTS_H
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <tqcolor.h>
 
 namespace KImageViewer { class Viewer; }

kview/modules/presenter/CMakeLists.txt

@@ -36,6 +36,6 @@ install( FILES
 tde_add_kpart( kview_presenterplugin AUTOMOC
   SOURCES
     imagelistitem.cpp imagelistdialog.ui kviewpresenter.cpp
-  LINK kio-shared kparts-shared
+  LINK kio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/modules/presenter/config/CMakeLists.txt

@@ -31,6 +31,6 @@ install( FILES
 
 tde_add_kpart( kcm_kviewpresenterconfig AUTOMOC
   SOURCES kviewpresenterconfig.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/modules/presenter/kviewpresenter.h

@@ -21,7 +21,7 @@
 #ifndef __kviewpresenter_h
 #define __kviewpresenter_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kurl.h>
 
 #include <tqsortedlist.h>

kview/modules/scale/kview_scale.h

@@ -21,7 +21,7 @@
 #ifndef __kview_scale_h
 #define __kview_scale_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 namespace KImageViewer {
 	class Viewer;

kview/modules/scanner/CMakeLists.txt

@@ -32,6 +32,6 @@ install( FILES
 
 tde_add_kpart( kview_scannerplugin AUTOMOC
   SOURCES kviewscanner.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/modules/scanner/kviewscanner.h

@@ -21,7 +21,7 @@
 #ifndef __kviewscanner_h
 #define __kviewscanner_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 
 class KURL;

kview/modules/template/kviewtemplate.h

@@ -5,7 +5,7 @@
 #ifndef __kviewtemplate_h
 #define __kviewtemplate_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 namespace KImageViewer { class Viewer; }
 

kview/photobook/CMakeLists.txt

@@ -31,6 +31,6 @@ install( FILES photobookui.rc DESTINATION ${DATA_INSTALL_DIR}/photobook )
 
 tde_add_kpart( libphotobook AUTOMOC
   SOURCES photobook.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kview/photobook/photobook.cpp

@@ -39,7 +39,7 @@ Copyright (c) 2004,2005 Charles Samuels <charles@kde.org>
 
 #include "photobook.h"
 
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kaction.h>
 #include <kstdaccel.h>
 #include <kstandarddirs.h>

kview/photobook/photobook.h

@@ -43,9 +43,9 @@ Copyright (c) 2004 Charles Samuels <charles@kde.org>
 #include <kfileiconview.h>
 #include <kdirlister.h>
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/genericfactory.h>
 
 class Previews;
 class PhotoBookPart;

kviewshell/CMakeLists.txt

@@ -30,13 +30,13 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kmultipageInterface.h
+    tdemultipageInterface.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 install( FILES
     anchor.h bookmark.h pageView.h documentPageCache.h
     documentRenderer.h documentWidget.h history.h hyperlink.h
-    kmultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h
+    tdemultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h
     renderedDocumentPagePixmap.h renderedDocumentPagePrinter.h
     selection.h simplePageSize.h textBox.h zoom.h zoomlimits.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/kviewshell )
@@ -46,7 +46,7 @@ install( FILES
 
 install( FILES kviewshell.rc DESTINATION ${DATA_INSTALL_DIR}/kviewshell )
 install( FILES kviewerpart.rc DESTINATION ${DATA_INSTALL_DIR}/kviewerpart )
-install( FILES kmultipage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+install( FILES tdemultipage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install( FILES emptymultipage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES kviewshell.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
@@ -67,18 +67,18 @@ tde_add_library( kviewshell STATIC_PIC AUTOMOC
 )
 
 
-##### kmultipage (shared) #######################
+##### tdemultipage (shared) #######################
 
-tde_add_library( kmultipage SHARED AUTOMOC
+tde_add_library( tdemultipage SHARED AUTOMOC
   SOURCES
-    kmultipage.cpp pageView.cpp marklist.cpp kmultipageInterface.skel
+    tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel
     units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp
     renderedDocumentPagePixmap.cpp renderedDocumentPagePrinter.cpp
     documentPageCache.cpp documentWidget.cpp searchWidget.cpp
     selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc
     tableOfContents.cpp kprintDialogPage_pageoptions.cpp
   VERSION 0.0.0
-  LINK kparts-shared tdeprint-shared
+  LINK tdeparts-shared tdeprint-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
@@ -91,7 +91,7 @@ tde_add_kpart( kviewerpart AUTOMOC
     pageSizeDialog.cpp pageSize.cpp sizePreview.cpp zoom.cpp
     units.cpp kvsprefs.kcfgc optionDialogGUIWidget_base.ui
     optionDialogAccessibilityWidget.ui simplePageSize.cpp
-  LINK ifaces-static kparts-shared
+  LINK ifaces-static tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -101,7 +101,7 @@ tde_add_kpart( kviewerpart AUTOMOC
 tde_add_executable( kviewshell AUTOMOC
   SOURCES
     main.cpp
-  LINK kviewshell-static kparts-shared
+  LINK kviewshell-static tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -111,7 +111,7 @@ tde_add_executable( kviewshell AUTOMOC
 tde_add_kpart( emptymultipagepart AUTOMOC
   SOURCES
     empty_multipage.cpp emptyRenderer.cpp
-  LINK kmultipage-shared
+  LINK tdemultipage-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )