Browse Source

Fix unintended renaming

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
f8d95a0242
12 changed files with 26 additions and 26 deletions
  1. +4
    -4
      interfaces/tdetexteditor/CMakeLists.txt
  2. +4
    -4
      interfaces/tdetexteditor/Makefile.am
  3. +2
    -2
      interfaces/tdetexteditor/blockselectiondcopinterface.cpp
  4. +2
    -2
      interfaces/tdetexteditor/blockselectiondcopinterface.h
  5. +2
    -2
      interfaces/tdetexteditor/blockselectioninterface.cpp
  6. +3
    -3
      interfaces/tdetexteditor/blockselectioninterface.h
  7. +1
    -1
      kate/data/idconsole.xml
  8. +1
    -1
      kate/interfaces/document.h
  9. +1
    -1
      kate/part/katedocument.cpp
  10. +1
    -1
      kate/part/katesearch.cpp
  11. +1
    -1
      kate/part/kateview.h
  12. +4
    -4
      win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro

+ 4
- 4
interfaces/tdetexteditor/CMakeLists.txt View File

@@ -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


+ 4
- 4
interfaces/tdetexteditor/Makefile.am View File

@@ -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 \


interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp → interfaces/tdetexteditor/blockselectiondcopinterface.cpp View File

@@ -1,5 +1,5 @@
#include "bloctdeselectiondcopinterface.h"
#include "bloctdeselectioninterface.h"
#include "blockselectiondcopinterface.h"
#include "blockselectioninterface.h"

#include <dcopclient.h>
using namespace KTextEditor;

interfaces/tdetexteditor/bloctdeselectiondcopinterface.h → interfaces/tdetexteditor/blockselectiondcopinterface.h View File

@@ -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) ;


interfaces/tdetexteditor/bloctdeselectioninterface.cpp → interfaces/tdetexteditor/blockselectioninterface.cpp View File

@@ -18,8 +18,8 @@

// $Id$

#include "bloctdeselectioninterface.h"
#include "bloctdeselectiondcopinterface.h"
#include "blockselectioninterface.h"
#include "blockselectiondcopinterface.h"
#include "document.h"

namespace KTextEditor

interfaces/tdetexteditor/bloctdeselectioninterface.h → interfaces/tdetexteditor/blockselectioninterface.h View File

@@ -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;

+ 1
- 1
kate/data/idconsole.xml View File

@@ -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>


+ 1
- 1
kate/interfaces/document.h View File

@@ -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>


+ 1
- 1
kate/part/katedocument.cpp View File

@@ -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() ) &&


+ 1
- 1
kate/part/katesearch.cpp View File

@@ -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;



+ 1
- 1
kate/part/kateview.h View File

@@ -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


+ 4
- 4
win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro View File

@@ -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 \


Loading…
Cancel
Save