diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:40 -0600 |
| commit | 82072ef281de2d5948a42fb69ae800d47e0800be (patch) | |
| tree | be82dd63affaf693c5e0857c997fa9589d344cc2 | |
| parent | 93ec82602aa008218cc1ee075ff13d65b3a317ea (diff) | |
| download | tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.tar.gz tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
156 files changed, 401 insertions, 401 deletions
diff --git a/configure.in.in b/configure.in.in index e0a96875..543b6d63 100644 --- a/configure.in.in +++ b/configure.in.in @@ -190,7 +190,7 @@ dnl ********** AC_DEFUN([QUANTA_CHECK_MDI], [ - AC_MSG_CHECKING(whether to use kmdi lib from tdelibs) + AC_MSG_CHECKING(whether to use tdemdi lib from tdelibs) AC_CACHE_VAL(ac_cv_mdi_setup, [ AC_LANG_SAVE @@ -214,14 +214,14 @@ AC_DEFUN([QUANTA_CHECK_MDI], ]) if test "$ac_cv_mdi_setup" = "yes"; then - LIB_KMDI="-lkmdi" + LIB_KMDI="-ltdemdi" QEXTMDI_SUBDIR="" KMDI_INCLUDES="" AC_MSG_RESULT(yes) else - LIB_KMDI='$(top_builddir)/lib/compatibility/kmdi/libquantakmdi.la' - QEXTMDI_SUBDIR="kmdi" - KMDI_INCLUDES='-I$(top_srcdir)/lib/compatibility/kmdi/qextmdi' + LIB_KMDI='$(top_builddir)/lib/compatibility/tdemdi/libquantatdemdi.la' + QEXTMDI_SUBDIR="tdemdi" + KMDI_INCLUDES='-I$(top_srcdir)/lib/compatibility/tdemdi/qextmdi' CXXFLAGS="$CXXFLAGS -DCOMPAT_KMDI" AC_MSG_RESULT(no) fi @@ -232,7 +232,7 @@ AC_DEFUN([QUANTA_CHECK_MDI], AM_CONDITIONAL(include_qextmdi, test -n "$QEXTMDI_SUBDIR") ]) -dnl Check if kmdi is present, if not use giden's one +dnl Check if tdemdi is present, if not use giden's one QUANTA_CHECK_MDI KDE_CHECK_HEADER(cvsservice_stub.h, [cvsservice_stub_h="found"], [cvsservice_stub_h="none"]) diff --git a/doc/quanta/adv-quanta.docbook b/doc/quanta/adv-quanta.docbook index d3a142ac..5aefad44 100644 --- a/doc/quanta/adv-quanta.docbook +++ b/doc/quanta/adv-quanta.docbook @@ -290,7 +290,7 @@ replace and .png for the replacement string. </sect2> </sect1> --> -<sect1 id="kparts-3-2"> +<sect1 id="tdeparts-3-2"> <sect1info> <title>Using Plugins</title> <authorgroup> diff --git a/doc/quanta/config-quanta.docbook b/doc/quanta/config-quanta.docbook index 3ba20ea0..95636629 100644 --- a/doc/quanta/config-quanta.docbook +++ b/doc/quanta/config-quanta.docbook @@ -120,6 +120,6 @@ The place to define abbreviations (some kind of templates), that can be expanded <listitem><para><guilabel>Validate plugin:</guilabel> if checked, &quantaplus; will test if the entered information is correct or not. Uncheck if the plugin is not yet available, but you will install later, so you can close the dialog.</para></listitem> </itemizedlist> </para> - <para>See <xref linkend="plugins-menu-3-2" /> and <xref linkend="kparts-3-2" /> for information about using the plugins.</para> + <para>See <xref linkend="plugins-menu-3-2" /> and <xref linkend="tdeparts-3-2" /> for information about using the plugins.</para> </sect1> </chapter> diff --git a/kfilereplace/CMakeLists.txt b/kfilereplace/CMakeLists.txt index 0748dec8..2ca35794 100644 --- a/kfilereplace/CMakeLists.txt +++ b/kfilereplace/CMakeLists.txt @@ -41,7 +41,7 @@ tde_add_kpart( libkfilereplacepart AUTOMOC kfilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui knewprojectdlg.cpp knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui kfilereplacelib.cpp report.cpp - LINK kio-shared kparts-shared + LINK kio-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -51,6 +51,6 @@ tde_add_kpart( libkfilereplacepart AUTOMOC tde_add_executable( kfilereplace AUTOMOC SOURCES kfilereplace.cpp main.cpp - LINK kio-shared kparts-shared + LINK kio-shared tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kfilereplace/Makefile.am b/kfilereplace/Makefile.am index d758e866..4e0d8ed1 100644 --- a/kfilereplace/Makefile.am +++ b/kfilereplace/Makefile.am @@ -21,7 +21,7 @@ libkfilereplacepart_la_SOURCES = kfilereplacepart.cpp kfilereplaceview.cpp \ knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui kfilereplacelib.cpp report.cpp \ commandengine.cpp configurationclasses.cpp -libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP libkfilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) messages: rc.cpp @@ -38,6 +38,6 @@ partrc_DATA = kfilereplacepartui.rc shellrcdir = $(kde_datadir)/kfilereplace shellrc_DATA = kfilereplaceui.rc bin_PROGRAMS = kfilereplace -kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP kfilereplace_LDADD = $(LIB_KPARTS) kfilereplace_SOURCES = kfilereplace.cpp main.cpp diff --git a/kfilereplace/kfilereplace.h b/kfilereplace/kfilereplace.h index 2ba946a1..5623d3bf 100644 --- a/kfilereplace/kfilereplace.h +++ b/kfilereplace/kfilereplace.h @@ -16,7 +16,7 @@ #ifndef KFILEREPLACE_H #define KFILEREPLACE_H -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> /** Shell application for the KFileReplace part. diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index 49730efa..ed01399a 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -32,7 +32,7 @@ #include <kio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kglobal.h> diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h index 57e1706d..cc427153 100644 --- a/kfilereplace/kfilereplacepart.h +++ b/kfilereplace/kfilereplacepart.h @@ -18,7 +18,7 @@ // QT // KDE -#include <kparts/part.h> +#include <tdeparts/part.h> class KAboutApplication; class TDEAboutData; class TDEConfig; diff --git a/kimagemapeditor/Makefile.am b/kimagemapeditor/Makefile.am index 3103375b..11c6e6d2 100644 --- a/kimagemapeditor/Makefile.am +++ b/kimagemapeditor/Makefile.am @@ -38,10 +38,10 @@ noinst_HEADERS = \ kimeshell.h -libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP libkimagemapeditor_la_LIBADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) -kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP kimagemapeditor_LDADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) # set the include path for X, qt and KDE diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 3093e7a3..c4d698c5 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -77,7 +77,7 @@ #include "mapslistview.h" #include "kimecommon.h" -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kinstance.h> // Factory code for KDE 3 diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index 34c7b0fc..17401b29 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -23,9 +23,9 @@ #include <tqdict.h> #include <tqimage.h> #include <kurl.h> -#include <kparts/part.h> -#include <kparts/browserextension.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/factory.h> #include <tdeversion.h> diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index 02464423..665984ea 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -38,8 +38,8 @@ #include <klocale.h> #include <kdebug.h> #include <kapplication.h> -#include <khtmlview.h> -#include <khtml_part.h> +#include <tdehtmlview.h> +#include <tdehtml_part.h> #include <ktempfile.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kimagemapeditor/kimeshell.h b/kimagemapeditor/kimeshell.h index 8eaf4a3c..154edb59 100644 --- a/kimagemapeditor/kimeshell.h +++ b/kimagemapeditor/kimeshell.h @@ -18,7 +18,7 @@ #ifndef KIMESHELL_H #define KIMESHELL_H -#include <kparts/dockmainwindow.h> +#include <tdeparts/dockmainwindow.h> class KImageMapEditor; diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 2168b0b6..47a45ca6 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -35,7 +35,7 @@ #include <kmimetype.h> #include <kapplication.h> #include <klocale.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <dom/html_misc.h> #include <dom/dom_node.h> #include <dom/dom_string.h> diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 591b3acd..41596978 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -21,7 +21,7 @@ #include <kapplication.h> #include <kdebug.h> #include <klocale.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kprotocolmanager.h> #include <tqstring.h> diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h index f12ad736..4025d820 100644 --- a/klinkstatus/src/klinkstatus.h +++ b/klinkstatus/src/klinkstatus.h @@ -26,7 +26,7 @@ #endif #include <kapplication.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class KToggleAction; diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index 2b1ea9a4..78c72716 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -24,8 +24,8 @@ #include <kaction.h> #include <kstdaction.h> #include <kfiledialog.h> -#include <kparts/genericfactory.h> -#include <kparts/factory.h> +#include <tdeparts/genericfactory.h> +#include <tdeparts/factory.h> #include <kstandarddirs.h> #include <kaboutapplication.h> #include <kbugreport.h> diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h index c27a948e..f7402dc1 100644 --- a/klinkstatus/src/klinkstatus_part.h +++ b/klinkstatus/src/klinkstatus_part.h @@ -21,7 +21,7 @@ #ifndef _KLINKSTATUSPART_H_ #define _KLINKSTATUSPART_H_ -#include <kparts/part.h> +#include <tdeparts/part.h> class TabWidgetSession; class ActionManager; diff --git a/kommander/editor/Makefile.am b/kommander/editor/Makefile.am index 65ea192b..8e03b205 100644 --- a/kommander/editor/Makefile.am +++ b/kommander/editor/Makefile.am @@ -7,13 +7,13 @@ bin_PROGRAMS = kmdr-editor AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/widgets -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory -Ishared -Iinterfaces -Ipics $(all_includes) # the library search path. -kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) # the libraries to link against. kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \ $(top_builddir)/kommander/widget/libkommanderwidget.la \ $(top_builddir)/kommander/widgets/libkommanderwidgets.la \ - $(top_builddir)/kommander/plugin/libkommanderplugin.la -lktexteditor + $(top_builddir)/kommander/plugin/libkommanderplugin.la -ltdetexteditor # which sources should be compiled for kmdr_editor kmdr_editor_SOURCES = actiondnd.cpp actioneditorimpl.cpp \ diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 334fa177..4cbaeb08 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -28,15 +28,15 @@ #include <kactioncollection.h> #include <kdebug.h> -#include <ktexteditor/view.h> -#include <ktexteditor/editorchooser.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/highlightinginterface.h> -#include <ktexteditor/popupmenuinterface.h> -#include <ktexteditor/undointerface.h> - -#include <kparts/partmanager.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/editorchooser.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/highlightinginterface.h> +#include <tdetexteditor/popupmenuinterface.h> +#include <tdetexteditor/undointerface.h> + +#include <tdeparts/partmanager.h> /* QT INCLUDES */ #include <tqstringlist.h> diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 36d23b04..608049ed 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -85,7 +85,7 @@ #include <kstatusbar.h> #include <ktoolbar.h> #include <kurl.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <kio/netaccess.h> extern TQMap<TQWidget*, TQString> *qwf_functions; diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h index 17d04063..790f33b1 100644 --- a/kommander/editor/mainwindow.h +++ b/kommander/editor/mainwindow.h @@ -22,7 +22,7 @@ #include "metadatabase.h" -#include <kparts/dockmainwindow.h> +#include <tdeparts/dockmainwindow.h> #include <kdockwidget.h> #include <tqmap.h> diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index 8be705a8..749f5d3b 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -74,9 +74,9 @@ #include <kstdguiitem.h> #include <kurl.h> -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> -#include <ktexteditor/configinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/configinterface.h> #include <stdlib.h> diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 12cfe3c2..7e9c9b03 100755 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -181,8 +181,8 @@ while chrs < maxc do inlink = true lb = str_toint(str_find(a, "\"", ch)+1) le = str_toint(str_find(a, "\"", lb)) - linkscript = str_mid(a, lb, le-lb) - //debug("link data - "+lb+" "+le+" "+linkscript) + lintdescript = str_mid(a, lb, le-lb) + //debug("link data - "+lb+" "+le+" "+lintdescript) elseif str_mid(a, ch, 3) == "<p>" then lc = lc + 1 cc = 0 @@ -199,11 +199,11 @@ while chrs < maxc do if inlink == true then //debug("examining link at row"+lc+" between col "+cp+" and col "+cc) if (Self.Item(0) == lc &&Self.Item(1) >= cp && Self.Item(1) <= cc) then - debug("call "+linkscript) - if widgetExists(linkscript) then - linkscript.execute(Self.Item(0),Self.Item(1)) - elseif str_left(linkscript, 4) == "http" then - exec("konqueror --profile webbrowsing "+linkscript) + debug("call "+lintdescript) + if widgetExists(lintdescript) then + lintdescript.execute(Self.Item(0),Self.Item(1)) + elseif str_left(lintdescript, 4) == "http" then + exec("konqueror --profile webbrowsing "+lintdescript) endif break endif diff --git a/kommander/executor/Makefile.am b/kommander/executor/Makefile.am index 5e12cf0d..2f05c16e 100644 --- a/kommander/executor/Makefile.am +++ b/kommander/executor/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = kmdr-executor noinst_LTLIBRARIES = libinstance.la libinstance_la_SOURCES = instance.cpp dcopkommanderif.skel -libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kmdr_executor_SOURCES = main.cpp @@ -20,6 +20,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/widgets METASOURCES = AUTO # the library search path. -kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = dcopkommanderif.h diff --git a/kommander/part/Makefile.am b/kommander/part/Makefile.am index 6d44bc04..4259b3fd 100644 --- a/kommander/part/Makefile.am +++ b/kommander/part/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/kommander/executor -I$(top_srcdir)/kommander/factory $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = libkommander_part.la -libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin +libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin libkommander_part_la_LIBADD = $(top_builddir)/kommander/executor/libinstance.la $(top_builddir)/kommander/widget/libkommanderwidget.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) kde_services_DATA = kommander_part.desktop libkommander_part_la_SOURCES = kommander_part.cpp diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp index fe4d7199..49857c12 100644 --- a/kommander/part/kommander_part.cpp +++ b/kommander/part/kommander_part.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <kinstance.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <tqpoint.h> #include <tqlayout.h> diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h index 017e4b35..aca36b89 100644 --- a/kommander/part/kommander_part.h +++ b/kommander/part/kommander_part.h @@ -15,8 +15,8 @@ #ifndef KOMMANDERPART_H #define KOMMANDERPART_H -#include <kparts/part.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/factory.h> class Instance; class TQGridLayout; diff --git a/kommander/pluginmanager/Makefile.am b/kommander/pluginmanager/Makefile.am index 18ec698a..1c43b4fd 100644 --- a/kommander/pluginmanager/Makefile.am +++ b/kommander/pluginmanager/Makefile.am @@ -13,6 +13,6 @@ INCLUDES = -I$(top_srcdir)/kommander/factory $(all_includes) METASOURCES = AUTO # the library search path. -kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = mainwindow.h pluginmanager.h diff --git a/kommander/widgets/Makefile.am b/kommander/widgets/Makefile.am index b07890f7..d54c107e 100644 --- a/kommander/widgets/Makefile.am +++ b/kommander/widgets/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkommanderwidgets.la INCLUDES = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/factory -I$(top_srcdir)/kommander/plugin $(all_includes) # the library search path. -#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined # the libraries to link against. diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h index bb9fb448..c07c78cf 100644 --- a/kommander/working/plugintemplate/widget.h +++ b/kommander/working/plugintemplate/widget.h @@ -5,7 +5,7 @@ #include <tqwidget.h> #include <tqstring.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kommanderwidget.h> diff --git a/kxsldbg/Makefile.am b/kxsldbg/Makefile.am index e83cfe27..a5a2e896 100644 --- a/kxsldbg/Makefile.am +++ b/kxsldbg/Makefile.am @@ -23,7 +23,7 @@ xsldbg_DEPENDENCIES = kxsldbgpart/libxsldbg/libxsldbg.la xsldbg_LDADD = kxsldbgpart/libxsldbg/libxsldbg.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_TDEUI) # # the library search path. -xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # These paths are KDE specific. Use them: # kde_appsdir Where your application's menu entry (.desktop) should go to. @@ -52,7 +52,7 @@ INCLUDES= $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes) METASOURCES = AUTO # the application source, library search path, and link libraries -kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # this is where the shell's XML-GUI resource file goes shellrcdir = $(kde_datadir)/kxsldbg diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h index 5eb95600..16cf3592 100644 --- a/kxsldbg/kxsldbg.h +++ b/kxsldbg/kxsldbg.h @@ -6,7 +6,7 @@ #endif #include <kapplication.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <dcopobject.h> #include <dcopclient.h> #include "kxsldbgif.h" diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am index 40812810..4c173a39 100644 --- a/kxsldbg/kxsldbgpart/Makefile.am +++ b/kxsldbg/kxsldbgpart/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libkxsldbgcommon.la libkxsldbgcommon_la_SOURCES = xsldbgwalkspeedimpl.cpp xsldbgtemplatesimpl.cpp xsldbgtemplatelistitem.cpp xsldbgsourcesimpl.cpp xsldbgoutputview.cpp xsldbglocalvariablesimpl.cpp xsldbglocallistitem.cpp xsldbglistitem.cpp xsldbginspector.cpp xsldbgglobalvariablesimpl.cpp xsldbggloballistitem.cpp xsldbgentitiesimpl.cpp xsldbgdoc.cpp xsldbgdialogbase.cpp xsldbgdebugger.cpp xsldbgconfigimpl.cpp xsldbgcallstackimpl.cpp xsldbgbreakpointsimpl.cpp xsldbgbreakpointlistitem.cpp qxsldbgdoc.cpp kxsldbg_part.cpp kxsldbg_partif.skel xsldbgwalkspeed.ui xsldbgtemplates.ui xsldbgsources.ui xsldbgmsgdialog.ui xsldbglocalvariables.ui xsldbgglobalvariables.ui xsldbgentities.ui xsldbgconfig.ui xsldbgcallstack.ui xsldbgbreakpoints.ui libkxsldbgcommon_la_METASOURCES = AUTO -libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor +libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor libkxsldbgcommon_la_LIBADD = libxsldbg/libxsldbg.la libqtnotfier/libqtnotfier.la noinst_HEADERS = kxsldbg_part.h qxsldbgdoc.h xsldbgbreakpointlistitem.h xsldbgbreakpointsimpl.h xsldbgcallstackimpl.h xsldbgconfigimpl.h xsldbgdebugger.h xsldbgdialogbase.h xsldbgdoc.h xsldbgdocmap.h xsldbgentitiesimpl.h xsldbggloballistitem.h xsldbgglobalvariablesimpl.h xsldbginspector.h xsldbglistitem.h xsldbglocallistitem.h xsldbglocalvariablesimpl.h xsldbgmsgdialogimpl.h xsldbgoutputview.h xsldbgsourcesimpl.h xsldbgtemplatelistitem.h xsldbgtemplatesimpl.h xsldbgwalkspeedimpl.h @@ -15,7 +15,7 @@ SUBDIRS = libqtnotfier libxsldbg INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes) -libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP libkxsldbgpart_la_LIBADD = libkxsldbgcommon.la $(LIB_KPARTS) diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index a1cc5739..05bbf489 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -6,11 +6,11 @@ #include <kaction.h> #include <kstdaction.h> #include <kfiledialog.h> -#include <kparts/genericfactory.h> -#include <ktexteditor/markinterface.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/configinterface.h> +#include <tdeparts/genericfactory.h> +#include <tdetexteditor/markinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/configinterface.h> #include <kate/view.h> #include <tqfile.h> diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h index e8de28a7..173d22cf 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.h +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h @@ -1,7 +1,7 @@ #ifndef KXSLDBGKPART_H #define KXSLDBGKPART_H -#include <kparts/part.h> +#include <tdeparts/part.h> #include <tqvariant.h> #include <tqdict.h> #include <tqmainwindow.h> @@ -9,8 +9,8 @@ #include "xsldbginspector.h" #include <dcopclient.h> #include "kxsldbg_partif.h" -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> class TQVBoxLayout; class TQHBoxLayout; diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index eac763e0..e4fafe5d 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -6,8 +6,8 @@ */ #include "qxsldbgdoc.h" -#include <ktexteditor/markinterface.h> -#include <ktexteditor/editorchooser.h> +#include <tdetexteditor/markinterface.h> +#include <tdetexteditor/editorchooser.h> #include <tqfile.h> #include <tqdir.h> #include <tqtextstream.h> diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index 2fabde26..49f18070 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -13,8 +13,8 @@ #include <tqptrlist.h> #include <tqstring.h> #include <tqguardedptr.h> -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> class QXsldbgDoc : public TQObject { diff --git a/lib/compatibility/Makefile.am b/lib/compatibility/Makefile.am index 63242e4b..0ea03547 100644 --- a/lib/compatibility/Makefile.am +++ b/lib/compatibility/Makefile.am @@ -1,5 +1,5 @@ if include_qextmdi -KMDI_SUBDIR = kmdi +KMDI_SUBDIR = tdemdi endif if include_knewstuff diff --git a/lib/compatibility/kmdi/qextmdi/Makefile.am b/lib/compatibility/kmdi/qextmdi/Makefile.am deleted file mode 100644 index 9c683679..00000000 --- a/lib/compatibility/kmdi/qextmdi/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -# Here resides the qextmdi library. - -INCLUDES = -I$(top_srcdir)/lib/compatibility/kmdi/qextmdi/res -I$(top_builddir)/lib/compatibility/kmdi/qextmdi $(all_includes) - -noinst_LTLIBRARIES = libquantaqextmdi.la -libquantaqextmdi_la_LDFLAGS = $(all_libraries) -libquantaqextmdi_la_LIBADD = $(LIB_KPARTS) - -libquantaqextmdi_la_SOURCES = kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \ - kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp \ - kmultitabbar.cpp \ - kmditoolviewaccessor.cpp kmdidocumentviewtabwidget.cpp kmdifocuslist.cpp \ - kmdiguiclient.cpp \ - ktabwidget.cpp ktabbar.cpp kdockwidget.cpp kdockwidget_private.cpp kmdidockcontainer.cpp - -METASOURCES = AUTO - -#AM_CXXFLAGS = -DNO_INCLUDE_MOCFILES diff --git a/lib/compatibility/kmdi/Makefile.am b/lib/compatibility/tdemdi/Makefile.am index 3fdc0cfb..8ec83abb 100644 --- a/lib/compatibility/kmdi/Makefile.am +++ b/lib/compatibility/tdemdi/Makefile.am @@ -5,10 +5,10 @@ INCLUDES = $(all_includes) -noinst_LTLIBRARIES = libquantakmdi.la -libquantakmdi_la_LDFLAGS = $(all_libraries) -no-undefined -libquantakmdi_la_LIBADD = $(top_builddir)/lib/compatibility/kmdi/qextmdi/libquantaqextmdi.la -lktexteditor $(LIB_KPARTS) $(LIB_KIO) -libquantakmdi_la_SOURCES = dummy.cpp +noinst_LTLIBRARIES = libquantatdemdi.la +libquantatdemdi_la_LDFLAGS = $(all_libraries) -no-undefined +libquantatdemdi_la_LIBADD = $(top_builddir)/lib/compatibility/tdemdi/qextmdi/libquantaqextmdi.la -ltdetexteditor $(LIB_KPARTS) $(LIB_KIO) +libquantatdemdi_la_SOURCES = dummy.cpp SUBDIRS = qextmdi diff --git a/lib/compatibility/kmdi/dummy.cpp b/lib/compatibility/tdemdi/dummy.cpp index 8d1c8b69..8d1c8b69 100644 --- a/lib/compatibility/kmdi/dummy.cpp +++ b/lib/compatibility/tdemdi/dummy.cpp diff --git a/lib/compatibility/tdemdi/qextmdi/Makefile.am b/lib/compatibility/tdemdi/qextmdi/Makefile.am new file mode 100644 index 00000000..fb8e6d02 --- /dev/null +++ b/lib/compatibility/tdemdi/qextmdi/Makefile.am @@ -0,0 +1,18 @@ +# Here resides the qextmdi library. + +INCLUDES = -I$(top_srcdir)/lib/compatibility/tdemdi/qextmdi/res -I$(top_builddir)/lib/compatibility/tdemdi/qextmdi $(all_includes) + +noinst_LTLIBRARIES = libquantaqextmdi.la +libquantaqextmdi_la_LDFLAGS = $(all_libraries) +libquantaqextmdi_la_LIBADD = $(LIB_KPARTS) + +libquantaqextmdi_la_SOURCES = tdemdichildarea.cpp tdemdichildfrm.cpp tdemdichildfrmcaption.cpp \ + tdemdichildview.cpp tdemdimainfrm.cpp tdemditaskbar.cpp \ + tdemultitabbar.cpp \ + tdemditoolviewaccessor.cpp tdemdidocumentviewtabwidget.cpp tdemdifocuslist.cpp \ + tdemdiguiclient.cpp \ + ktabwidget.cpp ktabbar.cpp kdockwidget.cpp kdockwidget_private.cpp tdemdidockcontainer.cpp + +METASOURCES = AUTO + +#AM_CXXFLAGS = -DNO_INCLUDE_MOCFILES diff --git a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in b/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in index 008bac11..008bac11 100644 --- a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in +++ b/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index 47e2d71d..47e2d71d 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h index 5b355867..5b355867 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget_p.h index 471c4d9b..471c4d9b 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_p.h diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp index ef60f031..ef60f031 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h index 1a4d021f..1a4d021f 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp index a3fa51c8..a3fa51c8 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.h b/lib/compatibility/tdemdi/qextmdi/ktabbar.h index 53e87c8b..53e87c8b 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.h +++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.h diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp index 2320fb90..041143d9 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp @@ -407,7 +407,7 @@ void KTabWidget::moveTab( int from, int to ) blockSignals(true); removePage( w ); - // Work-around kmdi brain damage which calls showPage() in insertTab() + // Work-around tdemdi brain damage which calls showPage() in insertTab() TQTab * t = new TQTab(); t->setText(tablabel); TQTabWidget::insertTab( w, t, to ); diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.h b/lib/compatibility/tdemdi/qextmdi/ktabwidget.h index 5c9ba940..5c9ba940 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.h diff --git a/lib/compatibility/kmdi/qextmdi/res/filenew.xpm b/lib/compatibility/tdemdi/qextmdi/res/filenew.xpm index b261800d..b261800d 100644 --- a/lib/compatibility/kmdi/qextmdi/res/filenew.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/filenew.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_closebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_closebutton.xpm index 5c05e714..5c05e714 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2_closebutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_closebutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_maxbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_maxbutton.xpm index c8ef8113..c8ef8113 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2_maxbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_maxbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_minbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_minbutton.xpm index 98669195..98669195 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2_minbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_minbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_restorebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_restorebutton.xpm index a6e01fcb..a6e01fcb 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2_restorebutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_restorebutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_undockbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_undockbutton.xpm index 711bf01c..711bf01c 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2_undockbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_undockbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_closebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_closebutton.xpm index 6801e4e3..6801e4e3 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_closebutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_closebutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_closebutton_menu.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_closebutton_menu.xpm index 9d071231..9d071231 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_closebutton_menu.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_closebutton_menu.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_maxbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_maxbutton.xpm index b8ce6de2..b8ce6de2 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_maxbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_maxbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_minbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_minbutton.xpm index 6bcf76c5..6bcf76c5 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_minbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_minbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_restorebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_restorebutton.xpm index 803ce6db..803ce6db 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_restorebutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_restorebutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_undockbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_undockbutton.xpm index 1f23ecaf..1f23ecaf 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_undockbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_undockbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_closebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_closebutton.xpm index e714359a..e714359a 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde_closebutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde_closebutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_maxbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_maxbutton.xpm index 2af3bf88..2af3bf88 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde_maxbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde_maxbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_minbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_minbutton.xpm index c4e609ae..c4e609ae 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde_minbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde_minbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_restorebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_restorebutton.xpm index 4ec18513..4ec18513 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde_restorebutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde_restorebutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_undockbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_undockbutton.xpm index de97e9e7..de97e9e7 100644 --- a/lib/compatibility/kmdi/qextmdi/res/kde_undockbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/kde_undockbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/win_closebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_closebutton.xpm index d8be0243..d8be0243 100644 --- a/lib/compatibility/kmdi/qextmdi/res/win_closebutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/win_closebutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/win_maxbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_maxbutton.xpm index 95e501a8..95e501a8 100644 --- a/lib/compatibility/kmdi/qextmdi/res/win_maxbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/win_maxbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/win_minbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_minbutton.xpm index 1e8787e7..1e8787e7 100644 --- a/lib/compatibility/kmdi/qextmdi/res/win_minbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/win_minbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/win_restorebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_restorebutton.xpm index 87bb5b30..87bb5b30 100644 --- a/lib/compatibility/kmdi/qextmdi/res/win_restorebutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/win_restorebutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/res/win_undockbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_undockbutton.xpm index 386ebd8a..386ebd8a 100644 --- a/lib/compatibility/kmdi/qextmdi/res/win_undockbutton.xpm +++ b/lib/compatibility/tdemdi/qextmdi/res/win_undockbutton.xpm diff --git a/lib/compatibility/kmdi/qextmdi/tdelibs_export.h b/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h index 57c2f0aa..57c2f0aa 100644 --- a/lib/compatibility/kmdi/qextmdi/tdelibs_export.h +++ b/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp index 1ba89270..91dcb4cd 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdichildarea.cpp +// filename : tdemdichildarea.cpp //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -25,10 +25,10 @@ // //---------------------------------------------------------------------------- -#include "kmdichildarea.h" -#include "kmdichildarea.moc" +#include "tdemdichildarea.h" +#include "tdemdichildarea.moc" -#include "kmdidefines.h" +#include "tdemdidefines.h" #include <kconfig.h> #include <kdebug.h> @@ -46,7 +46,7 @@ //============ KMdiChildArea ============// KMdiChildArea::KMdiChildArea( TQWidget *parent ) - : TQFrame( parent, "kmdi_childarea" ) + : TQFrame( parent, "tdemdi_childarea" ) { setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); m_captionFont = TQFont(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h index 09624887..137ef275 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdichildarea.h +// filename : tdemdichildarea.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -31,8 +31,8 @@ #include <tqframe.h> #include <tqptrlist.h> -#include "kmdichildfrm.h" -#include "kmdichildview.h" +#include "tdemdichildfrm.h" +#include "tdemdichildview.h" class KMdiChildAreaPrivate; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp index 7a5620c5..4e6586f7 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdichildfrm.cpp +// filename : tdemdichildfrm.cpp //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -27,13 +27,13 @@ // //---------------------------------------------------------------------------- -#include "kmdichildfrm.h" -#include "kmdichildfrm.moc" +#include "tdemdichildfrm.h" +#include "tdemdichildfrm.moc" -#include "kmdidefines.h" -#include "kmdichildfrmcaption.h" -#include "kmdichildarea.h" -#include "kmdimainfrm.h" +#include "tdemdidefines.h" +#include "tdemdichildfrmcaption.h" +#include "tdemdichildarea.h" +#include "tdemdimainfrm.h" #include <tqpainter.h> #include <tqapplication.h> @@ -99,7 +99,7 @@ void KMdiWin32IconButton::mousePressEvent( TQMouseEvent* ) //============ KMdiChildFrm ============// KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) - : TQFrame( parent, "kmdi_childfrm" ) + : TQFrame( parent, "tdemdi_childfrm" ) , m_pClient( 0L ) , m_pManager( 0L ) , m_pCaption( 0L ) @@ -131,12 +131,12 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) m_pManager = parent; - m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "kmdi_iconbutton_icon" ); - m_pUnixIcon = new TQToolButton( m_pCaption, "kmdi_toolbutton_icon" ); - m_pMinimize = new TQToolButton( m_pCaption, "kmdi_toolbutton_min" ); - m_pMaximize = new TQToolButton( m_pCaption, "kmdi_toolbutton_max" ); - m_pClose = new TQToolButton( m_pCaption, "kmdi_toolbutton_close" ); - m_pUndock = new TQToolButton( m_pCaption, "kmdi_toolbutton_undock" ); + m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "tdemdi_iconbutton_icon" ); + m_pUnixIcon = new TQToolButton( m_pCaption, "tdemdi_toolbutton_icon" ); + m_pMinimize = new TQToolButton( m_pCaption, "tdemdi_toolbutton_min" ); + m_pMaximize = new TQToolButton( m_pCaption, "tdemdi_toolbutton_max" ); + m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" ); + m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" ); TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h index c244cd94..54bdbe84 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdichildfrm.h +// filename : tdemdichildfrm.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -37,7 +37,7 @@ #include <tqdict.h> -#include "kmdichildfrmcaption.h" +#include "tdemdichildfrmcaption.h" class KMdiChildArea; class KMdiChildView; @@ -62,7 +62,7 @@ signals: }; //============================================================================== -/* some special events, see kmdidefines.h +/* some special events, see tdemdidefines.h */ //------------------------------------------------------------------------------ /** diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp index ed4ba2d6..ca8c3e28 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdichildfrmcaption.cpp +// filename : tdemdichildfrmcaption.cpp //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -25,8 +25,8 @@ // //---------------------------------------------------------------------------- -#include "kmdichildfrmcaption.h" -#include "kmdichildfrmcaption.moc" +#include "tdemdichildfrmcaption.h" +#include "tdemdichildfrmcaption.moc" #include <tqpainter.h> #include <tqapplication.h> @@ -34,10 +34,10 @@ #include <tqtoolbutton.h> #include <tqpopupmenu.h> -#include "kmdidefines.h" -#include "kmdichildfrm.h" -#include "kmdichildarea.h" -#include "kmdimainfrm.h" +#include "tdemdidefines.h" +#include "tdemdichildfrm.h" +#include "tdemdichildarea.h" +#include "tdemdimainfrm.h" #include <klocale.h> #include <iostream> @@ -66,7 +66,7 @@ //============== KMdiChildFrmCaption =============// KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent ) - : TQWidget( parent, "kmdi_childfrmcaption" ) + : TQWidget( parent, "tdemdi_childfrmcaption" ) { m_szCaption = i18n( "Unnamed" ); m_bActive = false; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h index 0b84339a..f25fe4b4 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdichildfrmcaption.h +// filename : tdemdichildfrmcaption.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -29,7 +29,7 @@ #include <tqwidget.h> -#include "kmdidefines.h" +#include "tdemdidefines.h" class KMdiChildFrm; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp index 7ccf2927..69b4effd 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdichildview.cpp +// filename : tdemdichildview.cpp //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -29,15 +29,15 @@ // //---------------------------------------------------------------------------- -#include "kmdichildview.h" -#include "kmdichildview.moc" +#include "tdemdichildview.h" +#include "tdemdichildview.moc" #include <tqdatetime.h> #include <tqobjectlist.h> -#include "kmdimainfrm.h" -#include "kmdichildfrm.h" -#include "kmdidefines.h" +#include "tdemdimainfrm.h" +#include "tdemdichildfrm.h" +#include "tdemdidefines.h" #include <kdebug.h> #include <klocale.h> #include <tqiconset.h> diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h index 2d5c9681..d459f663 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdichildview.h +// filename : tdemdichildview.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -37,7 +37,7 @@ #include <tqapplication.h> #include <tqdatetime.h> -#include "kmdichildfrm.h" +#include "tdemdichildfrm.h" class KMdiChildViewPrivate; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidefines.h b/lib/compatibility/tdemdi/qextmdi/tdemdidefines.h index ce41244a..389304f6 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidefines.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidefines.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdidefines.h +// filename : tdemdidefines.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp index 173cb723..80307785 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include "kmdimainfrm.h" -#include "kmdidockcontainer.h" -#include "kmdidockcontainer.moc" +#include "tdemdimainfrm.h" +#include "tdemdidockcontainer.h" +#include "tdemdidockcontainer.moc" #include "kdockwidget_private.h" @@ -27,7 +27,7 @@ #include <tqlayout.h> #include <tqtimer.h> #include <tqtooltip.h> -#include <kmultitabbar.h> +#include <tdemultitabbar.h> #include <kglobalsettings.h> #include <kdebug.h> @@ -37,7 +37,7 @@ #include <klocale.h> //TODO: Well, this is already defined in tdeui/kdockwidget.cpp -static const char* const kmdi_not_close_xpm[] = +static const char* const tdemdi_not_close_xpm[] = { "5 5 2 1", "# c black", @@ -215,7 +215,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) ); btn->setToggleButton( true ); - btn->setPixmap( const_cast< const char** >( kmdi_not_close_xpm ) ); + btn->setPixmap( const_cast< const char** >( tdemdi_not_close_xpm ) ); hdr->addButton( btn ); m_overlapButtons.insert( w, btn ); btn->setOn( !isOverlapMode() ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h index 5f1f5dcc..5f1f5dcc 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp index f62b6056..575fa2b2 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp @@ -9,7 +9,7 @@ #include <ktabbar.h> #include <kpopupmenu.h> -#include "kmdidocumentviewtabwidget.h" +#include "tdemdidocumentviewtabwidget.h" KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name ) { @@ -145,7 +145,7 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( ) #ifndef NO_INCLUDE_MOCFILES -#include "kmdidocumentviewtabwidget.moc" +#include "tdemdidocumentviewtabwidget.moc" #endif // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h index 3dbf9b52..4678f0f8 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h @@ -11,7 +11,7 @@ #define _KMDI_DOCUMENT_VIEW_TAB_WIDGET_H_ #include <ktabwidget.h> -#include <kmdidefines.h> +#include <tdemdidefines.h> class KPopupMenu; diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp index e8f71ff2..a4592e38 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#include "kmdifocuslist.h" -#include "kmdifocuslist.moc" +#include "tdemdifocuslist.h" +#include "tdemdifocuslist.moc" #include <tqobjectlist.h> #include <kdebug.h> diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h index f3c70ad1..f3c70ad1 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index 34c25f0d..e326cc26 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include "kmdiguiclient.h" -#include "kmdiguiclient.moc" +#include "tdemdiguiclient.h" +#include "tdemdiguiclient.moc" #include <tqpopupmenu.h> #include <kapplication.h> @@ -32,12 +32,12 @@ #include <kdebug.h> #include <kdockwidget.h> #include <tdeversion.h> -#include "kmdimainfrm.h" -#include "kmditoolviewaccessor.h" -#include "kmditoolviewaccessor_p.h" +#include "tdemdimainfrm.h" +#include "tdemditoolviewaccessor.h" +#include "tdemditoolviewaccessor_p.h" namespace { -const char *actionListName = "show_kmdi_document_tool_view_actions"; +const char *actionListName = "show_tdemdi_document_tool_view_actions"; const char *guiDescription = "" "<!DOCTYPE kpartgui><kpartgui name=\"KMDIViewActions\">" @@ -48,7 +48,7 @@ const char *guiDescription = "" "</MenuBar>" "</kpartgui>"; -const char *resourceFileName = "kmdiviewactions.rc"; +const char *resourceFileName = "tdemdiviewactions.rc"; } @@ -136,7 +136,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c if ( actionCollection() ->kaccel() == 0 ) actionCollection() ->setWidget( mdiMainFrm ); - m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "kmdi_toolview_menu" ); + m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" ); if ( showMDIModeAction ) { m_mdiModeAction = new KSelectAction( i18n( "MDI Mode" ), 0, actionCollection() ); @@ -151,20 +151,20 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); - m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "kmdi_tooldock_menu" ); + m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" ); m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ), - actionCollection(), "kmdi_activate_top" ) ); + actionCollection(), "tdemdi_activate_top" ) ); m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ), - actionCollection(), "kmdi_activate_left" ) ); + actionCollection(), "tdemdi_activate_left" ) ); m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ), - actionCollection(), "kmdi_activate_right" ) ); + actionCollection(), "tdemdi_activate_right" ) ); m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ), - actionCollection(), "kmdi_activate_bottom" ) ); - m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "kmdi_goto_menu_separator" ) ); + actionCollection(), "tdemdi_activate_bottom" ) ); + m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) ); m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ), - actionCollection(), "kmdi_prev_toolview" ) ); + actionCollection(), "tdemdi_prev_toolview" ) ); m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ), - actionCollection(), "kmdi_next_toolview" ) ); + actionCollection(), "tdemdi_next_toolview" ) ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); } @@ -247,7 +247,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) { kdDebug( 760 ) << "*****void KMDIGUIClient::addToolView(KMdiToolViewAccessor* mtva)*****" << endl; // kdDebug()<<"name: "<<mtva->wrappedWidget()->name()<<endl; - TQString aname = TQString( "kmdi_toolview_" ) + mtva->wrappedWidget() ->name(); + TQString aname = TQString( "tdemdi_toolview_" ) + mtva->wrappedWidget() ->name(); // try to read the action shortcut KShortcut sc; diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h index 6fa40b49..46cc8ad2 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h @@ -23,7 +23,7 @@ #include <tqguardedptr.h> #include <kxmlguiclient.h> #include <kaction.h> -#include "kmdidefines.h" +#include "tdemdidefines.h" class KMainWindow; class KToolBar; diff --git a/lib/compatibility/kmdi/qextmdi/kmdiiterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h index 6faf5224..96a24ea4 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiiterator.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdiiterator.h +// filename : tdemdiiterator.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // diff --git a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h index e8e5d79d..de7c8f9c 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdilistiterator.h +// filename : tdemdilistiterator.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -27,7 +27,7 @@ #ifndef _KMDILISTITERATOR_H_ #define _KMDILISTITERATOR_H_ -#include <kmdiiterator.h> +#include <tdemdiiterator.h> template <class I> class TQPtrList; diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp index bfddac38..de17b7f1 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdimainfrm.cpp +// filename : tdemdimainfrm.cpp //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -51,7 +51,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kmdidockcontainer.h> +#include <tdemdidockcontainer.h> #include <tqtoolbutton.h> @@ -63,16 +63,16 @@ #include <tqmap.h> #include <tqvaluelist.h> -#include "kmdimainfrm.h" -#include "kmditaskbar.h" -#include "kmdichildfrm.h" -#include "kmdichildarea.h" -#include "kmdichildview.h" -#include "kmdidockcontainer.h" -#include "kmditoolviewaccessor_p.h" -#include "kmdifocuslist.h" -#include "kmdidocumentviewtabwidget.h" -#include "kmdiguiclient.h" +#include "tdemdimainfrm.h" +#include "tdemditaskbar.h" +#include "tdemdichildfrm.h" +#include "tdemdichildarea.h" +#include "tdemdichildview.h" +#include "tdemdidockcontainer.h" +#include "tdemditoolviewaccessor_p.h" +#include "tdemdifocuslist.h" +#include "tdemdidocumentviewtabwidget.h" +#include "tdemdiguiclient.h" #include "win_undockbutton.xpm" #include "win_minbutton.xpm" @@ -1422,22 +1422,22 @@ void KMdiMainFrm::switchToToplevelMode() //FIXME although i don't know what to fix // 5. show the child views again - TQPtrListIterator<KMdiChildView> kmdicvit( *m_pDocumentViews ); - for ( kmdicvit.toFirst(); ( *kmdicvit ); ++kmdicvit ) + TQPtrListIterator<KMdiChildView> tdemdicvit( *m_pDocumentViews ); + for ( tdemdicvit.toFirst(); ( *tdemdicvit ); ++tdemdicvit ) { #ifdef TQ_WS_X11 - XSetTransientForHint( tqt_xdisplay(), ( *kmdicvit )->winId(), winId() ); + XSetTransientForHint( tqt_xdisplay(), ( *tdemdicvit )->winId(), winId() ); #endif - ( *kmdicvit )->show(); + ( *tdemdicvit )->show(); } // 6.) reset all memorized positions of the undocked ones and show them again TQValueList<TQRect>::Iterator qvlqrit; TQValueList<TQRect>::Iterator qvlEnd = positionList.end(); - for ( kmdicvit.toFirst(), qvlqrit = positionList.begin() ; ( *kmdicvit ) && qvlqrit != qvlEnd; ++kmdicvit, ++qvlqrit ) + for ( tdemdicvit.toFirst(), qvlqrit = positionList.begin() ; ( *tdemdicvit ) && qvlqrit != qvlEnd; ++tdemdicvit, ++qvlqrit ) { - ( *kmdicvit )->setGeometry( ( *qvlqrit ) ); - ( *kmdicvit )->show(); + ( *tdemdicvit )->setGeometry( ( *qvlqrit ) ); + ( *tdemdicvit )->show(); } m_pDockbaseAreaOfDocumentViews->setDockSite( KDockWidget::DockNone ); @@ -2935,7 +2935,7 @@ KTabWidget * KMdiMainFrm::tabWidget() const return m_documentTabWidget; } -#include "kmdimainfrm.moc" +#include "tdemdimainfrm.moc" // vim: ts=2 sw=2 et // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h index c0786d20..220875fc 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdimainfrm.h +// filename : tdemdimainfrm.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -31,7 +31,7 @@ #ifndef _KMDIMAINFRM_H_ #define _KMDIMAINFRM_H_ -#include <kparts/dockmainwindow.h> +#include <tdeparts/dockmainwindow.h> #include <kmenubar.h> #include <kpopupmenu.h> @@ -41,13 +41,13 @@ #include <tqdom.h> #include <tqguardedptr.h> -#include "kmditaskbar.h" -#include "kmdichildarea.h" -#include "kmdichildview.h" -#include "kmdiiterator.h" -#include "kmdilistiterator.h" -#include "kmdinulliterator.h" -#include "kmditoolviewaccessor.h" +#include "tdemditaskbar.h" +#include "tdemdichildarea.h" +#include "tdemdichildview.h" +#include "tdemdiiterator.h" +#include "tdemdilistiterator.h" +#include "tdemdinulliterator.h" +#include "tdemditoolviewaccessor.h" class TQTimer; class TQPopupMenu; diff --git a/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h index 187c931b..ff9a17c3 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmdinulliterator.h +// filename : tdemdinulliterator.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -27,7 +27,7 @@ #ifndef _KMDINULLITERATOR_H_ #define _KMDINULLITERATOR_H_ -#include "kmdiiterator.h" +#include "tdemdiiterator.h" template <class Item> class KMdiNullIterator : public KMdiIterator<Item> { diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp index 81384f98..3c61dab2 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmditaskbar.cpp +// filename : tdemditaskbar.cpp //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -26,12 +26,12 @@ // //---------------------------------------------------------------------------- -#include "kmditaskbar.h" -#include "kmditaskbar.moc" +#include "tdemditaskbar.h" +#include "tdemditaskbar.moc" -#include "kmdimainfrm.h" -#include "kmdichildview.h" -#include "kmdidefines.h" +#include "tdemdimainfrm.h" +#include "tdemdichildview.h" +#include "tdemdidefines.h" #include <tqtooltip.h> #include <tqlabel.h> diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h index 003aec00..50b77d9b 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmditaskbar.h +// filename : tdemditaskbar.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -34,7 +34,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include "kmdidefines.h" +#include "tdemdidefines.h" class KMdiMainFrm; class KMdiChildView; diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp index 1e42f12d..ce6fcca0 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmditoolviewaccessor.h +// filename : tdemditoolviewaccessor.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // @@ -22,12 +22,12 @@ #ifndef NO_KDE # include <kdebug.h> #endif -#include "kmditoolviewaccessor_p.h" -#include "kmdiguiclient.h" -#include "kmdimainfrm.h" +#include "tdemditoolviewaccessor_p.h" +#include "tdemdiguiclient.h" +#include "tdemdimainfrm.h" -#include "kmditoolviewaccessor.h" -#include "kmditoolviewaccessor_p.h" +#include "tdemditoolviewaccessor.h" +#include "tdemditoolviewaccessor_p.h" KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption ) : TQObject( parent ) @@ -263,7 +263,7 @@ void KMdiToolViewAccessor::show() #ifndef NO_INCLUDE_MOCFILES -#include "kmditoolviewaccessor.moc" +#include "tdemditoolviewaccessor.moc" #endif // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h index b5cfdaad..d03bdfce 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmditoolviewaccessor.h +// filename : tdemditoolviewaccessor.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor_p.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h index ecbaa76a..81e770e8 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor_p.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h @@ -1,5 +1,5 @@ //---------------------------------------------------------------------------- -// filename : kmditoolviewaccessor_p.h +// filename : tdemditoolviewaccessor_p.h //---------------------------------------------------------------------------- // Project : KDE MDI extension // diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp index 031c8c16..511e50a0 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - kmultitabbar.cpp - description + tdemultitabbar.cpp - description ------------------- begin : 2001 copyright : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org> @@ -22,10 +22,10 @@ Boston, MA 02110-1301, USA. ***************************************************************************/ -#include "kmultitabbar.h" -#include "kmultitabbar.moc" -#include "kmultitabbar_p.h" -#include "kmultitabbar_p.moc" +#include "tdemultitabbar.h" +#include "tdemultitabbar.moc" +#include "tdemultitabbar_p.h" +#include "tdemultitabbar_p.moc" #include <tqbutton.h> #include <tqpopupmenu.h> #include <tqlayout.h> diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h index d8ce755a..a299e8f5 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h @@ -1,5 +1,5 @@ /*************************************************************************** - kmultitabbar.h - description + tdemultitabbar.h - description ------------------- begin : 2001 copyright : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org> diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h index dc8a7d8b..7a1c6714 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h @@ -1,5 +1,5 @@ /*************************************************************************** - kmultitabbar_p.h - description + tdemultitabbar_p.h - description ------------------- begin : 2003 copyright : (C) 2003 by Joseph Wenninger <jowenn@kde.org> @@ -25,7 +25,7 @@ #ifndef K_MULTI_TAB_BAR_P_H #define K_MULTI_TAB_BAR_P_H #include <tqscrollview.h> -#include <kmultitabbar.h> +#include <tdemultitabbar.h> class KMultiTabBarInternal: public TQScrollView { diff --git a/quanta/ChangeLog b/quanta/ChangeLog index cafa7fde..daad1d2a 100644 --- a/quanta/ChangeLog +++ b/quanta/ChangeLog @@ -1133,7 +1133,7 @@ Version 3.0 pr1 (Release date: 27-07-2002; Started at: 23-05-2002): - improved PHP syntax highlighting file (will be also included in KDE 3.1 release) Version 2.0.1 (Release date: 12-12-2001; Started at: 06-12-2001): - - fix for libktexteditor linking errors + - fix for libtdetexteditor linking errors - fix for a crash when doing syntax check for a correct html - fixed the saving and restoring of the project options - added the DocPath entry to the .desktop file diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index e548d7d9..d3586f57 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -26,13 +26,13 @@ #include <kapplication.h> #include <klocale.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kstandarddirs.h> #include <klineedit.h> #include <kdebug.h> #include <kconfig.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include "propertysetter.h" #include "qmyhighlighter.h" diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index c62cc7a7..e39e5564 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -25,8 +25,8 @@ #include <klocale.h> #include <kpushbutton.h> #include <kurl.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/viewcursorinterface.h> //app includes #include "parser.h" diff --git a/quanta/components/debugger/dbgp/Makefile.am b/quanta/components/debugger/dbgp/Makefile.am index da7bf880..cb1d9d0c 100644 --- a/quanta/components/debugger/dbgp/Makefile.am +++ b/quanta/components/debugger/dbgp/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = quantadebuggerdbgp.la quantadebuggerdbgp_la_SOURCES = quantadebuggerdbgp.cpp dbgpsettingss.ui \ dbgpsettings.cpp dbgpnetwork.cpp qbytearrayfifo.cpp -quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor +quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor quantadebuggerdbgp_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS) kde_services_DATA = quantadebuggerdbgp.desktop diff --git a/quanta/components/debugger/debuggerbreakpointlist.cpp b/quanta/components/debugger/debuggerbreakpointlist.cpp index 6a47d296..13bed5c9 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.cpp +++ b/quanta/components/debugger/debuggerbreakpointlist.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqobject.h> -#include <ktexteditor/markinterfaceextension.h> +#include <tdetexteditor/markinterfaceextension.h> #include <kdebug.h> #include "debuggerbreakpointlist.h" diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index fa8f9719..9583db91 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include <ktexteditor/document.h> -#include <ktexteditor/markinterfaceextension.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/markinterfaceextension.h> +#include <tdetexteditor/viewcursorinterface.h> #include <kdebug.h> #include <klocale.h> #include <kcombobox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kiconloader.h> #include <kmessagebox.h> #include <qextfileinfo.h> diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index fdf32a5c..faf844bc 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -22,8 +22,8 @@ #include <klocale.h> #include <kdebug.h> #include <tqstring.h> -#include <khtmlview.h> -#include <kmditoolviewaccessor.h> +#include <tdehtmlview.h> +#include <tdemditoolviewaccessor.h> #include <kstatusbar.h> #include "variableslistview.h" diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index 568a933f..04db4e94 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -21,7 +21,7 @@ #include <tqobject.h> #include <tqptrlist.h> -#include <kmditoolviewaccessor.h> +#include <tdemditoolviewaccessor.h> #include "backtracelistview.h" class VariablesListView; diff --git a/quanta/components/debugger/gubed/Makefile.am b/quanta/components/debugger/gubed/Makefile.am index 9c2aebc0..e5c0c826 100644 --- a/quanta/components/debugger/gubed/Makefile.am +++ b/quanta/components/debugger/gubed/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = quantadebuggergubed.la quantadebuggergubed_la_SOURCES = gubedsettingss.ui quantadebuggergubed.cpp gubedsettings.cpp -quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor +quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor quantadebuggergubed_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS) kde_services_DATA = quantadebuggergubed.desktop diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp index af70da0a..83f5ce0c 100644 --- a/quanta/components/debugger/quantadebuggerinterface.cpp +++ b/quanta/components/debugger/quantadebuggerinterface.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <ktexteditor/document.h> +#include <tdetexteditor/document.h> #include <kdebug.h> #include <klocale.h> #include <kiconloader.h> diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h index 0fc95d8b..3eacaf4f 100644 --- a/quanta/components/framewizard/selectablearea.h +++ b/quanta/components/framewizard/selectablearea.h @@ -19,8 +19,8 @@ #define SELECTABLEAREA_H //#include <tqwidget.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> /**a TQTextBrowser that can be selected *@author gulmini luciano diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index 45bcf07c..60eb455e 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -18,11 +18,11 @@ #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kpopupmenu.h> #include <kpushbutton.h> -#include <ktexteditor/document.h> -#include <ktexteditor/editinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/editinterface.h> //qt includes #include <tqcheckbox.h> diff --git a/quanta/data/config/quanta_preview_config.desktop b/quanta/data/config/quanta_preview_config.desktop index cc152532..4000aa18 100644 --- a/quanta/data/config/quanta_preview_config.desktop +++ b/quanta/data/config/quanta_preview_config.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Exec=kcmshell --caption %c %i khtml_behavior khtml_java_js khtml_fonts cookies cache proxy kcmcss crypto useragent khtml_plugins +Exec=kcmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins Icon=konqueror DocPath=konqueror/index.html Name=Configure KHTML Browser Part diff --git a/quanta/data/dtep/html-strict/i.tag b/quanta/data/dtep/html-strict/i.tag index cf4f838e..e2bc5b04 100644 --- a/quanta/data/dtep/html-strict/i.tag +++ b/quanta/data/dtep/html-strict/i.tag @@ -110,7 +110,7 @@ <item>button</item> </items> <location col="1" row="0" colspan="1" /> - <tooltip>What - no kparts?</tooltip> + <tooltip>What - no tdeparts?</tooltip> </attr> <attr name="disabled" type="check"> diff --git a/quanta/data/dtep/html/i.tag b/quanta/data/dtep/html/i.tag index 0dca3a63..7956af71 100644 --- a/quanta/data/dtep/html/i.tag +++ b/quanta/data/dtep/html/i.tag @@ -291,7 +291,7 @@ <item>button</item> </items> <location col="1" row="0" colspan="1" /> - <tooltip>What - no kparts?</tooltip> + <tooltip>What - no tdeparts?</tooltip> </attr> <attr name="disabled" type="check"> diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 4b491b26..90f5f80c 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -23,7 +23,7 @@ // include kde headers #include <klocale.h> #include <kstandarddirs.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/viewcursorinterface.h> #include <kconfig.h> #include <kurl.h> #include <kstdguiitem.h> diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index b9a15415..14e83c89 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -59,10 +59,10 @@ #include <kdirwatch.h> #include <kiconloader.h> #include <klocale.h> -#include <ktexteditor/document.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/viewcursorinterface.h> extern GroupElementMapList globalGroupMap; static const TQChar space(' '); diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp index be660255..56bee015 100644 --- a/quanta/parsers/parsercommon.cpp +++ b/quanta/parsers/parsercommon.cpp @@ -20,7 +20,7 @@ //kde includes #include <kdebug.h> #include <klocale.h> -#include <ktexteditor/editinterface.h> +#include <tdetexteditor/editinterface.h> //own includes #include "parsercommon.h" diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index f402e0c8..691c2d2e 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -19,7 +19,7 @@ //kde includes #include <kdebug.h> -#include <ktexteditor/editinterface.h> +#include <tdetexteditor/editinterface.h> //own includes #include "saparser.h" diff --git a/quanta/parts/kafka/DESIGN b/quanta/parts/kafka/DESIGN index eabfd4e1..2f9537a2 100644 --- a/quanta/parts/kafka/DESIGN +++ b/quanta/parts/kafka/DESIGN @@ -14,8 +14,8 @@ Summary: If you find an error (shouldn't be so hard ;-), could you report me please? 1) History -In early 2003, I was looking for a good HTML WYSIWYG editor, and I didn't find what I wanted! So I decided to code one. After a quick search, I've found a dead project, Kafka, in kdenonbeta, which was supposed to become an full-featured WYSIWYG editor based on khtml. But at this time (2000-2001 I think) khtml wasn't ready. So it was abandonned. -Meanwhile khtml have been greatly improved, partially thanks to the Apple Safari merging. Then I started to hack kafka a bit, adding basic cursor navigation, insertion/deletion, and so on... But I quickly realised that it would be too hard and too long for me alone to come to a decent editor. So I was looking to join an existing project, and I choose Quanta+, basically because it was (and still is, in my humble opinion) the best HTML editor in the KDE environment. +In early 2003, I was looking for a good HTML WYSIWYG editor, and I didn't find what I wanted! So I decided to code one. After a quick search, I've found a dead project, Kafka, in kdenonbeta, which was supposed to become an full-featured WYSIWYG editor based on tdehtml. But at this time (2000-2001 I think) tdehtml wasn't ready. So it was abandonned. +Meanwhile tdehtml have been greatly improved, partially thanks to the Apple Safari merging. Then I started to hack kafka a bit, adding basic cursor navigation, insertion/deletion, and so on... But I quickly realised that it would be too hard and too long for me alone to come to a decent editor. So I was looking to join an existing project, and I choose Quanta+, basically because it was (and still is, in my humble opinion) the best HTML editor in the KDE environment. It seemed I came to Quanta+ exactly at the best time: they were considering to add WYSIWYG capabilities! So for now one year, I've been coded VPL during my free time, and I am not far from a stable status. @@ -57,7 +57,7 @@ HTML The Node class handle the pointers to the parent, next, previous and first child Node. *Each* Node has a valid pointer to a Tag. The Tag takes care to remember all the information concerning the Tag itself, like the attributes, the type, etc...) One QTag per Element is created from the .tag files when Quanta is started. Each QTag contains all the DTD information about the Tag. E.g. the "IMG" Qtag says that it is a single Tag, and what are its attributes. You can get a QTag with QuantaCommon::tagFromDTD, but don't delete the QTag! -Now to khtml. The class KHTMLPart is the HTML renderer widget of konqueror. It internally works with a Node Tree (another? Yep!) but these Nodes are real DOM::Nodes. (From now, I will call it the DOM::Node tree) Each of the DOM Nodes is khtml-internally linked to a rendering Node i.e. a change made to one DOM::Node will update the HTML rendering cf /path/to/kde/include/dom/*.h and also in the tdelibs cvs module, cf the nice tdelibs/khtml/DESIGN.html. WARNING about DOM::Nodes, they are just interfaces!! +Now to tdehtml. The class KHTMLPart is the HTML renderer widget of konqueror. It internally works with a Node Tree (another? Yep!) but these Nodes are real DOM::Nodes. (From now, I will call it the DOM::Node tree) Each of the DOM Nodes is tdehtml-internally linked to a rendering Node i.e. a change made to one DOM::Node will update the HTML rendering cf /path/to/kde/include/dom/*.h and also in the tdelibs cvs module, cf the nice tdelibs/tdehtml/DESIGN.html. WARNING about DOM::Nodes, they are just interfaces!! @@ -73,7 +73,7 @@ Then when a change is made to the source file, Parser::rebuild is called and syn 5) VPL classes. VPL has several classes, but note sometimes it is not really object oriented, but I will clean up soon. -* KafkaWidget(kafkahtmlpart.[h|cpp]): Derived from KHTMLPart, it uses the caret mode implemented by Leo Savernik in khtml (that means we don't have to care about cursor navigation). It handles every keypress in order to edit the widget (backspace/delete/return/<insertion of a letter>) and modify only the DOM::Node tree (not the Node tree). +* KafkaWidget(kafkahtmlpart.[h|cpp]): Derived from KHTMLPart, it uses the caret mode implemented by Leo Savernik in tdehtml (that means we don't have to care about cursor navigation). It handles every keypress in order to edit the widget (backspace/delete/return/<insertion of a letter>) and modify only the DOM::Node tree (not the Node tree). * KafkaDocument(wkafkapart.[h|cpp]): It takes care to load the DOM::Node tree from the Node tree, and when a change is made to the DOM::Node tree, it apply it in the Node tree. It basically takes care of the synchronization of the trees. diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index 5ed55a1b..0b1951f9 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -19,7 +19,7 @@ #ifdef HEAVY_DEBUG #include <kdebug.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <klocale.h> #include <tqstring.h> #include <tqlayout.h> diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index 52195d83..ecdc1b8d 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -28,18 +28,18 @@ #include <kdebug.h> #include <klocale.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kmessagebox.h> #include <ktrader.h> #include <klibloader.h> -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <dom/dom_node.h> #include <dom/dom_text.h> #include <dom/dom_exception.h> #include <dom/dom_string.h> #include <dom/dom2_range.h> -#include <khtml_events.h> -//#include <khtml_part.h> +#include <tdehtml_events.h> +//#include <tdehtml_part.h> #include "kafkacommon.h" #ifdef HEAVY_DEBUG @@ -117,7 +117,7 @@ KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument //d->domdialog = new KafkaDOMTreeDialog(view(), this); //d->domdialog->show(); #endif - //IMPORTANT:without him, no document() is created in khtmlPart + //IMPORTANT:without him, no document() is created in tdehtmlPart begin(); write("<html></html>"); end(); @@ -2030,7 +2030,7 @@ void KafkaWidget::postprocessCursorPosition() makeCursorVisible(); } -void KafkaWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *event) +void KafkaWidget::tdehtmlMouseMoveEvent(tdehtml::MouseMoveEvent *event) { DOM::Node mouseNode = event->innerNode(); @@ -2043,12 +2043,12 @@ void KafkaWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *event) else view()->setCursor(TQt::arrowCursor); - KHTMLPart::khtmlMouseMoveEvent(event); + KHTMLPart::tdehtmlMouseMoveEvent(event); } -void KafkaWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *event) +void KafkaWidget::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event) { - KHTMLPart::khtmlMouseReleaseEvent(event); + KHTMLPart::tdehtmlMouseReleaseEvent(event); if(m_currentNode.isNull() || m_currentNode.nodeName().string().lower() == "#document") { m_currentNode = w->body; @@ -2059,9 +2059,9 @@ void KafkaWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *event) quantaApp->aTab->setCurrentNode(w->getNode(event->innerNode())); } -void KafkaWidget::khtmlMousePressEvent(khtml::MousePressEvent *event) +void KafkaWidget::tdehtmlMousePressEvent(tdehtml::MousePressEvent *event) { - KHTMLPart::khtmlMousePressEvent(event); + KHTMLPart::tdehtmlMousePressEvent(event); if(d->m_cursorOffset == 0 && !m_currentNode.isNull() && m_currentNode.nodeName().string().lower() == "body") putCursorAtFirstAvailableLocation(); @@ -2071,9 +2071,9 @@ void KafkaWidget::khtmlMousePressEvent(khtml::MousePressEvent *event) } -void KafkaWidget::khtmlDrawContentsEvent(khtml::DrawContentsEvent *event) +void KafkaWidget::tdehtmlDrawContentsEvent(tdehtml::DrawContentsEvent *event) { - KHTMLPart::khtmlDrawContentsEvent(event); + KHTMLPart::tdehtmlDrawContentsEvent(event); } void KafkaWidget::getCurrentNode(DOM::Node &_currentNode, long &offset) diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h index 51c7c38b..ae7bf1e7 100644 --- a/quanta/parts/kafka/kafkahtmlpart.h +++ b/quanta/parts/kafka/kafkahtmlpart.h @@ -20,9 +20,9 @@ #define KAFKAHTMLPART_H #include <kurl.h> -#include <khtml_part.h> -#include <khtml_events.h> -#include <kparts/event.h> +#include <tdehtml_part.h> +#include <tdehtml_events.h> +#include <tdeparts/event.h> #include <tqstringlist.h> #include <tqptrlist.h> @@ -235,10 +235,10 @@ signals: protected: bool eventFilter(TQObject *object, TQEvent *event); - virtual void khtmlMouseMoveEvent(khtml::MouseMoveEvent *event); - virtual void khtmlMousePressEvent(khtml::MousePressEvent *event); - virtual void khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *event); - virtual void khtmlDrawContentsEvent(khtml::DrawContentsEvent *event); + virtual void tdehtmlMouseMoveEvent(tdehtml::MouseMoveEvent *event); + virtual void tdehtmlMousePressEvent(tdehtml::MousePressEvent *event); + virtual void tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event); + virtual void tdehtmlDrawContentsEvent(tdehtml::DrawContentsEvent *event); private slots: diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index e788a5c7..c7345467 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -24,10 +24,10 @@ #include <kconfig.h> #include <kdebug.h> #include <kiconloader.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/editinterfaceext.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/editinterfaceext.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/viewcursorinterface.h> #include <dom/dom_node.h> #include <dom/dom_exception.h> diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 39cefc8f..7ef185f4 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -22,13 +22,13 @@ #include <dom/dom_string.h> #include <dom/css_stylesheet.h> #include <kdebug.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kstandarddirs.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/selectioninterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/selectioninterface.h> #include <kstandarddirs.h> #include <klocale.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kglobal.h> #include <kcharsets.h> @@ -162,7 +162,7 @@ void KafkaDocument::loadDocument(Document *doc) //create a empty document with a basic tree : HTML, HEAD, BODY m_kafkaPart->newDocument(); - // When loading a weird html file in khtml (e.g. without BODY or HTML), khtml takes care + // When loading a weird html file in tdehtml (e.g. without BODY or HTML), tdehtml takes care // to create the necessary tags. But as we are handling directly the Nodes, we have to handle this!! // creating and linking an empty node to the root DOM::Node (#document) and // to HEAD, HTML, BODY @@ -718,7 +718,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) parentNode = *node->parent->leafNode(); else if(node->parent && !node->parent->leafNode()) { - //the parent tag was invalid and khtml refuse to insert it + //the parent tag was invalid and tdehtml refuse to insert it //so impossible to inser the current node disconnectDomNodeFromQuantaNode(newNode); if(node->rootNode()) diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h index 9c4f3529..6c52d307 100644 --- a/quanta/parts/kafka/wkafkapart.h +++ b/quanta/parts/kafka/wkafkapart.h @@ -374,7 +374,7 @@ public: void coutLinkTree(Node *node, int indent); /** - * In order to have khtml works whatever DTD is loaded, they must always exists + * In order to have tdehtml works whatever DTD is loaded, they must always exists * and be valid. */ DOM::Node html, body, head; diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index e86a9203..94552890 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -23,8 +23,8 @@ #include <kconfig.h> #include <kdebug.h> #include <tdeversion.h> -#include <khtml_settings.h> -#include <khtmlview.h> +#include <tdehtml_settings.h> +#include <tdehtmlview.h> #include <klocale.h> #include <kpopupmenu.h> #include <ktempfile.h> diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h index 432cb831..2fbed22e 100644 --- a/quanta/parts/preview/whtmlpart.h +++ b/quanta/parts/preview/whtmlpart.h @@ -20,7 +20,7 @@ #include <tqstrlist.h> -#include <khtml_part.h> +#include <tdehtml_part.h> class KPopupMenu; /** diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index b6bd4e3e..12bab9c6 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -20,8 +20,8 @@ #include <klocale.h> #include <kiconloader.h> #include <kaction.h> -#include <kparts/componentfactory.h> -#include <kparts/part.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/part.h> #include <klocale.h> #include <kdockwidget.h> #include <kdebug.h> diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h index 426c07c8..c7a4c705 100644 --- a/quanta/plugins/quantaplugin.h +++ b/quanta/plugins/quantaplugin.h @@ -19,7 +19,7 @@ #define QUANTAPLUGIN_H /* KDE INCLUDES */ -#include <kparts/part.h> +#include <tdeparts/part.h> /* QT INCLUDES */ #include <tqguardedptr.h> diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 3e29c099..6d5593d8 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -36,14 +36,14 @@ #include <klocale.h> #include <kmainwindow.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kprogress.h> #include <kstringhandler.h> #include <kurlrequester.h> #include <kurlrequesterdlg.h> -#include <ktexteditor/markinterface.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/markinterface.h> +#include <tdetexteditor/viewcursorinterface.h> // application headers #include "copyto.h" diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 096ef83f..c488acc0 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -39,7 +39,7 @@ #include <klocale.h> #include <kmainwindow.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kprogress.h> #include <kstandarddirs.h> #include <ktempfile.h> diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 5a384a85..70e4747f 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -884,7 +884,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="783" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="784" type="" abstract="0" documentation="" name="~SpellChecker" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="768" value="" type="KSpell *" abstract="0" documentation="" name="m_kspell" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="768" value="" type="KSpell *" abstract="0" documentation="" name="m_tdespell" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="769" value="" type="int" abstract="0" documentation="" name="m_mispellCount" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="770" value="" type="int" abstract="0" documentation="" name="m_replaceCount" static="0" scope="201" /> </UML:Class> @@ -3201,7 +3201,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="813" id="767" label="SpellChecker" > <listitem open="0" type="815" id="771" label="SpellChecker" /> <listitem open="0" type="815" id="774" label="locatePosition" /> - <listitem open="0" type="814" id="768" label="m_kspell" /> + <listitem open="0" type="814" id="768" label="m_tdespell" /> <listitem open="0" type="814" id="769" label="m_mispellCount" /> <listitem open="0" type="814" id="770" label="m_replaceCount" /> <listitem open="0" type="815" id="778" label="readConfig" /> diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt index c639bbc5..86d93f09 100644 --- a/quanta/src/CMakeLists.txt +++ b/quanta/src/CMakeLists.txt @@ -71,8 +71,8 @@ tde_add_executable( quanta AUTOMOC framewizard-static csseditor-static tableeditor-static preview-static utility-static quantamodule-static - kafkalibrary-static kmdi-shared khtml-shared - knewstuff-shared kabc-shared ktexteditor-shared + kafkalibrary-static tdemdi-shared tdehtml-shared + knewstuff-shared kabc-shared tdetexteditor-shared ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am index ec40ded9..8227e35e 100644 --- a/quanta/src/Makefile.am +++ b/quanta/src/Makefile.am @@ -64,7 +64,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \ quanta_METASOURCES = AUTO # the library search path. -quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lX11 +quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lX11 # this is where the kdelnk file will go xdg_apps_DATA = quanta.desktop diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 2cec0c03..f6531e68 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -48,20 +48,20 @@ #include <kio/netaccess.h> #include <kstandarddirs.h> -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> -#include <ktexteditor/cursorinterface.h> -#include <ktexteditor/clipboardinterface.h> -#include <ktexteditor/codecompletioninterface.h> -#include <ktexteditor/configinterface.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/editinterfaceext.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/selectioninterfaceext.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/wordwrapinterface.h> -#include <ktexteditor/markinterfaceextension.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/cursorinterface.h> +#include <tdetexteditor/clipboardinterface.h> +#include <tdetexteditor/codecompletioninterface.h> +#include <tdetexteditor/configinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/editinterfaceext.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/selectioninterfaceext.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/wordwrapinterface.h> +#include <tdetexteditor/markinterfaceextension.h> #include <kate/view.h> diff --git a/quanta/src/document.h b/quanta/src/document.h index 99511907..9d8de77d 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <kurl.h> -#include <ktexteditor/markinterfaceextension.h> +#include <tdetexteditor/markinterfaceextension.h> //own includes #include "qtag.h" diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index cbcbfd50..f604bc43 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -62,7 +62,7 @@ #include <kmenubar.h> #include <klocale.h> #include <kconfig.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kdialogbase.h> #include <tdeversion.h> #include <kkeydialog.h> @@ -87,25 +87,25 @@ #include <ktabwidget.h> #include <ktip.h> #include <kmimetype.h> -#include <kparts/partmanager.h> -#include <kparts/part.h> +#include <tdeparts/partmanager.h> +#include <tdeparts/part.h> #include <kstringhandler.h> #include <kstdguiitem.h> #include <kurldrag.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/markinterface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/printinterface.h> -#include <ktexteditor/popupmenuinterface.h> -#include <ktexteditor/dynwordwrapinterface.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/undointerface.h> -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> -#include <ktexteditor/clipboardinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/markinterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/printinterface.h> +#include <tdetexteditor/popupmenuinterface.h> +#include <tdetexteditor/dynwordwrapinterface.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/undointerface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/clipboardinterface.h> #include <kio/netaccess.h> diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index 7140b51a..abba6444 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -40,10 +40,10 @@ // include files for KDE #include <tdeversion.h> #include <kdockwidget.h> -#include <kparts/browserextension.h> -#include <kparts/dockmainwindow.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/dockmainwindow.h> -#include <kmdimainfrm.h> +#include <tdemdimainfrm.h> //app includes #include "dcopwindowmanagerif.h" diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 974dbc92..77883967 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -45,7 +45,7 @@ #include <kmenubar.h> #include <klocale.h> #include <kconfig.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <kaction.h> @@ -56,8 +56,8 @@ #include <ktip.h> #include <kio/netaccess.h> #include <ktabwidget.h> -#include <kmultitabbar.h> -#include <ktexteditor/view.h> +#include <tdemultitabbar.h> +#include <tdetexteditor/view.h> #include "wkafkapart.h" #include "kafkacommon.h" @@ -248,7 +248,7 @@ void QuantaInit::initQuanta() break; } } - KActionMenu *toolviewMenu = (KActionMenu*)(m_quanta->actionCollection()->action("kmdi_toolview_menu")); + KActionMenu *toolviewMenu = (KActionMenu*)(m_quanta->actionCollection()->action("tdemdi_toolview_menu")); if (toolviewMenu) toolviewMenu->plug(m_quanta->windowMenu()); diff --git a/quanta/src/quanta_init.h b/quanta/src/quanta_init.h index 5ca93826..06e4cf07 100644 --- a/quanta/src/quanta_init.h +++ b/quanta/src/quanta_init.h @@ -23,7 +23,7 @@ #include <tqobject.h> // include files for KDE -#include <kparts/dockmainwindow.h> +#include <tdeparts/dockmainwindow.h> //app includes diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index a0f9e177..6a05a444 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -37,21 +37,21 @@ #include <kdebug.h> #include <kiconloader.h> -#include <ktexteditor/view.h> -#include <ktexteditor/configinterface.h> -#include <ktexteditor/highlightinginterface.h> -#include <ktexteditor/popupmenuinterface.h> -#include <ktexteditor/markinterface.h> -#include <ktexteditor/undointerface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/clipboardinterface.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/dynwordwrapinterface.h> -#include <ktexteditor/editorchooser.h> -#include <ktexteditor/editinterface.h> - -#include <kparts/componentfactory.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/configinterface.h> +#include <tdetexteditor/highlightinginterface.h> +#include <tdetexteditor/popupmenuinterface.h> +#include <tdetexteditor/markinterface.h> +#include <tdetexteditor/undointerface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/clipboardinterface.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/dynwordwrapinterface.h> +#include <tdetexteditor/editorchooser.h> +#include <tdetexteditor/editinterface.h> + +#include <tdeparts/componentfactory.h> #include <klibloader.h> #include <ktrader.h> diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index d6f771bf..5e939222 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -35,7 +35,7 @@ #include <kaction.h> #include <kdebug.h> #include <kdirwatch.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <klocale.h> #include <kstandarddirs.h> #include <kmenubar.h> @@ -43,18 +43,18 @@ #include <kmessagebox.h> #include <kurldrag.h> #include <tdeversion.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <kstatusbar.h> #include "undoredo.h" #include "kafkacommon.h" #include "wkafkapart.h" -#include <ktexteditor/document.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/selectioninterfaceext.h> -#include <ktexteditor/view.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/selectioninterfaceext.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/viewcursorinterface.h> // application specific includes #include "document.h" diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h index ebca2705..1f59de19 100644 --- a/quanta/src/quantaview.h +++ b/quanta/src/quantaview.h @@ -26,7 +26,7 @@ #include <tqtimer.h> //kde includes -#include <kmdichildview.h> +#include <tdemdichildview.h> #include <dom/dom_node.h> diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 9446daf6..644e50a7 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -19,15 +19,15 @@ #include <kdirwatch.h> #include <kiconloader.h> #include <klocale.h> -#include <kmdimainfrm.h> +#include <tdemdimainfrm.h> #include <kurl.h> #include <kpopupmenu.h> -#include <ktexteditor/view.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/highlightinginterface.h> -#include <ktexteditor/popupmenuinterface.h> -#include <ktexteditor/editorchooser.h> -#include <ktexteditor/markinterface.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/highlightinginterface.h> +#include <tdetexteditor/popupmenuinterface.h> +#include <tdetexteditor/editorchooser.h> +#include <tdetexteditor/markinterface.h> #include <kio/netaccess.h> diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index 3c05ef0e..f744e52d 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -34,7 +34,7 @@ #include <kmessagebox.h> #include <kconfig.h> #include <kdebug.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/view.h> // app includes #include "messageoutput.h" diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 534131a9..abf4fb37 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -28,10 +28,10 @@ #include <kstringhandler.h> #include <kdebug.h> #include <kiconloader.h> -#include <khtmlview.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/view.h> +#include <tdehtmlview.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/view.h> #include <dom/dom_node.h> //app includes diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 734220b8..c27e07a7 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <kpopupmenu.h> #include <kstringhandler.h> -#include <ktexteditor/markinterface.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/markinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/viewcursorinterface.h> #include <tqregexp.h> #include <tqmemarray.h> diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index ae27c526..d532a8b8 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -35,11 +35,11 @@ #include <kshortcut.h> #include <kstandarddirs.h> #include <ktempfile.h> -#include <ktexteditor/document.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/selectioninterfaceext.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/selectioninterfaceext.h> //app includes #include "tagaction.h" diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp index 87359775..eaad16ec 100644 --- a/quanta/utility/tagactionmanager.cpp +++ b/quanta/utility/tagactionmanager.cpp @@ -18,7 +18,7 @@ #include <kstaticdeleter.h> #include <kactioncollection.h> #include <kaction.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <klocale.h> #include <dom/dom_node.h> |