summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--interfaces/tdetexteditor/CMakeLists.txt8
-rw-r--r--interfaces/tdetexteditor/Makefile.am8
-rw-r--r--interfaces/tdetexteditor/blockselectiondcopinterface.cpp (renamed from interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp)4
-rw-r--r--interfaces/tdetexteditor/blockselectiondcopinterface.h (renamed from interfaces/tdetexteditor/bloctdeselectiondcopinterface.h)4
-rw-r--r--interfaces/tdetexteditor/blockselectioninterface.cpp (renamed from interfaces/tdetexteditor/bloctdeselectioninterface.cpp)4
-rw-r--r--interfaces/tdetexteditor/blockselectioninterface.h (renamed from interfaces/tdetexteditor/bloctdeselectioninterface.h)6
-rw-r--r--kate/data/idconsole.xml2
-rw-r--r--kate/interfaces/document.h2
-rw-r--r--kate/part/katedocument.cpp2
-rw-r--r--kate/part/katesearch.cpp2
-rw-r--r--kate/part/kateview.h2
-rw-r--r--win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro8
12 files changed, 26 insertions, 26 deletions
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index 5ed7edeca..0808a84f3 100644
--- a/interfaces/tdetexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -37,7 +37,7 @@ install( FILES
document.h view.h editor.h plugin.h editinterface.h
undointerface.h selectioninterface.h cursorinterface.h
clipboardinterface.h popupmenuinterface.h viewcursorinterface.h
- searchinterface.h highlightinginterface.h bloctdeselectioninterface.h
+ searchinterface.h highlightinginterface.h blockselectioninterface.h
codecompletioninterface.h configinterface.h markinterface.h
printinterface.h wordwrapinterface.h dynwordwrapinterface.h
markinterfaceextension.h configinterfaceextension.h
@@ -69,7 +69,7 @@ set( target tdetexteditor )
set( ${target}_SRCS
tdetexteditor.cpp
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp
- codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp
+ codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp
printinterface.cpp highlightinginterface.cpp markinterface.cpp
popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp
@@ -78,8 +78,8 @@ set( ${target}_SRCS
searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp
configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp
viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp
- bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp
- bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp
+ blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp
+ blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp
encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel
undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp
viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index 7cba7d096..b535b39cc 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdetexteditor.la
libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \
- codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp \
+ codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \
printinterface.cpp highlightinginterface.cpp markinterface.cpp \
popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \
@@ -13,8 +13,8 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp \
configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \
viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp \
- bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
- bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \
+ blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
+ blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \
encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel \
undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp \
viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp \
@@ -29,7 +29,7 @@ tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface
selectioninterface.h cursorinterface.h \
clipboardinterface.h popupmenuinterface.h \
viewcursorinterface.h searchinterface.h highlightinginterface.h \
- bloctdeselectioninterface.h codecompletioninterface.h \
+ blockselectioninterface.h codecompletioninterface.h \
configinterface.h markinterface.h printinterface.h wordwrapinterface.h \
dynwordwrapinterface.h markinterfaceextension.h configinterfaceextension.h \
encodinginterface.h viewstatusmsginterface.h sessionconfiginterface.h editorchooser.h \
diff --git a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp
index 1648c3eb3..34b7294b2 100644
--- a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp
+++ b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp
@@ -1,5 +1,5 @@
-#include "bloctdeselectiondcopinterface.h"
-#include "bloctdeselectioninterface.h"
+#include "blockselectiondcopinterface.h"
+#include "blockselectioninterface.h"
#include <dcopclient.h>
using namespace KTextEditor;
diff --git a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h b/interfaces/tdetexteditor/blockselectiondcopinterface.h
index 3117ee163..4b74fd2a0 100644
--- a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h
+++ b/interfaces/tdetexteditor/blockselectiondcopinterface.h
@@ -38,13 +38,13 @@ namespace KTextEditor
/**
* Returns the status of the selection mode - true indicates block selection mode is on.
* If this is true, selections applied via the SelectionInterface are handled as
- * bloctdeselections and the paste functions of the ClipboardInterface works on
+ * blockselections and the paste functions of the ClipboardInterface works on
* rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;)
*/
bool blockSelectionMode ();
/**
- * set bloctdeselection mode to state "on"
+ * set blockselection mode to state "on"
*/
bool setBlockSelectionMode (bool on) ;
diff --git a/interfaces/tdetexteditor/bloctdeselectioninterface.cpp b/interfaces/tdetexteditor/blockselectioninterface.cpp
index 0a7068dba..6d562a43e 100644
--- a/interfaces/tdetexteditor/bloctdeselectioninterface.cpp
+++ b/interfaces/tdetexteditor/blockselectioninterface.cpp
@@ -18,8 +18,8 @@
// $Id$
-#include "bloctdeselectioninterface.h"
-#include "bloctdeselectiondcopinterface.h"
+#include "blockselectioninterface.h"
+#include "blockselectiondcopinterface.h"
#include "document.h"
namespace KTextEditor
diff --git a/interfaces/tdetexteditor/bloctdeselectioninterface.h b/interfaces/tdetexteditor/blockselectioninterface.h
index 34ab553f9..b2cd785eb 100644
--- a/interfaces/tdetexteditor/bloctdeselectioninterface.h
+++ b/interfaces/tdetexteditor/blockselectioninterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __tdetexteditor_bloctdeselectioninterface_h__
-#define __tdetexteditor_bloctdeselectioninterface_h__
+#ifndef __tdetexteditor_blockselectioninterface_h__
+#define __tdetexteditor_blockselectioninterface_h__
#include <tdelibs_export.h>
@@ -51,7 +51,7 @@ class KTEXTEDITOR_EXPORT BlockSelectionInterface
/**
* Returns the status of the selection mode - true indicates block selection mode is on.
* If this is true, selections applied via the SelectionInterface are handled as
- * bloctdeselections and the paste functions of the ClipboardInterface works on
+ * blockselections and the paste functions of the ClipboardInterface works on
* rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;)
*/
virtual bool blockSelectionMode () = 0;
diff --git a/kate/data/idconsole.xml b/kate/data/idconsole.xml
index 9275cd944..fa2a5cffd 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> hptdelist </item>
+<item> hpklist </item>
<item> hpkremove </item>
<item> hpkval </item>
<item> hud_centerid </item>
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index aaf241eee..06c8c4133 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/bloctdeselectioninterface.h>
+#include <tdetexteditor/blockselectioninterface.h>
#include <tdetexteditor/searchinterface.h>
#include <tdetexteditor/highlightinginterface.h>
#include <tdetexteditor/configinterface.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index cb1844489..fbfc43eef 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -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 bloctdeselect or first line, and p == 0 and start-1 is not in a word, upper
+ // 2. if blockselect 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/katesearch.cpp b/kate/part/katesearch.cpp
index b66be04c6..9d0dc896b 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 + bloctdeselection we need to loop
+ // in the case we want to search in selection + blockselection we need to loop
if( !found ) return false;
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index 9d04a524f..0a00ab1fc 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 + bloctdeselection state in account
+ // should cursor be wrapped ? take config + blockselection state in account
bool wrapCursor ();
// some internal functions to get selection state of a line/col
diff --git a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
index edd6007fd..421267305 100644
--- a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
+++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
@@ -21,7 +21,7 @@ SOURCES = \
tdetexteditor.cpp \
editinterface.cpp editinterfaceext.cpp \
clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \
- codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp \
+ codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \
printinterface.cpp highlightinginterface.cpp markinterface.cpp \
popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \
@@ -30,7 +30,7 @@ SOURCES = \
searchdcopinterface.cpp markinterfaceextension.cpp \
configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \
viewstatusmsginterface.cpp editorchooser.cpp \
- bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
+ blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
encodingdcopinterface.cpp \
printdcopinterface.cpp \
undodcopinterface.cpp viewcursordcopinterface.cpp \
@@ -48,7 +48,7 @@ undodcopinterface_skel.cpp \
printdcopinterface_skel.cpp \
encodingdcopinterface_skel.cpp \
documentdcopinfo_skel.cpp \
-bloctdeselectiondcopinterface_skel.cpp \
+blockselectiondcopinterface_skel.cpp \
searchdcopinterface_skel.cpp \
selectiondcopinterface_skel.cpp \
clipboarddcopinterface_skel.cpp \
@@ -61,7 +61,7 @@ undodcopinterface_stub.cpp \
printdcopinterface_stub.cpp \
encodingdcopinterface_stub.cpp \
documentdcopinfo_stub.cpp \
-bloctdeselectiondcopinterface_stub.cpp \
+blockselectiondcopinterface_stub.cpp \
searchdcopinterface_stub.cpp \
selectiondcopinterface_stub.cpp \
clipboarddcopinterface_stub.cpp \
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 16:48:51 +0000