Switch QMap -> QMultiMap in MPEG code.

Qt5.15 has obsoleted the QMap::insertMulti function. The recommended replacement is to use QMultiMap.
MythTV · Sep 20, 2020 · b1be69b · b1be69b
1 parent ed9ee35
commit b1be69b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/mythtv/libs/libmythtv/eitfixup.cpp b/mythtv/libs/libmythtv/eitfixup.cpp
@@ -3149,7 +3149,7 @@ void EITFixUp::FixUnitymedia(DBEventEIT &event)
 
     // handle cast and crew in items in the DVB Extended Event Descriptor
     // remove handled items from the map, so the left overs can be reported
-    QMap<QString,QString>::iterator i = event.m_items.begin();
+    auto i = event.m_items.begin();
     while (i != event.m_items.end())
     {
         if ((QString::compare (i.key(), "Role Player") == 0) ||

diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp
@@ -206,7 +206,7 @@ void EITHelper::AddETT(uint atsc_major, uint atsc_minor,
 static void parse_dvb_event_descriptors(const desc_list_t& list, FixupValue fix,
                                         QMap<uint,uint> languagePreferences,
                                         QString &title, QString &subtitle,
-                                        QString &description, QMap<QString,QString> &items)
+                                        QString &description, QMultiMap<QString,QString> &items)
 {
     const unsigned char *bestShortEvent =
         MPEGDescriptor::FindBestMatch(
@@ -362,7 +362,7 @@ void EITHelper::AddEIT(const DVBEventInformationTable *eit)
         uint season = 0;
         uint episode = 0;
         uint totalepisodes = 0;
-        QMap<QString,QString> items;
+        QMultiMap<QString,QString> items;
 
         // Parse descriptors
         desc_list_t list = MPEGDescriptor::Parse(
@@ -636,7 +636,7 @@ void EITHelper::AddEIT(const PremiereContentInformationTable *cit)
     uint season = 0;
     uint episode = 0;
     uint totalepisodes = 0;
-    QMap<QString,QString> items;
+    QMultiMap<QString,QString> items;
 
     // Parse descriptors
     desc_list_t list = MPEGDescriptor::Parse(

diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
@@ -1010,9 +1010,9 @@ QString AC3Descriptor::toString(void) const
     return ret;
 }
 
-QMap<QString,QString> ExtendedEventDescriptor::Items(void) const
+QMultiMap<QString,QString> ExtendedEventDescriptor::Items(void) const
 {
-    QMap<QString, QString> ret;
+    QMultiMap<QString, QString> ret;
 
     uint index = 0;
 
@@ -1025,7 +1025,7 @@ QMap<QString,QString> ExtendedEventDescriptor::Items(void) const
         index += 1 + m_data[7 + index];
         QString item = dvb_decode_text (&m_data[8 + index], m_data[7 + index]);
         index += 1 + m_data[7 + index];
-        ret.insertMulti (item_description, item);
+        ret.insert (item_description, item);
     }
 
     return ret;

diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
@@ -1550,7 +1550,7 @@ class MTV_PUBLIC ExtendedEventDescriptor : public MPEGDescriptor
     //   item_length            8   1.0+p2
     //   for (j=0;j<N;j++) { item_char 8 }
     // }
-    QMap<QString,QString> Items(void) const;
+    QMultiMap<QString,QString> Items(void) const;
     // text_length 8
     uint TextLength(void)       const { return m_data[7 + LengthOfItems()]; }
     // for (i=0; i<N; i++) { text_char 8 }

diff --git a/mythtv/libs/libmythtv/programdata.h b/mythtv/libs/libmythtv/programdata.h
@@ -207,7 +207,7 @@ class MTV_PUBLIC DBEventEIT : public DBEvent
   public:
     uint32_t              m_chanid;
     FixupValue            m_fixup;
-    QMap<QString,QString> m_items;
+    QMultiMap<QString,QString> m_items;
 };
 
 class MTV_PUBLIC ProgInfo : public DBEvent

diff --git a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp
@@ -697,11 +697,11 @@ void TestEITFixups::testUnitymedia()
                                          "Titel",
                                          "Beschreib",
                                          "Beschreibung ... IMDb Rating: 8.9 /10");
-    QMap<QString,QString> cast;
-    cast.insertMulti ("Role Player", "Great Actor");
-    cast.insertMulti ("Role Player", "Other Actor");
-    cast.insertMulti ("Director", "Great Director");
-    cast.insertMulti ("Unhandled", "lets fix it up");
+    QMultiMap<QString,QString> cast;
+    cast.insert ("Role Player", "Great Actor");
+    cast.insert ("Role Player", "Other Actor");
+    cast.insert ("Director", "Great Director");
+    cast.insert ("Unhandled", "lets fix it up");
     event->m_items = cast;
 
     QVERIFY(!event->HasCredits());