diff options
Diffstat (limited to 'kate')
59 files changed, 206 insertions, 206 deletions
diff --git a/kate/AUTHORS b/kate/AUTHORS index c12c9810f..8239561ca 100644 --- a/kate/AUTHORS +++ b/kate/AUTHORS @@ -33,7 +33,7 @@ (original author of kwrite in kde 1.x until kde 2.1) - Glen Parker <glenebob@nwlink.com> - (undo history, kspell-integration) + (undo history, tdespell-integration) - Michael Koch <koch@kde.org> (port to KParts) diff --git a/kate/ChangeLog b/kate/ChangeLog index 9797ec671..0da6d5cc2 100644 --- a/kate/ChangeLog +++ b/kate/ChangeLog @@ -33,7 +33,7 @@ * some folding fixes (hopefully) * memleak fix * undo stuff changed a bit, 0 means unlimited like before, show - that now in the dialog and add a comment to ktexteditor + that now in the dialog and add a comment to tdetexteditor 2002-08-26 Christoph Cullmann <cullmann@kde.org> * Fixes for folding, cleanup, move folding tree into the buffer, diff --git a/kate/Mainpage.dox b/kate/Mainpage.dox index 8d8515b52..0fc1d9490 100644 --- a/kate/Mainpage.dox +++ b/kate/Mainpage.dox @@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\> @lgpl */ -// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs +// DOXYGEN_REFERENCES = tdecore kio tdeui tdeparts interfaces/kdocument interfaces/tdetexteditor kjs // DOXYGEN_SET_PROJECT_NAME = Kate // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kate/Makefile.am b/kate/Makefile.am index 04666d8cb..e39af3b7f 100644 --- a/kate/Makefile.am +++ b/kate/Makefile.am @@ -6,6 +6,6 @@ messages: $(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp $(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot -DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts +DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts include ../admin/Doxyfile.am diff --git a/kate/data/css.xml b/kate/data/css.xml index 02ab43036..f3e65d267 100644 --- a/kate/data/css.xml +++ b/kate/data/css.xml @@ -17,7 +17,7 @@ - Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset". - Added CSS 3 color values: "rgba", "hsl" and "hsla". - Added Gecko CSS properties: "-moz-border-*-colors". - - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-khtml-". + - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-tdehtml-". - Version 2.01, by Mathieu Bonnet: - Added CSS 3 property "border-radius". @@ -196,7 +196,7 @@ <item> -o-text-overflow </item> <!-- konq specific --> - <item> -khtml-background-size </item> + <item> -tdehtml-background-size </item> <item> konq_bgpos_x </item> <item> konq_bgpos_y </item> diff --git a/kate/data/katepartreadonlyui.rc b/kate/data/katepartreadonlyui.rc index 5c899dbfb..e1fff590e 100644 --- a/kate/data/katepartreadonlyui.rc +++ b/kate/data/katepartreadonlyui.rc @@ -77,7 +77,7 @@ </Menu> </MenuBar> -<Menu name="ktexteditor_popup" noMerge="1"> +<Menu name="tdetexteditor_popup" noMerge="1"> <Action name="edit_undo" group="popup_operations" /> <Action name="edit_redo" group="popup_operations" /> <Separator group="popup_operations" /> diff --git a/kate/data/katepartui.rc b/kate/data/katepartui.rc index 13908ad14..7a01434e2 100644 --- a/kate/data/katepartui.rc +++ b/kate/data/katepartui.rc @@ -92,7 +92,7 @@ </Menu> </MenuBar> -<Menu name="ktexteditor_popup" noMerge="0"> +<Menu name="tdetexteditor_popup" noMerge="0"> <Action name="edit_undo" group="popup_operations" /> <Action name="edit_redo" group="popup_operations" /> <Separator group="popup_operations" /> diff --git a/kate/data/scss.xml b/kate/data/scss.xml index 918f5c0b3..cfa6224cf 100644 --- a/kate/data/scss.xml +++ b/kate/data/scss.xml @@ -189,7 +189,7 @@ <item> -o-text-overflow </item> <!-- konq specific --> - <item> -khtml-background-size </item> + <item> -tdehtml-background-size </item> <item> konq_bgpos_x </item> <item> konq_bgpos_y </item> diff --git a/kate/interfaces/CMakeLists.txt b/kate/interfaces/CMakeLists.txt index c747f184c..f62bcdb0f 100644 --- a/kate/interfaces/CMakeLists.txt +++ b/kate/interfaces/CMakeLists.txt @@ -42,6 +42,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK ktexteditor-shared + LINK tdetexteditor-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am index 94065cb3c..d14e58f89 100644 --- a/kate/interfaces/Makefile.am +++ b/kate/interfaces/Makefile.am @@ -3,10 +3,10 @@ METASOURCES = document.moc view.moc lib_LTLIBRARIES = libkatepartinterfaces.la libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp -libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE) +libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE) libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined kateinclude_HEADERS = document.h view.h kateincludedir = $(includedir)/kate -INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes) +INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdeparts -I$(top_srcdir) $(all_includes) diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h index 023840335..c56600357 100644 --- a/kate/interfaces/document.h +++ b/kate/interfaces/document.h @@ -19,24 +19,24 @@ #ifndef _KATE_DOCUMENT_INCLUDE_ #define _KATE_DOCUMENT_INCLUDE_ -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/undointerface.h> -#include <ktexteditor/cursorinterface.h> -#include <ktexteditor/documentinfo.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/selectioninterfaceext.h> -#include <ktexteditor/blockselectioninterface.h> -#include <ktexteditor/searchinterface.h> -#include <ktexteditor/highlightinginterface.h> -#include <ktexteditor/configinterface.h> -#include <ktexteditor/configinterfaceextension.h> -#include <ktexteditor/markinterface.h> -#include <ktexteditor/markinterfaceextension.h> -#include <ktexteditor/wordwrapinterface.h> -#include <ktexteditor/printinterface.h> -#include <ktexteditor/variableinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/undointerface.h> +#include <tdetexteditor/cursorinterface.h> +#include <tdetexteditor/documentinfo.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/selectioninterfaceext.h> +#include <tdetexteditor/blockselectioninterface.h> +#include <tdetexteditor/searchinterface.h> +#include <tdetexteditor/highlightinginterface.h> +#include <tdetexteditor/configinterface.h> +#include <tdetexteditor/configinterfaceextension.h> +#include <tdetexteditor/markinterface.h> +#include <tdetexteditor/markinterfaceextension.h> +#include <tdetexteditor/wordwrapinterface.h> +#include <tdetexteditor/printinterface.h> +#include <tdetexteditor/variableinterface.h> #include <kaction.h> diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h index 20bcdf531..3b2b8a4e1 100644 --- a/kate/interfaces/view.h +++ b/kate/interfaces/view.h @@ -19,14 +19,14 @@ #ifndef _KATE_VIEW_INCLUDE_ #define _KATE_VIEW_INCLUDE_ -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> -#include <ktexteditor/clipboardinterface.h> -#include <ktexteditor/popupmenuinterface.h> -#include <ktexteditor/markinterface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/codecompletioninterface.h> -#include <ktexteditor/dynwordwrapinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/clipboardinterface.h> +#include <tdetexteditor/popupmenuinterface.h> +#include <tdetexteditor/markinterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/codecompletioninterface.h> +#include <tdetexteditor/dynwordwrapinterface.h> class TDEConfig; diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt index 11e347212..72ac36f8a 100644 --- a/kate/part/CMakeLists.txt +++ b/kate/part/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kjs - ${CMAKE_SOURCE_DIR}/kutils + ${CMAKE_SOURCE_DIR}/tdeutils ${CMAKE_SOURCE_DIR}/tdeprint ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor @@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy tde_add_kpart( ${target} SOURCES dummy.cpp EMBED kate-static - LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared + LINK kjs-shared tdeprint-shared katepartinterfaces-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am index 746c35813..a0e0edbc3 100644 --- a/kate/part/Makefile.am +++ b/kate/part/Makefile.am @@ -16,11 +16,11 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.cpp \ libkatepart_la_SOURCES = dummy.cpp -libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la +libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes) +INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes) METASOURCES = AUTO diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp index 1661c69df..7d930570d 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -118,7 +118,7 @@ class KateFileLoader if (c > 0) { - // fix utf16 LE, stolen from khtml ;) + // fix utf16 LE, stolen from tdehtml ;) if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00)) { // utf16LE, we need to put the decoder in LE mode diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h index c2bebc841..ce4af0ecf 100644 --- a/kate/part/katecodecompletion.h +++ b/kate/part/katecodecompletion.h @@ -28,7 +28,7 @@ #ifndef __KateCodeCompletion_H__ #define __KateCodeCompletion_H__ -#include <ktexteditor/codecompletioninterface.h> +#include <tdetexteditor/codecompletioninterface.h> #include <tqvaluelist.h> #include <tqstringlist.h> diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h index 4c1f7294a..a698bc35d 100644 --- a/kate/part/kateconfig.h +++ b/kate/part/kateconfig.h @@ -19,7 +19,7 @@ #ifndef __KATE_CONFIG_H__ #define __KATE_CONFIG_H__ -#include <ktexteditor/markinterface.h> +#include <tdetexteditor/markinterface.h> #include <tqbitarray.h> #include <tqcolor.h> diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index aa122a7b1..43f5977d8 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -35,8 +35,8 @@ #include "kateview.h" -#include <ktexteditor/configinterfaceextension.h> -#include <ktexteditor/plugin.h> +#include <tdetexteditor/configinterfaceextension.h> +#include <tdetexteditor/plugin.h> #include <kio/job.h> #include <kio/jobclasses.h> @@ -64,7 +64,7 @@ #include <kmessagebox.h> #include <kmimetypechooser.h> #include <knuminput.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kpopupmenu.h> #include <kprocess.h> #include <kprocio.h> diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index f8f190c14..03c8ac638 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -40,14 +40,14 @@ #include "katefiletype.h" #include "kateschema.h" #include "katetemplatehandler.h" -#include <ktexteditor/plugin.h> +#include <tdetexteditor/plugin.h> #include <kio/job.h> #include <kio/netaccess.h> #include <kio/kfileitem.h> -#include <kparts/event.h> +#include <tdeparts/event.h> #include <klocale.h> #include <kglobal.h> @@ -112,7 +112,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, // my dcop object setObjId ("KateDocument#"+documentDCOPSuffix()); - // ktexteditor interfaces + // tdetexteditor interfaces setBlockSelectionInterfaceDCOPSuffix (documentDCOPSuffix()); setConfigInterfaceDCOPSuffix (documentDCOPSuffix()); setConfigInterfaceExtensionDCOPSuffix (documentDCOPSuffix()); @@ -2761,7 +2761,7 @@ bool KateDocument::closeURL() } // - // first call the normal kparts implementation + // first call the normal tdeparts implementation // if (!KParts::ReadWritePart::closeURL ()) return false; diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index fec6983e4..1135a66fc 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -29,11 +29,11 @@ #include "../interfaces/document.h" -#include <ktexteditor/configinterfaceextension.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/sessionconfiginterface.h> -#include <ktexteditor/editinterfaceext.h> -#include <ktexteditor/templateinterface.h> +#include <tdetexteditor/configinterfaceextension.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/sessionconfiginterface.h> +#include <tdetexteditor/editinterfaceext.h> +#include <tdetexteditor/templateinterface.h> #include <dcopobject.h> @@ -955,7 +955,7 @@ class KateDocument : public Kate::Document, /** * Variable Reader - * TODO add register functionality/ktexteditor interface + * TODO add register functionality/tdetexteditor interface */ private: /** diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h index 75c6740d0..b604d47ce 100644 --- a/kate/part/katedocumenthelpers.h +++ b/kate/part/katedocumenthelpers.h @@ -23,7 +23,7 @@ #include "../interfaces/document.h" -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <tqstringlist.h> #include <tqguardedptr.h> diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h index 79d3ac011..a01e3a32c 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -20,7 +20,7 @@ #define __KATE_FACTORY_H__ #include "katejscript.h" -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <ktrader.h> #include <kinstance.h> @@ -148,7 +148,7 @@ class KateFactory /** * on start detected plugins - * @return list of all at launch detected ktexteditor::plugins + * @return list of all at launch detected tdetexteditor::plugins */ inline const KTrader::OfferList &plugins () { return m_plugins; }; diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index b7703ccdf..28b22c74e 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -52,7 +52,7 @@ namespace KJS { -// taken from khtml +// taken from tdehtml // therefor thx to: // Copyright (C) 1999-2003 Harri Porten (porten@kde.org) // Copyright (C) 2001-2003 David Faure (faure@kde.org) diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index fa8b21f64..0cb802e97 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -40,7 +40,7 @@ #include <kcolordialog.h> #include <kapplication.h> #include <kaboutdata.h> -#include <ktexteditor/markinterface.h> +#include <tdetexteditor/markinterface.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp index 6ce2b2a72..77e693fa6 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -28,7 +28,7 @@ #include <kaction.h> #include <kstdaction.h> -#include <kspell.h> +#include <tdespell.h> #include <ksconfig.h> #include <kdebug.h> #include <kmessagebox.h> @@ -36,18 +36,18 @@ KateSpell::KateSpell( KateView* view ) : TQObject( view ) , m_view (view) - , m_kspell (0) + , m_tdespell (0) { } KateSpell::~KateSpell() { - // kspell stuff - if( m_kspell ) + // tdespell stuff + if( m_tdespell ) { - m_kspell->setAutoDelete(true); - m_kspell->cleanUp(); // need a way to wait for this to complete - delete m_kspell; + m_tdespell->setAutoDelete(true); + m_tdespell->cleanUp(); // need a way to wait for this to complete + delete m_tdespell; } } @@ -122,27 +122,27 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to else kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl; - m_kspell = new KSpell( m_view, i18n("Spellcheck"), + m_tdespell = new KSpell( m_view, i18n("Spellcheck"), this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type ); - connect( m_kspell, TQT_SIGNAL(death()), + connect( m_tdespell, TQT_SIGNAL(death()), this, TQT_SLOT(spellCleanDone()) ); - connect( m_kspell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), + connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) ); - connect( m_kspell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), + connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) ); - connect( m_kspell, TQT_SIGNAL(done(const TQString&)), + connect( m_tdespell, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(spellResult(const TQString&)) ); } void KateSpell::ready(KSpell *) { - m_kspell->setProgressResolution( 1 ); + m_tdespell->setProgressResolution( 1 ); - m_kspell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) ); + m_tdespell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) ); - kdDebug (13020) << "SPELLING READY STATUS: " << m_kspell->status () << endl; + kdDebug (13020) << "SPELLING READY STATUS: " << m_tdespell->status () << endl; } void KateSpell::locatePosition( uint pos, uint& line, uint& col ) @@ -193,12 +193,12 @@ void KateSpell::corrected( const TQString& originalword, const TQString& newword void KateSpell::spellResult( const TQString& ) { m_view->clearSelection(); - m_kspell->cleanUp(); + m_tdespell->cleanUp(); } void KateSpell::spellCleanDone() { - KSpell::spellStatus status = m_kspell->status(); + KSpell::spellStatus status = m_tdespell->status(); if( status == KSpell::Error ) { KMessageBox::sorry( 0, @@ -210,8 +210,8 @@ void KateSpell::spellCleanDone() i18n("The spelling program seems to have crashed.")); } - delete m_kspell; - m_kspell = 0; + delete m_tdespell; + m_tdespell = 0; kdDebug (13020) << "SPELLING END" << endl; } diff --git a/kate/part/katespell.h b/kate/part/katespell.h index 870a88194..f5a776c8d 100644 --- a/kate/part/katespell.h +++ b/kate/part/katespell.h @@ -71,7 +71,7 @@ class KateSpell : public TQObject KateView *m_view; KAction *m_spellcheckSelection; - KSpell *m_kspell; + KSpell *m_tdespell; // define the part of the text to check KateTextCursor m_spellStart, m_spellEnd; diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index ca457acaa..193f411fd 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -46,9 +46,9 @@ #include "kateautoindent.h" #include "katespell.h" -#include <ktexteditor/plugin.h> +#include <tdetexteditor/plugin.h> -#include <kparts/event.h> +#include <tdeparts/event.h> #include <kio/netaccess.h> @@ -67,7 +67,7 @@ #include <kaccel.h> #include <klibloader.h> #include <kencodingfiledialog.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <ktempfile.h> #include <ksavefile.h> diff --git a/kate/part/kateview.h b/kate/part/kateview.h index f4ec54801..1d6a1016f 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -28,9 +28,9 @@ #include "../interfaces/view.h" -#include <ktexteditor/sessionconfiginterface.h> -#include <ktexteditor/viewstatusmsginterface.h> -#include <ktexteditor/texthintinterface.h> +#include <tdetexteditor/sessionconfiginterface.h> +#include <tdetexteditor/viewstatusmsginterface.h> +#include <tdetexteditor/texthintinterface.h> #include <tqguardedptr.h> diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 109a3c8b1..4f2ef26a5 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -66,7 +66,7 @@ #include "katedocument.h" #include "kateview.h" -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include "katejscript.h" #include "katedocumenthelpers.h" #include "kateconfig.h" diff --git a/kate/plugins/autobookmarker/Makefile.am b/kate/plugins/autobookmarker/Makefile.am index 748dbb2e5..4465a88a7 100644 --- a/kate/plugins/autobookmarker/Makefile.am +++ b/kate/plugins/autobookmarker/Makefile.am @@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = ktexteditor_autobookmarker.la +kde_module_LTLIBRARIES = tdetexteditor_autobookmarker.la -ktexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp -ktexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la -ktexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +tdetexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp +tdetexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la +tdetexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kde_services_DATA = ktexteditor_autobookmarker.desktop +kde_services_DATA = tdetexteditor_autobookmarker.desktop confdir=$(kde_confdir) -conf_DATA = ktexteditor_autobookmarkerrc +conf_DATA = tdetexteditor_autobookmarkerrc messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_autobookmarker.pot + $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_autobookmarker.pot diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 2a7a6de45..ceb76eedd 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -23,10 +23,10 @@ //BEGIN includes #include "autobookmarker.h" -#include <ktexteditor/markinterfaceextension.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/documentinfo.h> -#include <ktexteditor/document.h> +#include <tdetexteditor/markinterfaceextension.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/documentinfo.h> +#include <tdetexteditor/document.h> #include <kaction.h> #include <kapplication.h> @@ -57,7 +57,7 @@ //END includes //BEGIN AutoBookmarker -K_EXPORT_COMPONENT_FACTORY( ktexteditor_autobookmarker, KGenericFactory<AutoBookmarker>( "ktexteditor_autobookmarker" ) ) +K_EXPORT_COMPONENT_FACTORY( tdetexteditor_autobookmarker, KGenericFactory<AutoBookmarker>( "tdetexteditor_autobookmarker" ) ) AutoBookmarker::AutoBookmarker( TQObject *parent, const char* name, @@ -199,7 +199,7 @@ void ABGlobal::readConfig() m_ents = new ABEntityList; else m_ents->clear(); - TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc"); + TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc"); uint n( 0 ); while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) ) @@ -225,7 +225,7 @@ void ABGlobal::readConfig() void ABGlobal::writeConfig() { - TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc"); + TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc"); // clean the config object TQStringList l = config->groupList(); diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h index bdeb2abcf..4a7b998de 100644 --- a/kate/plugins/autobookmarker/autobookmarker.h +++ b/kate/plugins/autobookmarker/autobookmarker.h @@ -23,8 +23,8 @@ #ifndef _AUTOBOOKMARKER_H_ #define _AUTOBOOKMARKER_H_ -#include <ktexteditor/plugin.h> -#include <ktexteditor/configinterfaceextension.h> +#include <tdetexteditor/plugin.h> +#include <tdetexteditor/configinterfaceextension.h> #include <kdialogbase.h> diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop index 632d84628..ea5b08247 100644 --- a/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop +++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop @@ -128,7 +128,7 @@ Comment[uk]=Встановлює закладки на рядках, що від Comment[vi]=Đặt đánh dấu trên các dòng khớp một mẫu nào đó khi tải tài liệu. Comment[zh_CN]=文档装入时根据匹配模式自动设置书签 Comment[zh_TW]=文件載入時以字串比對演算法來設定書籤。 -X-TDE-Library=ktexteditor_autobookmarker +X-TDE-Library=tdetexteditor_autobookmarker ServiceTypes=KTextEditor/Plugin Type=Service InitialPreference=8 diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc b/kate/plugins/autobookmarker/tdetexteditor_autobookmarkerrc index 3ed8fe8c5..3ed8fe8c5 100644 --- a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc +++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarkerrc diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt index 8f4390f64..0c80a1e0c 100644 --- a/kate/plugins/insertfile/CMakeLists.txt +++ b/kate/plugins/insertfile/CMakeLists.txt @@ -29,13 +29,13 @@ link_directories( ##### other data ################################ -install( FILES ktexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES ktexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_insertfile ) +install( FILES tdetexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdetexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_insertfile ) -##### ktexteditor_insertfile #################### +##### tdetexteditor_insertfile #################### -set( target ktexteditor_insertfile ) +set( target tdetexteditor_insertfile ) set( ${target}_SRCS insertfileplugin.cpp @@ -43,6 +43,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK ktexteditor-shared + LINK tdetexteditor-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kate/plugins/insertfile/Makefile.am b/kate/plugins/insertfile/Makefile.am index fc8b1e228..1cce05391 100644 --- a/kate/plugins/insertfile/Makefile.am +++ b/kate/plugins/insertfile/Makefile.am @@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = ktexteditor_insertfile.la +kde_module_LTLIBRARIES = tdetexteditor_insertfile.la -ktexteditor_insertfile_la_SOURCES = insertfileplugin.cpp -ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) -ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +tdetexteditor_insertfile_la_SOURCES = insertfileplugin.cpp +tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) +tdetexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile -insertfiledata_DATA = ktexteditor_insertfileui.rc +insertfiledatadir = $(kde_datadir)/tdetexteditor_insertfile +insertfiledata_DATA = tdetexteditor_insertfileui.rc -kde_services_DATA = ktexteditor_insertfile.desktop +kde_services_DATA = tdetexteditor_insertfile.desktop messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_insertfile.pot + $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_insertfile.pot diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index 082c0ffc9..ee46a7cff 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -19,9 +19,9 @@ #include "insertfileplugin.h" #include "insertfileplugin.moc" -#include <ktexteditor/document.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/editinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/editinterface.h> #include <assert.h> #include <kio/job.h> @@ -37,7 +37,7 @@ #include <tqfile.h> #include <tqtextstream.h> -K_EXPORT_COMPONENT_FACTORY( ktexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "ktexteditor_insertfile" ) ) +K_EXPORT_COMPONENT_FACTORY( tdetexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "tdetexteditor_insertfile" ) ) //BEGIN InsertFilePlugin @@ -77,7 +77,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char setInstance( KGenericFactory<InsertFilePlugin>::instance() ); _job = 0; (void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); - setXMLFile( "ktexteditor_insertfileui.rc" ); + setXMLFile( "tdetexteditor_insertfileui.rc" ); } void InsertFilePluginView::slotInsertFile() diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h index d6751f0d1..da08a02c7 100644 --- a/kate/plugins/insertfile/insertfileplugin.h +++ b/kate/plugins/insertfile/insertfileplugin.h @@ -22,8 +22,8 @@ #ifndef _INSERT_FILE_PLUGIN_H_ #define _INSERT_FILE_PLUGIN_H_ -#include <ktexteditor/plugin.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/plugin.h> +#include <tdetexteditor/view.h> #include <kxmlguiclient.h> #include <tqobject.h> diff --git a/kate/plugins/insertfile/ktexteditor_insertfile.desktop b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop index 7e08d71b7..493369e29 100644 --- a/kate/plugins/insertfile/ktexteditor_insertfile.desktop +++ b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop @@ -149,7 +149,7 @@ Comment[vi]=Chèn bất kỳ tập tin có khả năng đọc tại vị trí c Comment[zh_CN]=在光标位置插入任何可读文件 Comment[zh_HK]=在游標處插入任意的檔案 Comment[zh_TW]=在游標處插入任意的可讀檔案 -X-TDE-Library=ktexteditor_insertfile +X-TDE-Library=tdetexteditor_insertfile ServiceTypes=KTextEditor/Plugin Type=Service InitialPreference=8 diff --git a/kate/plugins/insertfile/ktexteditor_insertfileui.rc b/kate/plugins/insertfile/tdetexteditor_insertfileui.rc index 36ac0916f..d92e512ff 100644 --- a/kate/plugins/insertfile/ktexteditor_insertfileui.rc +++ b/kate/plugins/insertfile/tdetexteditor_insertfileui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartplugin name="ktexteditor_insertfile" library="ktexteditor_insertfile" version="2"> +<kpartplugin name="tdetexteditor_insertfile" library="tdetexteditor_insertfile" version="2"> <MenuBar> <Menu name="tools"><Text>&Tools</Text> <separator group="tools_operations" /> diff --git a/kate/plugins/isearch/CMakeLists.txt b/kate/plugins/isearch/CMakeLists.txt index 693c3a409..38a042973 100644 --- a/kate/plugins/isearch/CMakeLists.txt +++ b/kate/plugins/isearch/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### other data ################################ -install( FILES ktexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES ktexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_isearch ) +install( FILES tdetexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdetexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_isearch ) -##### ktexteditor_isearch ####################### +##### tdetexteditor_isearch ####################### -set( target ktexteditor_isearch ) +set( target tdetexteditor_isearch ) set( ${target}_SRCS ISearchPlugin.cpp @@ -41,6 +41,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK ktexteditor-shared + LINK tdetexteditor-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 27d0b138d..26c49576d 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -30,7 +30,7 @@ #include "ISearchPlugin.h" #include "ISearchPlugin.moc" -K_EXPORT_COMPONENT_FACTORY( ktexteditor_isearch, KGenericFactory<ISearchPlugin>( "ktexteditor_isearch" ) ) +K_EXPORT_COMPONENT_FACTORY( tdetexteditor_isearch, KGenericFactory<ISearchPlugin>( "tdetexteditor_isearch" ) ) ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) : TQObject ( view ), KXMLGUIClient (view) @@ -139,7 +139,7 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) // action->setChecked( m_autoWrap ); // optionMenu->insert( action ); - setXMLFile( "ktexteditor_isearchui.rc" ); + setXMLFile( "tdetexteditor_isearchui.rc" ); } ISearchPluginView::~ISearchPluginView() diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h index 836ecbc7e..980630795 100644 --- a/kate/plugins/isearch/ISearchPlugin.h +++ b/kate/plugins/isearch/ISearchPlugin.h @@ -19,12 +19,12 @@ #ifndef _ISearchPlugin_H_ #define _ISearchPlugin_H_ -#include <ktexteditor/plugin.h> -#include <ktexteditor/view.h> -#include <ktexteditor/document.h> -#include <ktexteditor/searchinterface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/selectioninterface.h> +#include <tdetexteditor/plugin.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/searchinterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/selectioninterface.h> #include <kxmlguiclient.h> #include <tqobject.h> diff --git a/kate/plugins/isearch/Makefile.am b/kate/plugins/isearch/Makefile.am index f71da53e7..cc9356954 100644 --- a/kate/plugins/isearch/Makefile.am +++ b/kate/plugins/isearch/Makefile.am @@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = ktexteditor_isearch.la +kde_module_LTLIBRARIES = tdetexteditor_isearch.la -ktexteditor_isearch_la_SOURCES = ISearchPlugin.cpp -ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +tdetexteditor_isearch_la_SOURCES = ISearchPlugin.cpp +tdetexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +tdetexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -isearchdatadir = $(kde_datadir)/ktexteditor_isearch -isearchdata_DATA = ktexteditor_isearchui.rc +isearchdatadir = $(kde_datadir)/tdetexteditor_isearch +isearchdata_DATA = tdetexteditor_isearchui.rc -kde_services_DATA = ktexteditor_isearch.desktop +kde_services_DATA = tdetexteditor_isearch.desktop messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_isearch.pot + $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_isearch.pot diff --git a/kate/plugins/isearch/ktexteditor_isearch.desktop b/kate/plugins/isearch/tdetexteditor_isearch.desktop index 2e49615d8..6fb7894c5 100644 --- a/kate/plugins/isearch/ktexteditor_isearch.desktop +++ b/kate/plugins/isearch/tdetexteditor_isearch.desktop @@ -146,7 +146,7 @@ Comment[uk]=Також відомий як "Пошук за вводом" Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ». Comment[zh_CN]=也称为“即输即搜” Comment[zh_TW]=也稱做「即時搜尋」 -X-TDE-Library=ktexteditor_isearch +X-TDE-Library=tdetexteditor_isearch ServiceTypes=KTextEditor/Plugin Type=Service InitialPreference=8 diff --git a/kate/plugins/isearch/ktexteditor_isearchui.rc b/kate/plugins/isearch/tdetexteditor_isearchui.rc index d8fc6b5dd..a12fb64a2 100644 --- a/kate/plugins/isearch/ktexteditor_isearchui.rc +++ b/kate/plugins/isearch/tdetexteditor_isearchui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartplugin name="ktexteditor_isearch" library="ktexteditor_isearch" version="4"> +<kpartplugin name="tdetexteditor_isearch" library="tdetexteditor_isearch" version="4"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Action name="edit_isearch" group="edit_find_merge"/> diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt index aba50c79f..1adced175 100644 --- a/kate/plugins/kdatatool/CMakeLists.txt +++ b/kate/plugins/kdatatool/CMakeLists.txt @@ -29,13 +29,13 @@ link_directories( ##### other data ################################ -install( FILES ktexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES ktexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_kdatatool ) +install( FILES tdetexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdetexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_kdatatool ) -##### ktexteditor_kdatatool ##################### +##### tdetexteditor_kdatatool ##################### -set( target ktexteditor_kdatatool ) +set( target tdetexteditor_kdatatool ) set( ${target}_SRCS kate_kdatatool.cpp @@ -43,6 +43,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK ktexteditor-shared + LINK tdetexteditor-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kate/plugins/kdatatool/Makefile.am b/kate/plugins/kdatatool/Makefile.am index 210fa69e8..2d4417d97 100644 --- a/kate/plugins/kdatatool/Makefile.am +++ b/kate/plugins/kdatatool/Makefile.am @@ -2,18 +2,18 @@ INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = ktexteditor_kdatatool.la +kde_module_LTLIBRARIES = tdetexteditor_kdatatool.la -ktexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp -ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) -ktexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +tdetexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp +tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) +tdetexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kdatatooldatadir = $(kde_datadir)/ktexteditor_kdatatool -kdatatooldata_DATA = ktexteditor_kdatatoolui.rc +kdatatooldatadir = $(kde_datadir)/tdetexteditor_kdatatool +kdatatooldata_DATA = tdetexteditor_kdatatoolui.rc -kde_services_DATA = ktexteditor_kdatatool.desktop +kde_services_DATA = tdetexteditor_kdatatool.desktop messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_kdatatool.pot + $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_kdatatool.pot diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index 3265a77bf..832ff5eb7 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -21,19 +21,19 @@ #include "kate_kdatatool.moc" #include <kgenericfactory.h> #include <kaction.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/view.h> #include <kdebug.h> #include <kdatatool.h> -#include <ktexteditor/document.h> -#include <ktexteditor/selectioninterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/selectioninterface.h> #include <kpopupmenu.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/editinterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/editinterface.h> #include <kmessagebox.h> //END includes -K_EXPORT_COMPONENT_FACTORY( ktexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "ktexteditor_kdatatool" ) ) +K_EXPORT_COMPONENT_FACTORY( tdetexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "tdetexteditor_kdatatool" ) ) namespace KTextEditor { @@ -77,7 +77,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view ) m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow())); - setXMLFile("ktexteditor_kdatatoolui.rc"); + setXMLFile("tdetexteditor_kdatatoolui.rc"); m_view = view; } diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h index fbe4e7bf0..ac437dd16 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.h +++ b/kate/plugins/kdatatool/kate_kdatatool.h @@ -21,7 +21,7 @@ #ifndef _KATE_KDATATOOL_ #define _KATE_KDATATOOL_ -#include <ktexteditor/plugin.h> +#include <tdetexteditor/plugin.h> #include <tqstringlist.h> #include <kxmlguiclient.h> #include <tqguardedptr.h> diff --git a/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc b/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc deleted file mode 100644 index b98806200..000000000 --- a/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE kpartgui> -<kpartplugin name="ktexteditor_kdatatoolui" library="ktexteditor_kdatatool" version="2"> - -<Menu name="ktexteditor_popup" noMerge="1"> - <Action name="popup_dataTool" group="popup_operations"/> -</Menu> - -</kpartplugin> diff --git a/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop index 9f3649521..d8019c570 100644 --- a/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop +++ b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop @@ -162,7 +162,7 @@ Comment[zh_CN]=启用像辞典(thesaurus)和拼写检查(spell check)这样的 Comment[zh_HK]=如果有安裝的話，啟用像同義字字典和拼字檢查等的文字工具 Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話) Comment[zu]=Nika amandla amathuluzi edata anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe) -X-TDE-Library=ktexteditor_kdatatool +X-TDE-Library=tdetexteditor_kdatatool ServiceTypes=KTextEditor/Plugin Type=Service InitialPreference=8 diff --git a/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc b/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc new file mode 100644 index 000000000..ae405e3e7 --- /dev/null +++ b/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc @@ -0,0 +1,8 @@ +<!DOCTYPE kpartgui> +<kpartplugin name="tdetexteditor_kdatatoolui" library="tdetexteditor_kdatatool" version="2"> + +<Menu name="tdetexteditor_popup" noMerge="1"> + <Action name="popup_dataTool" group="popup_operations"/> +</Menu> + +</kpartplugin> diff --git a/kate/plugins/wordcompletion/CMakeLists.txt b/kate/plugins/wordcompletion/CMakeLists.txt index 007b93f20..c09dbda6d 100644 --- a/kate/plugins/wordcompletion/CMakeLists.txt +++ b/kate/plugins/wordcompletion/CMakeLists.txt @@ -25,13 +25,13 @@ link_directories( ##### other data ################################ -install( FILES ktexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_docwordcompletion ) +install( FILES tdetexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_docwordcompletion ) -##### ktexteditor_docwordcompletion ############# +##### tdetexteditor_docwordcompletion ############# -set( target ktexteditor_docwordcompletion ) +set( target tdetexteditor_docwordcompletion ) set( ${target}_SRCS docwordcompletion.cpp @@ -39,6 +39,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK ktexteditor-shared + LINK tdetexteditor-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kate/plugins/wordcompletion/Makefile.am b/kate/plugins/wordcompletion/Makefile.am index e79d02fb5..1fd67eaf7 100644 --- a/kate/plugins/wordcompletion/Makefile.am +++ b/kate/plugins/wordcompletion/Makefile.am @@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = ktexteditor_docwordcompletion.la +kde_module_LTLIBRARIES = tdetexteditor_docwordcompletion.la -ktexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp -ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +tdetexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp +tdetexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +tdetexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion +docwordcompletiondatadir = $(kde_datadir)/tdetexteditor_docwordcompletion docwordcompletiondata_DATA = docwordcompletionui.rc -kde_services_DATA = ktexteditor_docwordcompletion.desktop +kde_services_DATA = tdetexteditor_docwordcompletion.desktop messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_docwordcompletion.pot + $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_docwordcompletion.pot diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 2c2bbcb23..a468edd13 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -28,10 +28,10 @@ //BEGIN includes #include "docwordcompletion.h" -#include <ktexteditor/document.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/variableinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/variableinterface.h> #include <kapplication.h> #include <kconfig.h> @@ -40,7 +40,7 @@ #include <klocale.h> #include <kaction.h> #include <knotifyclient.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kiconloader.h> #include <tqregexp.h> @@ -57,7 +57,7 @@ //END //BEGIN DocWordCompletionPlugin -K_EXPORT_COMPONENT_FACTORY( ktexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "ktexteditor_docwordcompletion" ) ) +K_EXPORT_COMPONENT_FACTORY( tdetexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "tdetexteditor_docwordcompletion" ) ) DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent, const char* name, const TQStringList& /*args*/ ) diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h index ed632631a..22b469695 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.h +++ b/kate/plugins/wordcompletion/docwordcompletion.h @@ -29,10 +29,10 @@ #ifndef _DocWordCompletionPlugin_h_ #define _DocWordCompletionPlugin_h_ -#include <ktexteditor/plugin.h> -#include <ktexteditor/view.h> -#include <ktexteditor/codecompletioninterface.h> -#include <ktexteditor/configinterfaceextension.h> +#include <tdetexteditor/plugin.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/codecompletioninterface.h> +#include <tdetexteditor/configinterfaceextension.h> #include <kxmlguiclient.h> #include <tqevent.h> diff --git a/kate/plugins/wordcompletion/docwordcompletionui.rc b/kate/plugins/wordcompletion/docwordcompletionui.rc index f8095e128..fb1c3f7a5 100644 --- a/kate/plugins/wordcompletion/docwordcompletionui.rc +++ b/kate/plugins/wordcompletion/docwordcompletionui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartplugin name="ktexteditor_docwordcompletion" library="ktexteditor_docwordcompletion" version="4"> +<kpartplugin name="tdetexteditor_docwordcompletion" library="tdetexteditor_docwordcompletion" version="4"> <MenuBar> <Menu name="tools"><Text>&Tools</Text> <separator group="tools_operations" /> diff --git a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop index d0528d90f..b18e1bf84 100644 --- a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop +++ b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop @@ -132,7 +132,7 @@ Comment[uk]=Завершення слів у документі. Пряме аб Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chiều hoặc vào bộ bật lên. Comment[zh_CN]=在文档中基于方向或弹出补全单词 Comment[zh_TW]=在編輯文件時的單字補完功能 -X-TDE-Library=ktexteditor_docwordcompletion +X-TDE-Library=tdetexteditor_docwordcompletion ServiceTypes=KTextEditor/Plugin Type=Service InitialPreference=8 |