diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/platform/qt/ClipboardQt.cpp | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebCore/platform/qt/ClipboardQt.cpp')
| -rw-r--r-- | WebCore/platform/qt/ClipboardQt.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/WebCore/platform/qt/ClipboardQt.cpp b/WebCore/platform/qt/ClipboardQt.cpp index 9d2c452..f9940a6 100644 --- a/WebCore/platform/qt/ClipboardQt.cpp +++ b/WebCore/platform/qt/ClipboardQt.cpp @@ -95,21 +95,7 @@ void ClipboardQt::clearData(const String& type) return; if (m_writableData) { -#if QT_VERSION >= 0x040400 m_writableData->removeFormat(type); -#else - const QString toClearType = type; - QMap<QString, QByteArray> formats; - foreach (QString format, m_writableData->formats()) { - if (format != toClearType) - formats[format] = m_writableData->data(format); - } - - m_writableData->clear(); - QMap<QString, QByteArray>::const_iterator it, end = formats.constEnd(); - for (it = formats.begin(); it != end; ++it) - m_writableData->setData(it.key(), it.value()); -#endif if (m_writableData->formats().isEmpty()) { if (isForDragging()) delete m_writableData; |