From a60ee3716697fe174d272acc971351f6e533f2cc Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Sun, 26 Apr 2020 07:53:30 +0200
Subject: [PATCH] Fix deprecation warning in Qt 5.14 for QList::toSet()
Signed-off-by: Lukas Holecek <hluk@email.cz>
---
plugins/itemsync/tests/itemsynctests.cpp | 11 ++++++++---
src/gui/clipboardbrowser.cpp | 10 ++++------
src/gui/mainwindow.cpp | 1 -
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/plugins/itemsync/tests/itemsynctests.cpp b/plugins/itemsync/tests/itemsynctests.cpp
index 7406b04c3..2fb2d9ee9 100644
--- a/plugins/itemsync/tests/itemsynctests.cpp
+++ b/plugins/itemsync/tests/itemsynctests.cpp
@@ -502,9 +502,14 @@ void ItemSyncTests::notes()
// One new file for notes.
const QStringList files2 = dir1.files();
- const QSet<QString> filesDiff = files2.toSet() - files1.toSet();
- QCOMPARE( filesDiff.size(), 1 );
- const QString fileNote = *filesDiff.begin();
+ QCOMPARE( files2.size(), files1.size() + 1 );
+ QString fileNote;
+ for (const auto &file : files2) {
+ if ( !files1.contains(file) ) {
+ fileNote = file;
+ break;
+ }
+ }
// Read file with the notes.
FilePtr file = dir1.file(fileNote);
diff --git a/src/gui/clipboardbrowser.cpp b/src/gui/clipboardbrowser.cpp
index 174e84770..d42baceea 100644
--- a/src/gui/clipboardbrowser.cpp
+++ b/src/gui/clipboardbrowser.cpp
@@ -1650,15 +1650,13 @@ void ClipboardBrowser::addUnique(const QVariantMap &data, ClipboardMode mode)
const auto oldText = getTextData(previousData);
if ( (mode == ClipboardMode::Clipboard)
? (newText == oldText)
- : getTextData(data).contains(getTextData(previousData)) )
+ : newText.contains(oldText) )
{
COPYQ_LOG("New item: Merging with top item");
- const QSet<QString> formatsToAdd = previousData.keys().toSet() - data.keys().toSet();
-
- auto newData = data;
- for (const auto &format : formatsToAdd)
- newData.insert(format, previousData[format]);
+ auto newData = previousData;
+ for (auto it = data.constBegin(); it != data.constEnd(); ++it)
+ newData.insert(it.key(), it.value());
m.setData(firstIndex, newData, contentType::data);
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 649dd3af8..4959e01da 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -2679,7 +2679,6 @@ void MainWindow::tabsMoved(const QString &oldPrefix, const QString &newPrefix)
const QStringList tabs = ui->tabWidget->tabs();
Q_ASSERT( oldPrefix == newPrefix || !tabs.contains(oldPrefix) );
Q_ASSERT( !tabs.contains(QString()) );
- Q_ASSERT( tabs.toSet().size() == tabs.size() );
const QString prefix = oldPrefix + '/';
--
GitLab