Always calculate hash value for new data in item

hluk · Apr 7, 2013 · 36a61ab · 36a61ab
1 parent 1f89925
commit 36a61ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/clipboarditem.cpp b/src/clipboarditem.cpp
@@ -50,28 +50,28 @@ bool ClipboardItem::operator ==(const QMimeData &data) const
 void ClipboardItem::clear()
 {
     m_data->clear();
-    m_hash = hash(*m_data, m_data->formats());
+    updateDataHash();
 }
 
 void ClipboardItem::setData(QMimeData *data)
 {
     delete m_data;
     m_data = data;
-    m_hash = 0;
+    updateDataHash();
 }
 
 void ClipboardItem::setData(const QVariant &value)
 {
     // rewrite all original data with edited text
     m_data->clear();
     m_data->setText( value.toString() );
-    m_hash = hash(*m_data, m_data->formats());
+    updateDataHash();
 }
 
 void ClipboardItem::setData(const QString &mimeType, const QByteArray &data)
 {
     m_data->setData(mimeType, data);
-    m_hash = hash(*m_data, m_data->formats());
+    updateDataHash();
 }
 
 QString ClipboardItem::text() const
@@ -105,6 +105,12 @@ QVariant ClipboardItem::data(int role) const
     return QVariant();
 }
 
+
+void ClipboardItem::updateDataHash()
+{
+    m_hash = hash(*m_data, m_data->formats());
+}
+
 QDataStream &operator<<(QDataStream &stream, const ClipboardItem &item)
 {
     const QMimeData *data = item.data();

diff --git a/src/include/clipboarditem.h b/src/include/clipboarditem.h
@@ -82,6 +82,8 @@ class ClipboardItem
     uint dataHash() const { return m_hash; }
 
 private:
+    void updateDataHash();
+
     QMimeData *m_data;
     uint m_hash;
 };