summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/wayland
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-05-10 10:09:44 +0200
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-05-10 10:09:44 +0200
commitedd56d531bedd83dc4decee5720bd75fffc0b44c (patch)
tree2309b0b5de86f98be2fcea7bc83a5a8af6f9af5e /src/plugins/platforms/wayland
parent04549f2eedd183c98f192e1669a4b483cfb017e7 (diff)
Remove const from QPlatformClipboard::mimeData().
Most implementations will anyway do non-const operations in there, the change avoids the need for const_cast or mutable.
Diffstat (limited to 'src/plugins/platforms/wayland')
-rw-r--r--src/plugins/platforms/wayland/qwaylandclipboard.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylandclipboard.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.cpp b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
index 9a363b5f8f..c1ac386cd6 100644
--- a/src/plugins/platforms/wayland/qwaylandclipboard.cpp
+++ b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
@@ -217,7 +217,7 @@ QVariant QWaylandClipboard::retrieveData(const QString &mimeType, QVariant::Type
return content;
}
-const QMimeData *QWaylandClipboard::mimeData(QClipboard::Mode mode) const
+QMimeData *QWaylandClipboard::mimeData(QClipboard::Mode mode)
{
Q_ASSERT(mode == QClipboard::Clipboard);
if (!mMimeDataIn)
diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.h b/src/plugins/platforms/wayland/qwaylandclipboard.h
index b0d63949fb..6a02254cae 100644
--- a/src/plugins/platforms/wayland/qwaylandclipboard.h
+++ b/src/plugins/platforms/wayland/qwaylandclipboard.h
@@ -57,7 +57,7 @@ public:
QWaylandClipboard(QWaylandDisplay *display);
~QWaylandClipboard();
- const QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) const;
+ QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard);
void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard);
bool supportsMode(QClipboard::Mode mode) const;
@@ -81,7 +81,7 @@ private:
QWaylandDisplay *mDisplay;
QWaylandSelection *mSelection;
- mutable QWaylandMimeData *mMimeDataIn;
+ QWaylandMimeData *mMimeDataIn;
QList<QWaylandSelection *> mSelections;
QStringList mOfferedMimeTypes;
struct wl_selection_offer *mOffer;