diff options
Diffstat (limited to 'WebCore/platform/qt/ClipboardQt.cpp')
| -rw-r--r-- | WebCore/platform/qt/ClipboardQt.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/WebCore/platform/qt/ClipboardQt.cpp b/WebCore/platform/qt/ClipboardQt.cpp index 6cbde0c..90e3bfe 100644 --- a/WebCore/platform/qt/ClipboardQt.cpp +++ b/WebCore/platform/qt/ClipboardQt.cpp @@ -75,15 +75,15 @@ PassRefPtr<Clipboard> Clipboard::create(ClipboardAccessPolicy policy, DragData* } ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, const QMimeData* readableClipboard) - : Clipboard(policy, true) + : Clipboard(policy, DragAndDrop) , m_readableData(readableClipboard) , m_writableData(0) { Q_ASSERT(policy == ClipboardReadable || policy == ClipboardTypesReadable); } -ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, bool forDragging) - : Clipboard(policy, forDragging) +ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, ClipboardType clipboardType) + : Clipboard(policy, clipboardType) , m_readableData(0) , m_writableData(0) { @@ -91,7 +91,7 @@ ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, bool forDragging) #ifndef QT_NO_CLIPBOARD if (policy != ClipboardWritable) { - Q_ASSERT(!forDragging); + Q_ASSERT(isForCopyAndPaste()); m_readableData = QApplication::clipboard()->mimeData(); } #endif @@ -99,7 +99,7 @@ ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, bool forDragging) ClipboardQt::~ClipboardQt() { - if (m_writableData && !isForDragging()) + if (m_writableData && isForCopyAndPaste()) m_writableData = 0; else delete m_writableData; @@ -114,13 +114,13 @@ void ClipboardQt::clearData(const String& type) if (m_writableData) { m_writableData->removeFormat(type); if (m_writableData->formats().isEmpty()) { - if (isForDragging()) + if (isForDragAndDrop()) delete m_writableData; m_writableData = 0; } } #ifndef QT_NO_CLIPBOARD - if (!isForDragging()) + if (isForCopyAndPaste()) QApplication::clipboard()->setMimeData(m_writableData); #endif } @@ -131,7 +131,7 @@ void ClipboardQt::clearAllData() return; #ifndef QT_NO_CLIPBOARD - if (!isForDragging()) + if (isForCopyAndPaste()) QApplication::clipboard()->setMimeData(0); else #endif @@ -182,7 +182,7 @@ bool ClipboardQt::setData(const String& type, const String& data) } #ifndef QT_NO_CLIPBOARD - if (!isForDragging()) + if (isForCopyAndPaste()) QApplication::clipboard()->setMimeData(m_writableData); #endif return true; @@ -287,7 +287,7 @@ void ClipboardQt::declareAndWriteDragImage(Element* element, const KURL& url, co m_writableData->setText(title); m_writableData->setUrls(urls); #ifndef QT_NO_CLIPBOARD - if (!isForDragging()) + if (isForCopyAndPaste()) QApplication::clipboard()->setMimeData(m_writableData); #endif } @@ -303,7 +303,7 @@ void ClipboardQt::writeURL(const KURL& url, const String& title, Frame* frame) m_writableData->setUrls(urls); m_writableData->setText(title); #ifndef QT_NO_CLIPBOARD - if (!isForDragging()) + if (isForCopyAndPaste()) QApplication::clipboard()->setMimeData(m_writableData); #endif } @@ -320,7 +320,7 @@ void ClipboardQt::writeRange(Range* range, Frame* frame) m_writableData->setText(text); m_writableData->setHtml(createMarkup(range, 0, AnnotateForInterchange, false, AbsoluteURLs)); #ifndef QT_NO_CLIPBOARD - if (!isForDragging()) + if (isForCopyAndPaste()) QApplication::clipboard()->setMimeData(m_writableData); #endif } @@ -333,7 +333,7 @@ void ClipboardQt::writePlainText(const String& str) text.replace(QChar(0xa0), QLatin1Char(' ')); m_writableData->setText(text); #ifndef QT_NO_CLIPBOARD - if (!isForDragging()) + if (isForCopyAndPaste()) QApplication::clipboard()->setMimeData(m_writableData); #endif } |