Merge pull request rism-digital#1458 from eNote-GmbH/use-multimap

Use multimap instead of vector of pairs
SkyprayerAudioStudio · May 13, 2020 · 715be28 · 715be28
2 parents 4653a20 + 920c45a
commit 715be28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
@@ -1463,8 +1463,8 @@ class PrepareLyricsParams : public FunctorParams {
 class PrepareLinkingParams : public FunctorParams {
 public:
     PrepareLinkingParams() { m_fillList = true; }
-    ArrayOfLinkingInterfaceUuidPairs m_nextUuidPairs;
-    ArrayOfLinkingInterfaceUuidPairs m_sameasUuidPairs;
+    MapOfLinkingInterfaceUuidPairs m_nextUuidPairs;
+    MapOfLinkingInterfaceUuidPairs m_sameasUuidPairs;
     bool m_fillList;
 };
 

diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
@@ -289,7 +289,7 @@ typedef std::vector<BeamElementCoord *> ArrayOfBeamElementCoords;
 
 typedef std::vector<std::pair<int, int> > ArrayOfIntPairs;
 
-typedef std::multimap<std::string, LinkingInterface *> ArrayOfLinkingInterfaceUuidPairs;
+typedef std::multimap<std::string, LinkingInterface *> MapOfLinkingInterfaceUuidPairs;
 
 typedef std::vector<std::pair<PlistInterface *, std::string> > ArrayOfPlistInterfaceUuidPairs;