QMap with multiple values for identical keys is deprecated, port to Q…

…MultiMap Signed-off-by: Matthew J. Milner <[email protected]>
OpenChemistry · Oct 24, 2024 · 474927d · 474927d
1 parent 90b311d
commit 474927d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/avogadro/qtgui/scriptloader.cpp b/avogadro/qtgui/scriptloader.cpp
@@ -44,12 +44,12 @@ bool ScriptLoader::queryProgramName(const QString& scriptFilePath,
   return true;
 }
 
-QMap<QString, QString> ScriptLoader::scriptList(const QString& type)
+QMultiMap<QString, QString> ScriptLoader::scriptList(const QString& type)
 {
   // List of directories to check.
   /// @todo Custom script locations
   QStringList dirs;
-  QMap<QString, QString> scriptList;
+  QMultiMap<QString, QString> scriptList;
 
   // add the default paths
   QStringList stdPaths =
@@ -136,10 +136,10 @@ QMap<QString, QString> ScriptLoader::scriptList(const QString& type)
       if (scriptList.contains(displayName)) {
         // check the last-modified-time of the existing case
         QFileInfo file(filePath);
-        QFileInfo existingFile(scriptList[displayName]);
+        QFileInfo existingFile(scriptList.value(displayName));
         if (file.lastModified() > existingFile.lastModified()) {
           // replace existing with this new entry
-          scriptList.insert(displayName, filePath);
+          scriptList.replace(displayName, filePath);
         }
       } else // new entry
         scriptList.insert(displayName, filePath);

diff --git a/avogadro/qtgui/scriptloader.h b/avogadro/qtgui/scriptloader.h
@@ -39,7 +39,7 @@ class AVOGADROQTGUI_EXPORT ScriptLoader : public QObject
   /**
    * @return A map of name -> path for all scripts of the requested @arg type
    */
-  static QMap<QString, QString> scriptList(const QString& type);
+  static QMultiMap<QString, QString> scriptList(const QString& type);
 
   static bool queryProgramName(const QString& scriptFilePath,
                                QString& displayName);

diff --git a/avogadro/qtplugins/commandscripts/command.h b/avogadro/qtplugins/commandscripts/command.h
@@ -84,7 +84,7 @@ private slots:
   QProgressDialog* m_progress;
 
   // maps program name --> script file path
-  QMap<QString, QString> m_commandScripts;
+  QMultiMap<QString, QString> m_commandScripts;
 
   const Io::FileFormat* m_outputFormat;
   QString m_outputFileName;

diff --git a/avogadro/qtplugins/forcefield/forcefield.cpp b/avogadro/qtplugins/forcefield/forcefield.cpp
@@ -485,7 +485,7 @@ void Forcefield::refreshScripts()
   qDeleteAll(m_scripts);
   m_scripts.clear();
 
-  QMap<QString, QString> scriptPaths =
+  QMultiMap<QString, QString> scriptPaths =
     QtGui::ScriptLoader::scriptList("energy");
   foreach (const QString& filePath, scriptPaths) {
     auto* model = new ScriptEnergy(filePath);

diff --git a/avogadro/qtplugins/quantuminput/quantuminput.h b/avogadro/qtplugins/quantuminput/quantuminput.h
@@ -80,7 +80,7 @@ private slots:
   QMap<QString, MoleQueue::InputGeneratorDialog*> m_dialogs;
 
   // maps program name --> script file path
-  QMap<QString, QString> m_inputGeneratorScripts;
+  QMultiMap<QString, QString> m_inputGeneratorScripts;
 
   const Io::FileFormat* m_outputFormat;
   QString m_outputFileName;

diff --git a/avogadro/qtplugins/scriptcharges/scriptcharges.cpp b/avogadro/qtplugins/scriptcharges/scriptcharges.cpp
@@ -42,7 +42,7 @@ void ScriptCharges::refreshModels()
   qDeleteAll(m_models);
   m_models.clear();
 
-  QMap<QString, QString> scriptPaths =
+  QMultiMap<QString, QString> scriptPaths =
     QtGui::ScriptLoader::scriptList("charges");
   foreach (const QString& filePath, scriptPaths) {
     auto* model = new ScriptChargeModel(filePath);

diff --git a/avogadro/qtplugins/scriptfileformats/scriptfileformats.cpp b/avogadro/qtplugins/scriptfileformats/scriptfileformats.cpp
@@ -46,7 +46,7 @@ void ScriptFileFormats::refreshFileFormats()
   qDeleteAll(m_formats);
   m_formats.clear();
 
-  QMap<QString, QString> scriptPaths =
+  QMultiMap<QString, QString> scriptPaths =
     QtGui::ScriptLoader::scriptList("formatScripts");
   foreach (const QString& filePath, scriptPaths) {
     auto* format = new FileFormatScript(filePath);