* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / GuiClipboard.cpp

diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp
index c62ce68e79124025858d14512abc0c31b52f1908..ec6b916e4506c46e86be8620a63b8c1b98defd0f 100644 (file)
--- a/src/frontends/qt4/GuiClipboard.cpp
+++ b/src/frontends/qt4/GuiClipboard.cpp
@@ -138,7 +138,7 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur,
        typeNames[Clipboard::JpegGraphicsType] = _("JPEG");
        
        // find unused filename with primary extension
-       string document_path = cur.buffer().fileName().onlyPath().absFilename();
+       string document_path = cur.buffer()->fileName().onlyPath().absFilename();
        unsigned newfile_number = 0;
        FileName filename;
        do {
@@ -311,7 +311,7 @@ docstring const GuiClipboard::getAsText() const
        if (str.isNull())
                return docstring();
 
-       return internalLineEnding(qstring_to_ucs4(str));
+       return internalLineEnding(str);
 }
 
 
@@ -342,6 +342,14 @@ bool GuiClipboard::hasLyXContents() const
 }
 
 
+bool GuiClipboard::hasTextContents() const
+{
+       QMimeData const * const source =
+               qApp->clipboard()->mimeData(QClipboard::Clipboard);
+       return source && source->hasText();     
+}
+
+
 bool GuiClipboard::hasGraphicsContents(Clipboard::GraphicsType type) const
 {
        if (type == AnyGraphicsType) {
@@ -441,4 +449,4 @@ bool GuiClipboard::empty() const
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiClipboard_moc.cpp"
+#include "moc_GuiClipboard.cpp"