feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Fix two QMultiMap deprecation warnings

Browse Source 
#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 <christian.stenger@qt.io>
This commit is contained in:
hjk
2024-06-26 09:15:48 +02:00
parent 68adb2c086
commit 66853bacf7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

@@ -101,7 +101,7 @@ void GerritPushDialog::initRemoteBranches()
int refBranchIndex = ref.indexOf('/'); int refBranchIndex = ref.indexOf('/');
qint64 timeT = entries.at(1).left(entries.at(1).indexOf(' ')).toLongLong(); qint64 timeT = entries.at(1).left(entries.at(1).indexOf(' ')).toLongLong();
BranchDate bd(ref.mid(refBranchIndex + 1), QDateTime::fromSecsSinceEpoch(timeT).date()); 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); m_remoteComboBox->updateRemotes(false);
} }
@@ -339,7 +339,7 @@ void GerritPushDialog::setRemoteBranches(bool includeOld)
const QStringList remoteBranches = const QStringList remoteBranches =
gitClient().synchronousRepositoryBranches(remoteName, m_workingDir); gitClient().synchronousRepositoryBranches(remoteName, m_workingDir);
for (const QString &branch : remoteBranches) for (const QString &branch : remoteBranches)
m_remoteBranches.insertMulti(remoteName, {branch, {}}); m_remoteBranches.insert(remoteName, {branch, {}});
if (remoteBranches.isEmpty()) { if (remoteBranches.isEmpty()) {
m_targetBranchComboBox->setEditable(true); m_targetBranchComboBox->setEditable(true);
m_targetBranchComboBox->setToolTip( m_targetBranchComboBox->setToolTip(