diff options
Diffstat (limited to 'kate/part')
-rw-r--r-- | kate/part/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kate/part/Makefile.am | 4 | ||||
-rw-r--r-- | kate/part/katebuffer.cpp | 2 | ||||
-rw-r--r-- | kate/part/katecodecompletion.h | 2 | ||||
-rw-r--r-- | kate/part/kateconfig.h | 2 | ||||
-rw-r--r-- | kate/part/katedialogs.cpp | 6 | ||||
-rw-r--r-- | kate/part/katedocument.cpp | 8 | ||||
-rw-r--r-- | kate/part/katedocument.h | 12 | ||||
-rw-r--r-- | kate/part/katedocumenthelpers.h | 2 | ||||
-rw-r--r-- | kate/part/katefactory.h | 4 | ||||
-rw-r--r-- | kate/part/katejscript.cpp | 2 | ||||
-rw-r--r-- | kate/part/kateschema.cpp | 2 | ||||
-rw-r--r-- | kate/part/katespell.cpp | 38 | ||||
-rw-r--r-- | kate/part/katespell.h | 2 | ||||
-rw-r--r-- | kate/part/kateview.cpp | 6 | ||||
-rw-r--r-- | kate/part/kateview.h | 6 | ||||
-rw-r--r-- | kate/part/test_regression.cpp | 2 |
17 files changed, 52 insertions, 52 deletions
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" |