Whoops. Revert last commit.

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 96986dd69ff8343f186d4f558379096c214fe0f0..2450e0fc5cbfa5dc5eec958adf8341ecf0ac7fe4 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -15,6 +15,7 @@
 
 #include "CutAndPaste.h"
 
+#include "BaseClassList.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
@@ -30,7 +31,6 @@
 #include "LyXFunc.h"
 #include "LyXRC.h"
 #include "Text.h"
-#include "TextClassList.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
@@ -393,7 +393,7 @@ docstring grabAndEraseSelection(Cursor & cur)
 
 
 void switchBetweenClasses(TextClassPtr const & oldone, 
-       TextClassPtr const & newone, InsetText & in, ErrorList & errorlist)
+               TextClassPtr const & newone, InsetText & in, ErrorList & errorlist)
 {
        errorlist.clear();
 
@@ -702,8 +702,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
                PitPosPair ppp;
 
                boost::tie(ppp, endpit) =
-                       pasteSelectionHelper(cur, parlist,
-                                            textclass, errorList);
+                       pasteSelectionHelper(cur, parlist, textclass, errorList);
                updateLabels(cur.buffer());
                cur.clearSelection();
                text->setCursor(cur, ppp.first, ppp.second);
@@ -765,7 +764,7 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs)
 }
 
 
-void pasteClipboardGraphics(Cursor & cur, ErrorList & errorList,
+void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
                            Clipboard::GraphicsType preferedType)
 {
        BOOST_ASSERT(theClipboard().hasGraphicsContents(preferedType));