diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:19 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:19 -0600 |
| commit | 00b4f54142276b0e2272ca56e48558551ab7b2b0 (patch) | |
| tree | 1d1054b59fc2e76d0c2bae00126bdf65d9318865 | |
| parent | c7549e238d15850306158ae153fc99126c84ab9d (diff) | |
| download | tdegraphics-00b4f54142276b0e2272ca56e48558551ab7b2b0.tar.gz tdegraphics-00b4f54142276b0e2272ca56e48558551ab7b2b0.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
119 files changed, 214 insertions, 214 deletions
diff --git a/kcoloredit/Makefile.am b/kcoloredit/Makefile.am index f45833e6..09028843 100644 --- a/kcoloredit/Makefile.am +++ b/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 \ diff --git a/kdvi/CMakeLists.txt b/kdvi/CMakeLists.txt index e726b97f..9c1ef8da 100644 --- a/kdvi/CMakeLists.txt +++ b/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} ) diff --git a/kdvi/Makefile.am b/kdvi/Makefile.am index 98f5e94f..ee2c8bc2 100644 --- a/kdvi/Makefile.am +++ b/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 diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index ca370a83..53a5d6df 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/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" diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h index dba4b3d2..812d56ce 100644 --- a/kdvi/kdvi_multipage.h +++ b/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> diff --git a/kdvi/main.cpp b/kdvi/main.cpp index 6b85af9d..51dc9306 100644 --- a/kdvi/main.cpp +++ b/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; diff --git a/kfax/Makefile.am b/kfax/Makefile.am index c99a3d53..01888a75 100644 --- a/kfax/Makefile.am +++ b/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) 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; diff --git a/kgamma/kcmkgamma/CMakeLists.txt b/kgamma/kcmkgamma/CMakeLists.txt index 6ec0ff8d..def674ad 100644 --- a/kgamma/kcmkgamma/CMakeLists.txt +++ b/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} ) diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt index cdf00f75..316f387e 100644 --- a/kghostview/CMakeLists.txt +++ b/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} ) diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am index 5cf5cc67..3d7faa44 100644 --- a/kghostview/Makefile.am +++ b/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 diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h index 8457c050..158ef0ec 100644 --- a/kghostview/kgv_view.h +++ b/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" diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp index dfeea82a..738fba57 100644 --- a/kghostview/kgvfactory.cpp +++ b/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> diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h index 1b2e0801..d0ac9550 100644 --- a/kghostview/kgvfactory.h +++ b/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; diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index ec2348fc..95aac5f9 100644 --- a/kghostview/kgvshell.cpp +++ b/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> diff --git a/kghostview/kgvshell.h b/kghostview/kgvshell.h index ea794e35..0f1fa60f 100644 --- a/kghostview/kgvshell.h +++ b/kghostview/kgvshell.h @@ -21,7 +21,7 @@ #include <tqstring.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class TQTimer; diff --git a/kiconedit/Makefile.am b/kiconedit/Makefile.am index 82783f2c..400e5446 100644 --- a/kiconedit/Makefile.am +++ b/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/* diff --git a/kmrml/kmrml/CMakeLists.txt b/kmrml/kmrml/CMakeLists.txt index 20f6edb5..b570b684 100644 --- a/kmrml/kmrml/CMakeLists.txt +++ b/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} ) diff --git a/kmrml/kmrml/browser.h b/kmrml/kmrml/browser.h index 1bfd3310..d19d1543 100644 --- a/kmrml/kmrml/browser.h +++ b/kmrml/kmrml/browser.h @@ -19,7 +19,7 @@ #ifndef BROWSER_H #define BROWSER_H -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> namespace KMrml { diff --git a/kmrml/kmrml/kcontrol/CMakeLists.txt b/kmrml/kmrml/kcontrol/CMakeLists.txt index 6db11a40..15f85e95 100644 --- a/kmrml/kmrml/kcontrol/CMakeLists.txt +++ b/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} ) diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index 33b5ea30..29e633a7 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/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> diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h index 605d23e7..822ca042 100644 --- a/kmrml/kmrml/mrml_part.h +++ b/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> diff --git a/kmrml/kmrml/server/CMakeLists.txt b/kmrml/kmrml/server/CMakeLists.txt index f51a9b80..337bede6 100644 --- a/kmrml/kmrml/server/CMakeLists.txt +++ b/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} ) diff --git a/kolourpaint/Makefile.am b/kolourpaint/Makefile.am index 11d1ee45..7cef8ebb 100644 --- a/kolourpaint/Makefile.am +++ b/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 \ diff --git a/kooka/CMakeLists.txt b/kooka/CMakeLists.txt index 37b3984b..24e3e091 100644 --- a/kooka/CMakeLists.txt +++ b/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} ) diff --git a/kooka/Makefile.am b/kooka/Makefile.am index dfb9622d..75a457e6 100644 --- a/kooka/Makefile.am +++ b/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) diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index a1c183bb..30186479 100644 --- a/kooka/kooka.cpp +++ b/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> diff --git a/kooka/kooka.h b/kooka/kooka.h index 634e6c53..5d8dc476 100644 --- a/kooka/kooka.h +++ b/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" diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 9be6b974..cc1c3af1 100644 --- a/kooka/kookaview.cpp +++ b/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> diff --git a/kooka/kookaview.h b/kooka/kookaview.h index 3b976fc0..aaccd74a 100644 --- a/kooka/kookaview.h +++ b/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" diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 9298aa75..f35d1057 100644 --- a/kooka/ksaneocr.cpp +++ b/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: diff --git a/kooka/ksaneocr.h b/kooka/ksaneocr.h index d01be364..bc6b610e 100644 --- a/kooka/ksaneocr.h +++ b/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; diff --git a/kooka/ocrword.cpp b/kooka/ocrword.cpp index e54feb6a..9ef393e9 100644 --- a/kooka/ocrword.cpp +++ b/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. diff --git a/kpdf/CMakeLists.txt b/kpdf/CMakeLists.txt index 5b76c014..ccef1e04 100644 --- a/kpdf/CMakeLists.txt +++ b/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} ) diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 2f1f857f..1f03d9c0 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/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> diff --git a/kpdf/part.cpp b/kpdf/part.cpp index d20498fb..f36d6ce5 100644 --- a/kpdf/part.cpp +++ b/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> diff --git a/kpdf/part.h b/kpdf/part.h index a7a65799..426c89f4 100644 --- a/kpdf/part.h +++ b/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" diff --git a/kpdf/shell/CMakeLists.txt b/kpdf/shell/CMakeLists.txt index 59f84caa..74553840 100644 --- a/kpdf/shell/CMakeLists.txt +++ b/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} ) diff --git a/kpdf/shell/Makefile.am b/kpdf/shell/Makefile.am index ed901f6e..8ee058b4 100644 --- a/kpdf/shell/Makefile.am +++ b/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 diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index ed0fc8fc..5491321e 100644 --- a/kpdf/shell/shell.cpp +++ b/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> diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h index b6bbf499..6fc2a21e 100644 --- a/kpdf/shell/shell.h +++ b/kpdf/shell/shell.h @@ -20,7 +20,7 @@ #include <config.h> #endif -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> namespace KPDF { diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index cc40fdb2..7b4d0e75 100644 --- a/kpdf/ui/pageview.cpp +++ b/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 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> diff --git a/kruler/Makefile.am b/kruler/Makefile.am index bcdb32f0..72955deb 100644 --- a/kruler/Makefile.am +++ b/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 diff --git a/ksnapshot/Makefile.am b/ksnapshot/Makefile.am index cb687823..50e9b672 100644 --- a/ksnapshot/Makefile.am +++ b/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 \ diff --git a/ksvg/CMakeLists.txt b/ksvg/CMakeLists.txt index c9cf25a9..3f1c88bc 100644 --- a/ksvg/CMakeLists.txt +++ b/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} ) diff --git a/ksvg/core/CanvasFactory.cpp b/ksvg/core/CanvasFactory.cpp index d1278334..3c331060 100644 --- a/ksvg/core/CanvasFactory.cpp +++ b/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" diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp index a8504b80..979e7fed 100644 --- a/ksvg/ecma/ksvg_window.cpp +++ b/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; diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h index 5340dc9a..11655d7e 100644 --- a/ksvg/ecma/ksvg_window.h +++ b/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 { diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc index 940790f2..fe013f0a 100644 --- a/ksvg/impl/SVGElementImpl.cc +++ b/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)); diff --git a/ksvg/impl/SVGElementImpl.h b/ksvg/impl/SVGElementImpl.h index a12098ab..011b8b4b 100644 --- a/ksvg/impl/SVGElementImpl.h +++ b/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; diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cc index e1252af8..b5b79fc9 100644 --- a/ksvg/impl/SVGEventImpl.cc +++ b/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(); diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h index 677bab38..c756bd66 100644 --- a/ksvg/plugin/ksvg_factory.h +++ b/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; diff --git a/ksvg/plugin/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h index 5b9f4713..405bedaf 100644 --- a/ksvg/plugin/ksvg_plugin.h +++ b/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 { diff --git a/ksvg/test/external/Makefile.am b/ksvg/test/external/Makefile.am index bd6712ab..49648281 100644 --- a/ksvg/test/external/Makefile.am +++ b/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 diff --git a/kview/CMakeLists.txt b/kview/CMakeLists.txt index 1d34c3ef..c038f009 100644 --- a/kview/CMakeLists.txt +++ b/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 ) diff --git a/kview/config/plugins/CMakeLists.txt b/kview/config/plugins/CMakeLists.txt index ea2652f5..f7c4672a 100644 --- a/kview/config/plugins/CMakeLists.txt +++ b/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} ) diff --git a/kview/kimageviewer/CMakeLists.txt b/kview/kimageviewer/CMakeLists.txt index acf28e9b..e910c560 100644 --- a/kview/kimageviewer/CMakeLists.txt +++ b/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} ) diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h index 8920b82c..790a102c 100644 --- a/kview/kimageviewer/viewer.h +++ b/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 { diff --git a/kview/kview.cpp b/kview/kview.cpp index ee2cf3b5..9aa38524 100644 --- a/kview/kview.cpp +++ b/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> diff --git a/kview/kview.h b/kview/kview.h index aed0a54f..dd5bacd7 100644 --- a/kview/kview.h +++ b/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; diff --git a/kview/kviewcanvas/CMakeLists.txt b/kview/kviewcanvas/CMakeLists.txt index 019496e3..3b8f4704 100644 --- a/kview/kviewcanvas/CMakeLists.txt +++ b/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} ) diff --git a/kview/kviewcanvas/test/Makefile.am b/kview/kviewcanvas/test/Makefile.am index d00efc03..277bfd48 100644 --- a/kview/kviewcanvas/test/Makefile.am +++ b/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 diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp index 3d24cbce..01ac6e43 100644 --- a/kview/kviewcanvas/test/test.cpp +++ b/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> diff --git a/kview/kviewcanvas/test/test.h b/kview/kviewcanvas/test/test.h index 6fe7737b..7a3f80ed 100644 --- a/kview/kviewcanvas/test/test.h +++ b/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; }; diff --git a/kview/kviewviewer/CMakeLists.txt b/kview/kviewviewer/CMakeLists.txt index aea04495..78829f61 100644 --- a/kview/kviewviewer/CMakeLists.txt +++ b/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} ) diff --git a/kview/kviewviewer/config/CMakeLists.txt b/kview/kviewviewer/config/CMakeLists.txt index 34a7e4a6..d3640df6 100644 --- a/kview/kviewviewer/config/CMakeLists.txt +++ b/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} ) diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h index f49f577d..e46e78f6 100644 --- a/kview/kviewviewer/kviewkonqextension.h +++ b/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; diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index 7db68102..3e3c7085 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/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() ) ); } diff --git a/kview/kviewviewer/test/Makefile.am b/kview/kviewviewer/test/Makefile.am index 65c3527f..197e9cea 100644 --- a/kview/kviewviewer/test/Makefile.am +++ b/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) diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp index 2bc20372..dfcdc918 100644 --- a/kview/kviewviewer/test/test.cpp +++ b/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> diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h index ab5d700b..b3a24c91 100644 --- a/kview/kviewviewer/test/test.h +++ b/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; } diff --git a/kview/modules/browser/CMakeLists.txt b/kview/modules/browser/CMakeLists.txt index 92be6333..efa48578 100644 --- a/kview/modules/browser/CMakeLists.txt +++ b/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} ) diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index 936061eb..ea12d237 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/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> diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h index 74646b87..985ec564 100644 --- a/kview/modules/browser/kviewbrowser.h +++ b/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; } diff --git a/kview/modules/effects/CMakeLists.txt b/kview/modules/effects/CMakeLists.txt index 1ae9d4b6..b871c6ad 100644 --- a/kview/modules/effects/CMakeLists.txt +++ b/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} ) diff --git a/kview/modules/effects/kvieweffects.h b/kview/modules/effects/kvieweffects.h index 711df909..461b9c0f 100644 --- a/kview/modules/effects/kvieweffects.h +++ b/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; } diff --git a/kview/modules/presenter/CMakeLists.txt b/kview/modules/presenter/CMakeLists.txt index df85ed6c..a34cc893 100644 --- a/kview/modules/presenter/CMakeLists.txt +++ b/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} ) diff --git a/kview/modules/presenter/config/CMakeLists.txt b/kview/modules/presenter/config/CMakeLists.txt index 28bb691f..b8dfc56a 100644 --- a/kview/modules/presenter/config/CMakeLists.txt +++ b/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} ) diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h index fa2cb9c4..2fff82c1 100644 --- a/kview/modules/presenter/kviewpresenter.h +++ b/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> diff --git a/kview/modules/scale/kview_scale.h b/kview/modules/scale/kview_scale.h index 659a2270..6834cda5 100644 --- a/kview/modules/scale/kview_scale.h +++ b/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; diff --git a/kview/modules/scanner/CMakeLists.txt b/kview/modules/scanner/CMakeLists.txt index aa2f0c8d..e4b4cb67 100644 --- a/kview/modules/scanner/CMakeLists.txt +++ b/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} ) diff --git a/kview/modules/scanner/kviewscanner.h b/kview/modules/scanner/kviewscanner.h index 5052c591..c34bc0d3 100644 --- a/kview/modules/scanner/kviewscanner.h +++ b/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; diff --git a/kview/modules/template/kviewtemplate.h b/kview/modules/template/kviewtemplate.h index e8ed567b..68084058 100644 --- a/kview/modules/template/kviewtemplate.h +++ b/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; } diff --git a/kview/photobook/CMakeLists.txt b/kview/photobook/CMakeLists.txt index b5d781d8..bb7f2913 100644 --- a/kview/photobook/CMakeLists.txt +++ b/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} ) diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index a08f871a..f90d50dd 100644 --- a/kview/photobook/photobook.cpp +++ b/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> diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index b7c8ee63..7faaaa32 100644 --- a/kview/photobook/photobook.h +++ b/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; diff --git a/kviewshell/CMakeLists.txt b/kviewshell/CMakeLists.txt index 8a9de930..3ad83e46 100644 --- a/kviewshell/CMakeLists.txt +++ b/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} ) diff --git a/kviewshell/Makefile.am b/kviewshell/Makefile.am index 5be569e4..a9691440 100644 --- a/kviewshell/Makefile.am +++ b/kviewshell/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS = . pics plugins INCLUDES= $(all_includes) -include_HEADERS = kmultipageInterface.h +include_HEADERS = tdemultipageInterface.h ####### Files bin_PROGRAMS = kviewshell -lib_LTLIBRARIES = libkmultipage.la +lib_LTLIBRARIES = libtdemultipage.la kde_module_LTLIBRARIES = kviewerpart.la emptymultipagepart.la noinst_LTLIBRARIES = libifaces.la libkviewshell.la @@ -18,9 +18,9 @@ kviewerpart_la_SOURCES = kviewpart.cpp pageSizeWidget_base.ui \ optionDialogGUIWidget_base.ui optionDialogAccessibilityWidget.ui simplePageSize.cpp kviewerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -lkparts +kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -ltdeparts -libkmultipage_la_SOURCES = kmultipage.cpp pageView.cpp marklist.cpp kmultipageInterface.skel \ +libtdemultipage_la_SOURCES = 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 \ @@ -29,21 +29,21 @@ libkmultipage_la_SOURCES = kmultipage.cpp pageView.cpp marklist.cpp kmultipageIn kde_kcfg_DATA = kviewshell.kcfg -libkmultipage_la_LDFLAGS = $(all_libraries) -libkmultipage_la_LIBADD = $(LIB_KFILE) -ltdeprint -lkparts +libtdemultipage_la_LDFLAGS = $(all_libraries) +libtdemultipage_la_LIBADD = $(LIB_KFILE) -ltdeprint -ltdeparts emptymultipagepart_la_SOURCES = empty_multipage.cpp emptyRenderer.cpp emptymultipagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la +emptymultipagepart_la_LIBADD = -ltdeparts libtdemultipage.la libkviewshell_la_SOURCES = kviewshell.cpp kviewshell_SOURCES = main.cpp -kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kviewshell_LDADD = libkviewshell.la ./libifaces.la -lkparts +kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kviewshell_LDADD = libkviewshell.la ./libifaces.la -ltdeparts kviewshellinclude_HEADERS = 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 renderedDocumentPagePixmap.h \ + history.h hyperlink.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 kviewshellincludedir = $(includedir)/kviewshell @@ -55,7 +55,7 @@ rcdir = $(kde_datadir)/kviewshell partrc_DATA = kviewerpart.rc partrcdir = $(kde_datadir)/kviewerpart -servicetype_DATA = kmultipage.desktop +servicetype_DATA = tdemultipage.desktop servicetypedir = $(kde_servicetypesdir) kde_services_DATA = emptymultipage.desktop diff --git a/kviewshell/TODO b/kviewshell/TODO index b6139962..4e587fed 100644 --- a/kviewshell/TODO +++ b/kviewshell/TODO @@ -44,7 +44,7 @@ uses that to implement inverse and forward search functionality. We must somehow make sure that even these unusual features fit well into our framework without too much of an effort. -* kmultipage +* tdemultipage - kviewshell should provide a print dialog (with the extra option that certain document formats can insert their own configuration pages). I @@ -70,7 +70,7 @@ applications that demonstrate how everything works. In particular, we should have * lots of documentation, including API documentation and a tutorial on -"How to implement a kmultipage" +"How to implement a tdemultipage" * an exteremely well-defined reference implementation for a trivial file format, either one that is actually useful (kfax, perhaps), or @@ -87,7 +87,7 @@ KVIEWSHELL APPLICATION * improve command line interface. The somewhat antique method of giving the library name in the command line should be replaced by a more modern method where kviewshell uses some kde wizardy -(e.g. 'services') so that installed kmultipage implementations can +(e.g. 'services') so that installed tdemultipage implementations can announce what mime type they are supposed to handle, and kvieshell then loads them automatically diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h index b27fb1b6..5f425ec8 100644 --- a/kviewshell/empty_multipage.h +++ b/kviewshell/empty_multipage.h @@ -21,10 +21,10 @@ #ifndef EMPTY_MULTIPAGE_H #define EMPTY_MULTIPAGE_H -#include "kmultipage.h" +#include "tdemultipage.h" #include "emptyRenderer.h" -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> class EmptyMultiPage : public KMultiPage diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp index c0c4b15e..1086b83f 100644 --- a/kviewshell/kprintDialogPage_pageoptions.cpp +++ b/kviewshell/kprintDialogPage_pageoptions.cpp @@ -102,7 +102,7 @@ void KPrintDialogPage_PageOptions::getOptions( TQMap<TQString,TQString>& opts, b // Save options, taking default values into consideration: by // default "center" is checked, "expand" and "shrink" are // not. Warning: The default values are also coded into setOptions() - // and kmultipage::print(..). + // and tdemultipage::print(..). if (checkBox_center != 0) if ( incldef || !checkBox_center->isChecked() ) @@ -138,7 +138,7 @@ void KPrintDialogPage_PageOptions::setOptions( const TQMap<TQString,TQString>& o { // Sets the centering option. By default, this option is // checked. Warning: All default values are also coded into - // getOptions() and kmultipage::print(..). + // getOptions() and tdemultipage::print(..). TQString op = opts[ "kde-kviewshell-centerpage" ]; if (checkBox_center != 0) checkBox_center->setChecked( op != "false" ); diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 847a8ff8..f76c5dd2 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -26,9 +26,9 @@ #include <kiconloader.h> #include <kmessagebox.h> #include <kmimetype.h> -#include <kparts/componentfactory.h> -#include <kparts/genericfactory.h> -#include <kparts/partmanager.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/genericfactory.h> +#include <tdeparts/partmanager.h> #include <kprogress.h> #include <kstandarddirs.h> #include <kstdaction.h> @@ -41,7 +41,7 @@ #include <math.h> #include "kviewpart.h" -#include "kmultipage.h" +#include "tdemultipage.h" #include "pageSize.h" #include "pageSizeDialog.h" #include "zoomlimits.h" diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h index 1ea8aafd..cf66e69d 100644 --- a/kviewshell/kviewpart.h +++ b/kviewshell/kviewpart.h @@ -6,7 +6,7 @@ #include "pageSize.h" #include "zoom.h" -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <tqtimer.h> class TDEAboutData; @@ -71,7 +71,7 @@ public slots: virtual TQStringList fileFormats() const; void setStatusBarTextFromMultiPage(const TQString &); - /** Calling this slot will cause the kmultipage to reload the file */ + /** Calling this slot will cause the tdemultipage to reload the file */ void reload(); void restoreDocument(const KURL &url, int page); diff --git a/kviewshell/kviewpart_iface.h b/kviewshell/kviewpart_iface.h index bef0d233..009552f1 100644 --- a/kviewshell/kviewpart_iface.h +++ b/kviewshell/kviewpart_iface.h @@ -2,7 +2,7 @@ #ifndef KVIEWPART_IFACE_H #define KVIEWPART_IFACE_H -#include <kparts/part.h> +#include <tdeparts/part.h> class TQStringList; diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 26f1e20b..b155e73e 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -25,7 +25,7 @@ #include <kstdaction.h> #include <kedittoolbar.h> #include <kurldrag.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <kmimetype.h> #include <kprogress.h> diff --git a/kviewshell/kviewshell.h b/kviewshell/kviewshell.h index 064c4da1..40cf3244 100644 --- a/kviewshell/kviewshell.h +++ b/kviewshell/kviewshell.h @@ -4,7 +4,7 @@ #include <tqstring.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class KRecentFilesAction; class KURL; diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp index 132cbfda..a78f3620 100644 --- a/kviewshell/main.cpp +++ b/kviewshell/main.cpp @@ -114,7 +114,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(1223) << "There was an error using DCOP." << endl; else { @@ -124,7 +124,7 @@ int main(int argc, char **argv) reply >> result; if (result == true) { - if (app.dcopClient()->send(*it, "kmultipage", "jumpToReference(TQString)", args->url(0).ref()) == true) + if (app.dcopClient()->send(*it, "tdemultipage", "jumpToReference(TQString)", args->url(0).ref()) == true) { app.dcopClient()->detach(); return 0; 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" ]; diff --git a/kviewshell/kmultipage.cpp b/kviewshell/tdemultipage.cpp index 4d544df9..b6b98855 100644 --- a/kviewshell/kmultipage.cpp +++ b/kviewshell/tdemultipage.cpp @@ -24,7 +24,7 @@ #include "tableOfContents.h" #include "kprintDialogPage_pageoptions.h" #include "kvsprefs.h" -#include "kmultipage.h" +#include "tdemultipage.h" #include "pageNumber.h" #include "renderedDocumentPagePrinter.h" #include "searchWidget.h" @@ -35,13 +35,13 @@ //#define DEBUG_KMULTIPAGE KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name) - : DCOPObject("kmultipage"), KParts::ReadOnlyPart(parent, name) + : DCOPObject("tdemultipage"), KParts::ReadOnlyPart(parent, name) { // For reasons which I don't understand, the initialization of the // DCOPObject above does not work properly, the name is ignored. It // works fine if we repeat the name here. -- Stefan Kebekus // This is because of the virtual inheritance. Get rid of it (but it's BC, and this is a lib...) -- DF - setObjId("kmultipage"); + setObjId("tdemultipage"); parentWdg = parentWidget; lastCurrentPage = 0; @@ -256,7 +256,7 @@ void KMultiPage::slotSetFullPage(bool fullpage) void KMultiPage::preferencesChanged() { // We need to read the config options otherwise the KVSPrefs-object would - // not be syncronized between the kviewpart and the kmultipage. + // not be syncronized between the kviewpart and the tdemultipage. KVSPrefs::self()->readConfig(); slotShowThumbnails(KVSPrefs::showThumbnails()); @@ -1837,7 +1837,7 @@ KPrinter *KMultiPage::getPrinter(bool enablePageSizeFeatures) } // Allocate a new KPrintDialogPage structure and add it to the - // printer, if the kmultipage implementation requests that + // printer, if the tdemultipage implementation requests that if (enablePageSizeFeatures == true) { KPrintDialogPage_PageOptions *pageOptions = new KPrintDialogPage_PageOptions(); if (pageOptions == 0) { @@ -1973,4 +1973,4 @@ void KMultiPage::slotEnableMoveTool(bool enable) emit enableMoveTool(enable); } -#include "kmultipage.moc" +#include "tdemultipage.moc" diff --git a/kviewshell/kmultipage.desktop b/kviewshell/tdemultipage.desktop index 0ef915a9..0ef915a9 100644 --- a/kviewshell/kmultipage.desktop +++ b/kviewshell/tdemultipage.desktop diff --git a/kviewshell/kmultipage.h b/kviewshell/tdemultipage.h index 8dbd8247..ac3e6b02 100644 --- a/kviewshell/kmultipage.h +++ b/kviewshell/tdemultipage.h @@ -6,10 +6,10 @@ #include "documentPageCache.h" #include "documentRenderer.h" #include "history.h" -#include "kmultipageInterface.h" +#include "tdemultipageInterface.h" #include "marklist.h" -#include <kparts/part.h> +#include <tdeparts/part.h> #include <tqtimer.h> class Anchor; @@ -34,7 +34,7 @@ class SearchWidget; */ // TODO remove virtual inheritance for KDE 4. It's the reason for the strange DCOPObject construction -class KMultiPage : public KParts::ReadOnlyPart, virtual public kmultipageInterface +class KMultiPage : public KParts::ReadOnlyPart, virtual public tdemultipageInterface { Q_OBJECT @@ -47,23 +47,23 @@ public: virtual TQWidget* mainWidget() {return _scrollView;} /* Methods which are associated with the DCOP functionality of the - kmultipage. This method returns the file name (not the URL) of + tdemultipage. This method returns the file name (not the URL) of the currently loaded file. */ TQString name_of_current_file(); /* Methods which are associated with the DCOP functionality of the - kmultipage. This method can be implemented by the multipage, + tdemultipage. This method can be implemented by the multipage, e.g. to jump to a certain location. */ virtual ASYNC jumpToReference(const TQString& /*reference*/); /* Methods which are associated with the DCOP functionality of the - kmultipage. This method checks if a given file is loaded. */ + tdemultipage. This method checks if a given file is loaded. */ bool is_file_loaded(const TQString& filename); /* Opens file and sets URL This method does the same as openFile, but sets the m_url of the - kmultipage. This can be important, for the following reason: + tdemultipage. This can be important, for the following reason: assume that a DVI is or DJVU-file is located on a web server at baseURL=http://www.x.x/x.dvi The file may refer to external graphic files using relative links. @@ -179,7 +179,7 @@ public: @endcode For more information, see the default implementation in the source - file kmultipage.cpp. You might also look at the documentation to + file tdemultipage.cpp. You might also look at the documentation to getPrinter(). */ virtual void print(); @@ -319,7 +319,7 @@ protected: /** Update GUI after loading or closing of a file This method is called by openFile() when a new file was loaded, - and by closeURL() when a file is closed so that the kmultipage + and by closeURL() when a file is closed so that the tdemultipage implementation can update its own GUI, enable/disable actions, prepare info texts, etc. At the time the method is executed, the file has already been loaded into the renderer using @@ -593,7 +593,7 @@ private slots: private: /* For internal use by the reload()-method. See the comments in - kmultipage.cpp, right before the timerEvent function. */ + tdemultipage.cpp, right before the timerEvent function. */ int timer_id; /* For internal use the reload()-method. This is a dreadful @@ -618,7 +618,7 @@ private: void timerEvent( TQTimerEvent *e ); /* This method opens a file and sets up the GUI when the file is - loaded. It calls setFile() so that implementations of kmultipage + loaded. It calls setFile() so that implementations of tdemultipage can update their own GUI. DO NOT REIMPLEMENT THIS METHOD. */ bool openFile(); diff --git a/kviewshell/kmultipageInterface.h b/kviewshell/tdemultipageInterface.h index 4c498900..e9dabf0f 100644 --- a/kviewshell/kmultipageInterface.h +++ b/kviewshell/tdemultipageInterface.h @@ -1,10 +1,10 @@ // -*- C++ -*- -#ifndef kmultipageINTERFACE_H -#define kmultipageINTERFACE_H +#ifndef tdemultipageINTERFACE_H +#define tdemultipageINTERFACE_H #include <dcopobject.h> -class kmultipageInterface : virtual public DCOPObject +class tdemultipageInterface : virtual public DCOPObject { K_DCOP |