From 66853bacf793c025bad7a8867df90fcac066e9c9 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 26 Jun 2024 09:15:48 +0200 Subject: [PATCH] Git: Fix two QMultiMap deprecation warnings #if QT_DEPRECATED_SINCE(6, 0) QT_DEPRECATED_VERSION_X_6_0("Use insert() instead") iterator insertMulti(const Key &key, const T &value) { .... Change-Id: I94c79e16776775b6b2032113e690e73b63a03dc9 Reviewed-by: Christian Stenger --- src/plugins/git/gerrit/gerritpushdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 1a29273d095..02f7ecdb6b7 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -101,7 +101,7 @@ void GerritPushDialog::initRemoteBranches() int refBranchIndex = ref.indexOf('/'); qint64 timeT = entries.at(1).left(entries.at(1).indexOf(' ')).toLongLong(); BranchDate bd(ref.mid(refBranchIndex + 1), QDateTime::fromSecsSinceEpoch(timeT).date()); - m_remoteBranches.insertMulti(ref.left(refBranchIndex), bd); + m_remoteBranches.insert(ref.left(refBranchIndex), bd); } m_remoteComboBox->updateRemotes(false); } @@ -339,7 +339,7 @@ void GerritPushDialog::setRemoteBranches(bool includeOld) const QStringList remoteBranches = gitClient().synchronousRepositoryBranches(remoteName, m_workingDir); for (const QString &branch : remoteBranches) - m_remoteBranches.insertMulti(remoteName, {branch, {}}); + m_remoteBranches.insert(remoteName, {branch, {}}); if (remoteBranches.isEmpty()) { m_targetBranchComboBox->setEditable(true); m_targetBranchComboBox->setToolTip(