diff options
Diffstat (limited to 'kate')
27 files changed, 38 insertions, 38 deletions
diff --git a/kate/data/idconsole.xml b/kate/data/idconsole.xml index fa2a5cffd..9275cd944 100644 --- a/kate/data/idconsole.xml +++ b/kate/data/idconsole.xml @@ -197,7 +197,7 @@ <item> host_speeds </item> <item> hostname </item> <item> hpkextract </item> -<item> hpklist </item> +<item> hptdelist </item> <item> hpkremove </item> <item> hpkval </item> <item> hud_centerid </item> diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h index 4d596fb01..aaf241eee 100644 --- a/kate/interfaces/document.h +++ b/kate/interfaces/document.h @@ -27,7 +27,7 @@ #include <tdetexteditor/documentinfo.h> #include <tdetexteditor/selectioninterface.h> #include <tdetexteditor/selectioninterfaceext.h> -#include <tdetexteditor/blockselectioninterface.h> +#include <tdetexteditor/bloctdeselectioninterface.h> #include <tdetexteditor/searchinterface.h> #include <tdetexteditor/highlightinginterface.h> #include <tdetexteditor/configinterface.h> @@ -38,7 +38,7 @@ #include <tdetexteditor/printinterface.h> #include <tdetexteditor/variableinterface.h> -#include <kaction.h> +#include <tdeaction.h> class KCompletion; diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index 792c53385..d904e16ce 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <cctype> diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index d3fb52a72..5a1a085c2 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -24,8 +24,8 @@ #include "kateview.h" #include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kstringhandler.h> #include <kxmlguiclient.h> #include <kxmlguifactory.h> diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 099dad99d..0bf1d7ea7 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -42,7 +42,7 @@ #include <tdeio/jobclasses.h> #include <tdeio/netaccess.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kapplication.h> #include <kbuttonbox.h> #include <kcharsets.h> @@ -52,20 +52,20 @@ #include <kcombobox.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> #include <kkeybutton.h> #include <kkeydialog.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kmimetypechooser.h> #include <knuminput.h> #include <tdeparts/componentfactory.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <kprocio.h> #include <kregexpeditorinterface.h> diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h index c97f45d9a..0f865fcea 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -29,7 +29,7 @@ #include "../interfaces/document.h" -#include <klistview.h> +#include <tdelistview.h> #include <kdialogbase.h> #include <kmimetype.h> diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 74e5c3225..cb1844489 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -52,7 +52,7 @@ #include <klocale.h> #include <kglobal.h> #include <kapplication.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeconfig.h> #include <tdefiledialog.h> #include <kmessagebox.h> @@ -3976,7 +3976,7 @@ void KateDocument::transform( KateView *v, const KateTextCursor &c, { // If bol or the character before is not in a word, up this one: // 1. if both start and p is 0, upper char. - // 2. if blockselect or first line, and p == 0 and start-1 is not in a word, upper + // 2. if bloctdeselect or first line, and p == 0 and start-1 is not in a word, upper // 3. if p-1 is not in a word, upper. if ( ( ! start && ! p ) || ( ( ln == selstart.line() || v->blockSelectionMode() ) && diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp index 370be7684..e50906b0d 100644 --- a/kate/part/katedocumenthelpers.cpp +++ b/kate/part/katedocumenthelpers.cpp @@ -24,7 +24,7 @@ #include "katedocument.h" #include "kateview.h" -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> KateBrowserExtension::KateBrowserExtension( KateDocument* doc ) diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index 15dd7c9f6..f0b01ef2d 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -33,7 +33,7 @@ #include <kiconloader.h> #include <knuminput.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqregexp.h> #include <tqcheckbox.h> diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index f06518649..3c84007eb 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -38,7 +38,7 @@ #include <kmimetype.h> #include <klocale.h> #include <kregexp.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kglobalsettings.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/kate/part/katekeyinterceptorfunctor.h b/kate/part/katekeyinterceptorfunctor.h index 0126ff814..2a973026a 100644 --- a/kate/part/katekeyinterceptorfunctor.h +++ b/kate/part/katekeyinterceptorfunctor.h @@ -17,7 +17,7 @@ */ #ifndef _KATE_KEY_INTERCEPTOR_FUNCTOR_H #define _KATE_KEY_INTERCEPTOR_FUNCTOR_H -#include <kshortcut.h> +#include <tdeshortcut.h> class KateKeyInterceptorFunctor { public: virtual bool operator()(KKey key)=0; diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index 1b264a602..77ed4dcca 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -34,7 +34,7 @@ #include <kcolorbutton.h> #include <kdebug.h> #include <kdialog.h> // for spacingHint() -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <klocale.h> #include <kprinter.h> #include <kurl.h> diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 9a7e4e1ab..8f4f03a10 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -32,11 +32,11 @@ #include <kcolorbutton.h> #include <kcombobox.h> #include <kinputdialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kdebug.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kcolordialog.h> #include <kapplication.h> #include <kaboutdata.h> diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 6675a6bc8..77cc112a1 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -30,7 +30,7 @@ #include <tqfont.h> #include <tdeconfig.h> -#include <kaction.h> +#include <tdeaction.h> class KateView; class KateStyleListItem; diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index 9d0dc896b..b66be04c6 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -696,7 +696,7 @@ bool KateSearch::doSearch( const TQString& text ) col = foundCol+1; } while (s.flags.selected && m_view->blockSelectionMode() && found); - // in the case we want to search in selection + blockselection we need to loop + // in the case we want to search in selection + bloctdeselection we need to loop if( !found ) return false; diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp index 53767d672..fc7e943cf 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -26,7 +26,7 @@ #include "kateview.h" -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tdespell.h> #include <ksconfig.h> diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 03b1fa5d3..dc82922a3 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -61,10 +61,10 @@ #include <kglobal.h> #include <kcharsets.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kxmlguifactory.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <klibloader.h> #include <kencodingfiledialog.h> #include <tdemultipledrag.h> diff --git a/kate/part/kateview.h b/kate/part/kateview.h index 0a00ab1fc..9d04a524f 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -222,7 +222,7 @@ class KateView : public Kate::View, */ inline const KateSuperCursor &selEnd () const { return selectEnd; } - // should cursor be wrapped ? take config + blockselection state in account + // should cursor be wrapped ? take config + bloctdeselection state in account bool wrapCursor (); // some internal functions to get selection state of a line/col diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index fc0072982..72b7be0f5 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -38,7 +38,7 @@ #include <knotifyclient.h> #include <kglobal.h> #include <kcharsets.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqcursor.h> #include <tqpainter.h> diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h index 0faa90309..0ff59352e 100644 --- a/kate/part/kateviewhelpers.h +++ b/kate/part/kateviewhelpers.h @@ -21,7 +21,7 @@ #ifndef __KATE_VIEW_HELPERS_H__ #define __KATE_VIEW_HELPERS_H__ -#include <kaction.h> +#include <tdeaction.h> #include <klineedit.h> #include <tqwidget.h> diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 1a7b73bf3..8dabeb2f6 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -39,11 +39,11 @@ #include <unistd.h> #include <stdio.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcmdlineargs.h> #include "katefactory.h" #include <tdeio/job.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <ksimpleconfig.h> #include <kglobalsettings.h> diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 449675f6c..4e0d70b86 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -28,12 +28,12 @@ #include <tdetexteditor/documentinfo.h> #include <tdetexteditor/document.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmimetype.h> #include <kmimetypechooser.h> diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index 2f0d01ed4..567262a64 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -25,7 +25,7 @@ #include <assert.h> #include <tdeio/job.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdefiledialog.h> #include <kgenericfactory.h> #include <klocale.h> diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 758449fbe..a36c9dc60 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -22,7 +22,7 @@ #include <tqpopupmenu.h> #include <kgenericfactory.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcombobox.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index 829a0f31f..d3b762b8e 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -20,13 +20,13 @@ #include "kate_kdatatool.h" #include "kate_kdatatool.moc" #include <kgenericfactory.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdetexteditor/view.h> #include <kdebug.h> #include <kdatatool.h> #include <tdetexteditor/document.h> #include <tdetexteditor/selectioninterface.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdetexteditor/viewcursorinterface.h> #include <tdetexteditor/editinterface.h> #include <kmessagebox.h> diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 4c38b1287..5041cc8ad 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -38,7 +38,7 @@ #include <kdialog.h> #include <kgenericfactory.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <knotifyclient.h> #include <tdeparts/part.h> #include <kiconloader.h> diff --git a/kate/tests/highlight.xsl b/kate/tests/highlight.xsl index f6e0efb12..d5699f31b 100644 --- a/kate/tests/highlight.xsl +++ b/kate/tests/highlight.xsl @@ -3,7 +3,7 @@ <!-- This file is freely distributable, created by Wilbert Berendsen (wbsoft@xs4all.nl) - This is just a simple XSLT file that converts some HTML pages to a XBEL bookmarklist. + This is just a simple XSLT file that converts some HTML pages to a XBEL bookmartdelist. It is included here to test the new XSLT highlighting by Peter Lammich. TODO: add better test file. |