From f8d95a02420773d558fe73c0847c305666d47241 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 2 Feb 2013 13:41:49 -0600 Subject: Fix unintended renaming --- interfaces/tdetexteditor/CMakeLists.txt | 8 +-- interfaces/tdetexteditor/Makefile.am | 8 +-- .../tdetexteditor/blockselectiondcopinterface.cpp | 33 +++++++++ .../tdetexteditor/blockselectiondcopinterface.h | 60 ++++++++++++++++ .../tdetexteditor/blockselectioninterface.cpp | 74 +++++++++++++++++++ interfaces/tdetexteditor/blockselectioninterface.h | 82 ++++++++++++++++++++++ .../bloctdeselectiondcopinterface.cpp | 33 --------- .../tdetexteditor/bloctdeselectiondcopinterface.h | 60 ---------------- .../tdetexteditor/bloctdeselectioninterface.cpp | 74 ------------------- .../tdetexteditor/bloctdeselectioninterface.h | 82 ---------------------- 10 files changed, 257 insertions(+), 257 deletions(-) create mode 100644 interfaces/tdetexteditor/blockselectiondcopinterface.cpp create mode 100644 interfaces/tdetexteditor/blockselectiondcopinterface.h create mode 100644 interfaces/tdetexteditor/blockselectioninterface.cpp create mode 100644 interfaces/tdetexteditor/blockselectioninterface.h delete mode 100644 interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp delete mode 100644 interfaces/tdetexteditor/bloctdeselectiondcopinterface.h delete mode 100644 interfaces/tdetexteditor/bloctdeselectioninterface.cpp delete mode 100644 interfaces/tdetexteditor/bloctdeselectioninterface.h (limited to 'interfaces') 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/blockselectiondcopinterface.cpp b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp new file mode 100644 index 000000000..34b7294b2 --- /dev/null +++ b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp @@ -0,0 +1,33 @@ +#include "blockselectiondcopinterface.h" +#include "blockselectioninterface.h" + +#include +using namespace KTextEditor; + +BlockSelectionDCOPInterface::BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name) + : DCOPObject(name) +{ + m_parent = Parent; +} + +BlockSelectionDCOPInterface::~BlockSelectionDCOPInterface() +{ + +} + +uint BlockSelectionDCOPInterface::blockSelectionInterfaceNumber () +{ + return m_parent->blockSelectionInterfaceNumber(); +} +bool BlockSelectionDCOPInterface::blockSelectionMode () +{ + return m_parent->blockSelectionMode (); +} +bool BlockSelectionDCOPInterface::setBlockSelectionMode (bool on) +{ + return m_parent->setBlockSelectionMode (on); +} +bool BlockSelectionDCOPInterface::toggleBlockSelectionMode () +{ + return m_parent->toggleBlockSelectionMode (); +} diff --git a/interfaces/tdetexteditor/blockselectiondcopinterface.h b/interfaces/tdetexteditor/blockselectiondcopinterface.h new file mode 100644 index 000000000..4b74fd2a0 --- /dev/null +++ b/interfaces/tdetexteditor/blockselectiondcopinterface.h @@ -0,0 +1,60 @@ +#ifndef BlockSelection_DCOP_INTERFACE_H +#define BlockSelection_DCOP_INTERFACE_H + +#include +#include +#include +#include + +namespace KTextEditor +{ + class BlockSelectionInterface; + /** + This is the main interface to the BlockSelectionInterface of KTextEditor. + This will provide a consistant dcop interface to all KDE applications that use it. + @short DCOP interface to BlockSelectionInterface. + @author Ian Reinhart Geiser + */ + class KTEXTEDITOR_EXPORT BlockSelectionDCOPInterface : virtual public DCOPObject + { + K_DCOP + + public: + /** + Construct a new interface object for the text editor. + @param Parent the parent BlockSelectionInterface object + that will provide us with the functions for the interface. + @param name the QObject's name + */ + BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name ); + /** + Destructor + Cleans up the object. + */ + virtual ~BlockSelectionDCOPInterface(); + k_dcop: + uint blockSelectionInterfaceNumber (); + + /** + * 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 + * 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 blockselection mode to state "on" + */ + bool setBlockSelectionMode (bool on) ; + + /** + * toggle blockseletion mode + */ + bool toggleBlockSelectionMode (); + + private: + BlockSelectionInterface *m_parent; + }; +} +#endif diff --git a/interfaces/tdetexteditor/blockselectioninterface.cpp b/interfaces/tdetexteditor/blockselectioninterface.cpp new file mode 100644 index 000000000..6d562a43e --- /dev/null +++ b/interfaces/tdetexteditor/blockselectioninterface.cpp @@ -0,0 +1,74 @@ +/* This file is part of the KDE libraries + Copyright (C) 2001 Christoph Cullmann + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +// $Id$ + +#include "blockselectioninterface.h" +#include "blockselectiondcopinterface.h" +#include "document.h" + +namespace KTextEditor +{ + +class PrivateBlockSelectionInterface +{ + public: + PrivateBlockSelectionInterface() {interface = 0;} + ~PrivateBlockSelectionInterface() {} + BlockSelectionDCOPInterface *interface; +}; + +} + +using namespace KTextEditor; + +unsigned int BlockSelectionInterface::globalBlockSelectionInterfaceNumber = 0; + +BlockSelectionInterface::BlockSelectionInterface() +{ + globalBlockSelectionInterfaceNumber++; + myBlockSelectionInterfaceNumber = globalBlockSelectionInterfaceNumber++; + TQString name = "BlockSelectionInterface#" + TQString::number(myBlockSelectionInterfaceNumber); + + d = new PrivateBlockSelectionInterface(); + d->interface = new BlockSelectionDCOPInterface(this, name.latin1()); +} + +BlockSelectionInterface::~BlockSelectionInterface() +{ + delete d->interface; + delete d; +} + +unsigned int BlockSelectionInterface::blockSelectionInterfaceNumber () const +{ + return myBlockSelectionInterfaceNumber; +} + +void BlockSelectionInterface::setBlockSelectionInterfaceDCOPSuffix (const TQCString &suffix) +{ + d->interface->setObjId ("BlockSelectionInterface#"+suffix); +} + +BlockSelectionInterface *KTextEditor::blockSelectionInterface (Document *doc) +{ + if (!doc) + return 0; + + return dynamic_cast(doc); +} diff --git a/interfaces/tdetexteditor/blockselectioninterface.h b/interfaces/tdetexteditor/blockselectioninterface.h new file mode 100644 index 000000000..b2cd785eb --- /dev/null +++ b/interfaces/tdetexteditor/blockselectioninterface.h @@ -0,0 +1,82 @@ +/* This file is part of the KDE libraries + Copyright (C) 2001 Christoph Cullmann + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef __tdetexteditor_blockselectioninterface_h__ +#define __tdetexteditor_blockselectioninterface_h__ + +#include + +class TQCString; + +namespace KTextEditor +{ + +/** + * An interface for the Document class which allows the selection + * method to be changed between selecting rectangular blocks of text and normal mode + * (all text between the start cursor and the current cursor). + */ +class KTEXTEDITOR_EXPORT BlockSelectionInterface +{ + friend class PrivateBlockSelectionInterface; + + public: + BlockSelectionInterface (); + virtual ~BlockSelectionInterface (); + + unsigned int blockSelectionInterfaceNumber () const; + + protected: + void setBlockSelectionInterfaceDCOPSuffix (const TQCString &suffix); + + /** + * slots !!! + */ + public: + /** + * 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 + * 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; + + /** + * Set block selection mode to state "on" + */ + virtual bool setBlockSelectionMode (bool on) = 0; + + /** + * toggle block seletion mode + */ + virtual bool toggleBlockSelectionMode () = 0; + + private: + class PrivateBlockSelectionInterface *d; + static unsigned int globalBlockSelectionInterfaceNumber; + unsigned int myBlockSelectionInterfaceNumber; +}; + +/** + * Access the block selection interface of document @param doc + */ +KTEXTEDITOR_EXPORT BlockSelectionInterface *blockSelectionInterface (class Document *doc); + +} + +#endif diff --git a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp deleted file mode 100644 index 1648c3eb3..000000000 --- a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "bloctdeselectiondcopinterface.h" -#include "bloctdeselectioninterface.h" - -#include -using namespace KTextEditor; - -BlockSelectionDCOPInterface::BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name) - : DCOPObject(name) -{ - m_parent = Parent; -} - -BlockSelectionDCOPInterface::~BlockSelectionDCOPInterface() -{ - -} - -uint BlockSelectionDCOPInterface::blockSelectionInterfaceNumber () -{ - return m_parent->blockSelectionInterfaceNumber(); -} -bool BlockSelectionDCOPInterface::blockSelectionMode () -{ - return m_parent->blockSelectionMode (); -} -bool BlockSelectionDCOPInterface::setBlockSelectionMode (bool on) -{ - return m_parent->setBlockSelectionMode (on); -} -bool BlockSelectionDCOPInterface::toggleBlockSelectionMode () -{ - return m_parent->toggleBlockSelectionMode (); -} diff --git a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h deleted file mode 100644 index 3117ee163..000000000 --- a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef BlockSelection_DCOP_INTERFACE_H -#define BlockSelection_DCOP_INTERFACE_H - -#include -#include -#include -#include - -namespace KTextEditor -{ - class BlockSelectionInterface; - /** - This is the main interface to the BlockSelectionInterface of KTextEditor. - This will provide a consistant dcop interface to all KDE applications that use it. - @short DCOP interface to BlockSelectionInterface. - @author Ian Reinhart Geiser - */ - class KTEXTEDITOR_EXPORT BlockSelectionDCOPInterface : virtual public DCOPObject - { - K_DCOP - - public: - /** - Construct a new interface object for the text editor. - @param Parent the parent BlockSelectionInterface object - that will provide us with the functions for the interface. - @param name the QObject's name - */ - BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name ); - /** - Destructor - Cleans up the object. - */ - virtual ~BlockSelectionDCOPInterface(); - k_dcop: - uint blockSelectionInterfaceNumber (); - - /** - * 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 - * rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;) - */ - bool blockSelectionMode (); - - /** - * set bloctdeselection mode to state "on" - */ - bool setBlockSelectionMode (bool on) ; - - /** - * toggle blockseletion mode - */ - bool toggleBlockSelectionMode (); - - private: - BlockSelectionInterface *m_parent; - }; -} -#endif diff --git a/interfaces/tdetexteditor/bloctdeselectioninterface.cpp b/interfaces/tdetexteditor/bloctdeselectioninterface.cpp deleted file mode 100644 index 0a7068dba..000000000 --- a/interfaces/tdetexteditor/bloctdeselectioninterface.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2001 Christoph Cullmann - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -// $Id$ - -#include "bloctdeselectioninterface.h" -#include "bloctdeselectiondcopinterface.h" -#include "document.h" - -namespace KTextEditor -{ - -class PrivateBlockSelectionInterface -{ - public: - PrivateBlockSelectionInterface() {interface = 0;} - ~PrivateBlockSelectionInterface() {} - BlockSelectionDCOPInterface *interface; -}; - -} - -using namespace KTextEditor; - -unsigned int BlockSelectionInterface::globalBlockSelectionInterfaceNumber = 0; - -BlockSelectionInterface::BlockSelectionInterface() -{ - globalBlockSelectionInterfaceNumber++; - myBlockSelectionInterfaceNumber = globalBlockSelectionInterfaceNumber++; - TQString name = "BlockSelectionInterface#" + TQString::number(myBlockSelectionInterfaceNumber); - - d = new PrivateBlockSelectionInterface(); - d->interface = new BlockSelectionDCOPInterface(this, name.latin1()); -} - -BlockSelectionInterface::~BlockSelectionInterface() -{ - delete d->interface; - delete d; -} - -unsigned int BlockSelectionInterface::blockSelectionInterfaceNumber () const -{ - return myBlockSelectionInterfaceNumber; -} - -void BlockSelectionInterface::setBlockSelectionInterfaceDCOPSuffix (const TQCString &suffix) -{ - d->interface->setObjId ("BlockSelectionInterface#"+suffix); -} - -BlockSelectionInterface *KTextEditor::blockSelectionInterface (Document *doc) -{ - if (!doc) - return 0; - - return dynamic_cast(doc); -} diff --git a/interfaces/tdetexteditor/bloctdeselectioninterface.h b/interfaces/tdetexteditor/bloctdeselectioninterface.h deleted file mode 100644 index 34ab553f9..000000000 --- a/interfaces/tdetexteditor/bloctdeselectioninterface.h +++ /dev/null @@ -1,82 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2001 Christoph Cullmann - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef __tdetexteditor_bloctdeselectioninterface_h__ -#define __tdetexteditor_bloctdeselectioninterface_h__ - -#include - -class TQCString; - -namespace KTextEditor -{ - -/** - * An interface for the Document class which allows the selection - * method to be changed between selecting rectangular blocks of text and normal mode - * (all text between the start cursor and the current cursor). - */ -class KTEXTEDITOR_EXPORT BlockSelectionInterface -{ - friend class PrivateBlockSelectionInterface; - - public: - BlockSelectionInterface (); - virtual ~BlockSelectionInterface (); - - unsigned int blockSelectionInterfaceNumber () const; - - protected: - void setBlockSelectionInterfaceDCOPSuffix (const TQCString &suffix); - - /** - * slots !!! - */ - public: - /** - * 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 - * rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;) - */ - virtual bool blockSelectionMode () = 0; - - /** - * Set block selection mode to state "on" - */ - virtual bool setBlockSelectionMode (bool on) = 0; - - /** - * toggle block seletion mode - */ - virtual bool toggleBlockSelectionMode () = 0; - - private: - class PrivateBlockSelectionInterface *d; - static unsigned int globalBlockSelectionInterfaceNumber; - unsigned int myBlockSelectionInterfaceNumber; -}; - -/** - * Access the block selection interface of document @param doc - */ -KTEXTEDITOR_EXPORT BlockSelectionInterface *blockSelectionInterface (class Document *doc); - -} - -#endif -- cgit v1.2.1