diff options
Diffstat (limited to 'quanta')
50 files changed, 166 insertions, 166 deletions
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> |