X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.h;h=eb6aded2e23dc70804298cdef429184333ee7d7b;hb=2c832e6578ae146a2b51967cbc78cd640959f196;hp=3831a04ab73fa2f0f839a49f4803d66c9ff96d16;hpb=9d6cad3fe60696d795280a886623fdc9a89f9de6;p=lyx.git

diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index 3831a04ab7..eb6aded2e2 100644
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -16,37 +16,36 @@
 
 #include "ParagraphList_fwd.h"
 
-#include "support/types.h"
+#include "support/docstring.h"
 
-#include <string>
 #include <vector>
 
+namespace lyx {
+
 class Buffer;
 class ErrorList;
+class InsetText;
 class LyXTextClass;
 class LCursor;
 
-///
-namespace lyx {
 namespace cap {
 
 ///
-std::vector<std::string> const availableSelections(Buffer const & buffer);
+std::vector<docstring> const availableSelections(Buffer const & buffer);
 ///
-lyx::size_type numberOfSelections();
+size_type numberOfSelections();
 ///
-std::string getSelection(Buffer const & buffer, size_t sel_index);
+docstring getSelection(Buffer const & buffer, size_t sel_index);
 
 ///
 void cutSelection(LCursor & cur, bool doclear, bool realcut);
 
-/**
- * Sets the selection from the current cursor position to length
- * characters to the right. No safety checks.
+/* Replace using the font of the first selected character and select
+ * the new string. When \c backwards == false, set anchor before
+ * cursor; otherwise set cursor before anchor.
  */
-void setSelectionRange(LCursor & cur, lyx::pos_type length);
-/// simply replace using the font of the first selected character
-void replaceSelectionWithString(LCursor & cur, std::string const & str);
+void replaceSelectionWithString(LCursor & cur, docstring const & str,
+				bool backwards);
 /// replace selection helper
 void replaceSelection(LCursor & cur);
 
@@ -55,31 +54,27 @@ void cutSelection(LCursor & cur, bool doclear = true, bool realcut = true);
 ///
 void copySelection(LCursor & cur);
 ///
-void pasteSelection(LCursor & cur, size_t sel_index = 0);
+void pasteSelection(LCursor & cur, ErrorList &, size_t sel_index = 0);
 
-///
-void pasteParagraphList(LCursor & cur, ParagraphList const & parlist, 
-                        textclass_type textclass);
+/// Paste the paragraph list \p parlist at the position given by \p cur.
+/// Does not handle undo. Does only work in text, not mathed.
+void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
+			textclass_type textclass, ErrorList & errorList);
 
 
 /** Needed to switch between different classes. This works
  *  for a list of paragraphs beginning with the specified par.
  *  It changes layouts and character styles.
  */
-void SwitchBetweenClasses(lyx::textclass_type c1,
-				lyx::textclass_type c2,
-				ParagraphList & par,
-				ErrorList &);
-
-// only used by the spellchecker
-void replaceWord(LCursor & cur, std::string const & replacestring);
+void switchBetweenClasses(textclass_type c1, textclass_type c2,
+                          InsetText & in, ErrorList &);
 
 ///
-std::string grabSelection(LCursor const & cur);
+docstring grabSelection(LCursor const & cur);
 ///
 void eraseSelection(LCursor & cur);
 ///
-std::string grabAndEraseSelection(LCursor & cur);
+docstring grabAndEraseSelection(LCursor & cur);
 // other selection methods
 ///
 void selCut(LCursor & cur);
@@ -91,7 +86,7 @@ void selClearOrDel(LCursor & cur);
 void selPaste(LCursor & cur, size_t n);
 
 /** Tabular has its own paste stack for multiple cells
- *  but it needs to know whether there is a more recent 
+ *  but it needs to know whether there is a more recent
  *  ordinary paste. Therefore which one is newer.
  */
 //FIXME: this is a workaround for bug 1919. Replace this by