Convert to std::array and std::string. (libmythmetadata)

MythTV · Aug 28, 2020 · a49bd0a · a49bd0a
1 parent 41c4ab1
commit a49bd0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/mythtv/libs/libmythmetadata/musicmetadata.cpp b/mythtv/libs/libmythmetadata/musicmetadata.cpp
@@ -72,9 +72,7 @@ MusicMetadata::MusicMetadata(int lid, QString lbroadcaster, QString lchannel, QS
             m_country(std::move(lcountry)),
             m_language(std::move(llanguage))
 {
-    for (int x = 0; x < STREAMURLCOUNT; x++)
-        m_urls[x] = lurls[x];
-
+    m_urls = lurls;
     setRepo(RT_Radio);
     ensureSortFields();
 }
@@ -142,8 +140,7 @@ MusicMetadata& MusicMetadata::operator=(const MusicMetadata &rhs)
     m_channel = rhs.m_channel;
     m_description = rhs.m_description;
 
-    for (int x = 0; x < 5; x++)
-        m_urls[x] = rhs.m_urls[x];
+    m_urls = rhs.m_urls;
     m_logoUrl = rhs.m_logoUrl;
     m_metaFormat = rhs.m_metaFormat;
     m_country = rhs.m_country;

diff --git a/mythtv/libs/libmythmetadata/musicmetadata.h b/mythtv/libs/libmythmetadata/musicmetadata.h
@@ -75,7 +75,7 @@ enum RepoType
 #define STREAMUPDATEURL "https://services.mythtv.org/music/data/?data=streams"
 #define STREAMURLCOUNT 5
 
-using UrlList = QString[STREAMURLCOUNT];
+using UrlList = std::array<QString,STREAMURLCOUNT>;
 
 class META_PUBLIC MusicMetadata
 {