using std::initializer_list

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9534 90c681e8-e032-0410-971d-27865f9a5e38

22 files changed, 48 insertions, 51 deletions

diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
index 491dc7cb0..8b069b287 100644
--- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
+++ b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp
@@ -35,7 +35,7 @@ EngineProperties MplayerEngineFactory::properties() const
     properties.filters = MplayerInfo::filters();
     properties.description = tr("Video Files");
     //properties.contentType = "application/ogg;audio/x-vorbis+ogg";
-    properties.protocols << "file";
+    properties.protocols = QStringList { "file" };
     properties.hasAbout = true;
     properties.hasSettings = true;
     return properties;
diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp
index fe8eaca11..ba889def9 100644
--- a/src/plugins/Input/aac/decoderaacfactory.cpp
+++ b/src/plugins/Input/aac/decoderaacfactory.cpp
@@ -37,9 +37,9 @@ DecoderProperties DecoderAACFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("AAC Plugin");
-    properties.filters << "*.aac";
+    properties.filters = QStringList { "*.aac" };
     properties.description = tr("AAC Files");
-    properties.contentTypes << "audio/aacp" << "audio/aac";
+    properties.contentTypes = QStringList { "audio/aacp", "audio/aac" };
     properties.shortName = "aac";
     properties.hasAbout = true;
     properties.hasSettings = false;
diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp
index 8a7e626e8..cb6dff098 100644
--- a/src/plugins/Input/archive/decoderarchivefactory.cpp
+++ b/src/plugins/Input/archive/decoderarchivefactory.cpp
@@ -37,14 +37,14 @@ DecoderProperties DecoderArchiveFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("Archive Plugin");
-    properties.filters << "*.rar" << "*.zip";
+    properties.filters = QStringList { "*.rar", "*.zip" };
     properties.description = tr("Archives");
-    properties.contentTypes << "application/zip" << "application/x-rar-compressed";
+    properties.contentTypes = QStringList { "application/zip", "application/x-rar-compressed" };
     properties.shortName = "archive";
     properties.hasAbout = true;
     properties.hasSettings = false;
     properties.noInput = true;
-    properties.protocols << "rar" << "zip";
+    properties.protocols = QStringList { "rar", "zip" };
     return properties;
 }
 
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
index 8bb24cf61..bbb5a7c90 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
@@ -49,7 +49,7 @@ DecoderProperties DecoderCDAudioFactory::properties() const
     DecoderProperties properties;
     properties.name = tr("CD Audio Plugin");
     properties.shortName = "cdaudio";
-    properties.protocols << "cdda";
+    properties.protocols = QStringList { "cdda" };
     properties.hasAbout = true;
     properties.noInput = true;
     properties.hasSettings = true;
diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp
index 30a9722bf..89f67bf82 100644
--- a/src/plugins/Input/cue/decodercuefactory.cpp
+++ b/src/plugins/Input/cue/decodercuefactory.cpp
@@ -37,9 +37,9 @@ DecoderProperties DecoderCUEFactory::properties() const
     DecoderProperties properties;
     properties.name = tr("CUE Plugin");
     properties.shortName = "cue";
-    properties.filters << "*.cue";
+    properties.filters = QStringList { "*.cue" };
     properties.description = tr("CUE Files");
-    properties.protocols << "cue";
+    properties.protocols = QStringList { "cue" };
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.noInput = true;
diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp
index 2d4ae3ddb..3ca80bd8f 100644
--- a/src/plugins/Input/flac/decoderflacfactory.cpp
+++ b/src/plugins/Input/flac/decoderflacfactory.cpp
@@ -52,11 +52,11 @@ DecoderProperties DecoderFLACFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("FLAC Plugin");
-    properties.filters << "*.flac" << "*.oga";
+    properties.filters = QStringList { "*.flac", "*.oga" };
     properties.description = tr("FLAC Files");
-    properties.contentTypes << "audio/x-flac" << "audio/flac";
+    properties.contentTypes = QStringList { "audio/x-flac", "audio/flac" };
     properties.shortName = "flac";
-    properties.protocols << "flac";
+    properties.protocols = QStringList { "flac" };
     properties.hasAbout = true;
     properties.hasSettings = false;
     return properties;
diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp
index bbf258491..8b981b0b7 100644
--- a/src/plugins/Input/gme/decodergmefactory.cpp
+++ b/src/plugins/Input/gme/decodergmefactory.cpp
@@ -36,15 +36,15 @@ DecoderProperties DecoderGmeFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("GME Plugin");
-    properties.filters << "*.ay" << "*.gbs" << "*.gym" << "*.hes" << "*.kss" << "*.nsf" << "*.nsfe";
-    properties.filters << "*.sap" << "*.spc" << "*.vgm" << "*.vgz";
+    properties.filters = QStringList { "*.ay", "*.gbs", "*.gym", "*.hes", "*.kss", "*.nsf", "*.nsfe",
+            "*.sap", "*.spc", "*.vgm", "*.vgz" };
     properties.description = tr("Game Music Files");
     //properties.contentType = ;
     properties.shortName = "gme";
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.noInput = true;
-    properties.protocols << "gme";
+    properties.protocols = QStringList { "gme" };
     return properties;
 }
 
diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp
index 326aa942b..0d0a5ef20 100644
--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp
+++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp
@@ -43,18 +43,18 @@ DecoderProperties DecoderModPlugFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("ModPlug Plugin");
-    properties.filters << "*.amf" << "*.ams" << "*.dbm" << "*.dbf" << "*.dsm" << "*.far" << "*.mdl";
-    properties.filters << "*.stm" << "*.ult" << "*.j2b" << "*.mt2" << "*.mdz" << "*.mdr" << "*.mdgz";
-    properties.filters << "*.mdbz" << "*.mod" << "*.s3z" << "*.s3r" << "*.s3gz" << "*.s3m" << "*.xmz";
-    properties.filters << "*.xmr" << "*.xmgz" << "*.itz" << "*.itr" << "*.itgz" << "*.dmf" "*.umx";
-    properties.filters << "*.it" << "*.669" << "*.xm" << "*.mtm" << "*.psm" << "*.ft2" << "*.med";
+    properties.filters = QStringList { "*.amf" , "*.ams" , "*.dbm" , "*.dbf" , "*.dsm" , "*.far" , "*.mdl",
+            "*.stm" , "*.ult" , "*.j2b" , "*.mt2" , "*.mdz" , "*.mdr" , "*.mdgz",
+            "*.mdbz" , "*.mod" , "*.s3z" , "*.s3r" , "*.s3gz" , "*.s3m" , "*.xmz",
+            "*.xmr" , "*.xmgz" , "*.itz" , "*.itr" , "*.itgz" , "*.dmf" "*.umx",
+            "*.it" , "*.669" , "*.xm" , "*.mtm" , "*.psm" , "*.ft2" , "*.med" };
     properties.description = tr("ModPlug Files");
     //properties.contentType = ;
     properties.shortName = "modplug";
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.noInput = true;
-    properties.protocols << "file";
+    properties.protocols = QStringList { "file" };
     return properties;
 }
 
diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp
index cac339de6..892304212 100644
--- a/src/plugins/Input/mpc/decodermpcfactory.cpp
+++ b/src/plugins/Input/mpc/decodermpcfactory.cpp
@@ -45,7 +45,7 @@ DecoderProperties DecoderMPCFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("Musepack Plugin");
-    properties.filters << "*.mpc";
+    properties.filters = QStringList { "*.mpc" };
     properties.description = tr("Musepack Files");
     //properties.contentType = ;
     properties.shortName = "mpc";
diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp
index c726e8fcb..53474e308 100644
--- a/src/plugins/Input/mpeg/decodermpegfactory.cpp
+++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp
@@ -178,9 +178,9 @@ DecoderProperties DecoderMPEGFactory::properties() const
     DecoderProperties properties;
     properties.name = tr("MPEG Plugin");
     properties.shortName = "mpeg";
-    properties.filters << "*.mp1" << "*.mp2" << "*.mp3" << "*.wav";
+    properties.filters = QStringList { "*.mp1", "*.mp2", "*.mp3", "*.wav" };
     properties.description = tr("MPEG Files");
-    properties.contentTypes << "audio/mp3" << "audio/mpeg";
+    properties.contentTypes = QStringList { "audio/mp3", "audio/mpeg" };
     properties.hasAbout = true;
     properties.hasSettings = true;
     return properties;
diff --git a/src/plugins/Input/opus/decoderopusfactory.cpp b/src/plugins/Input/opus/decoderopusfactory.cpp
index 12dab96ff..9a7affbc5 100644
--- a/src/plugins/Input/opus/decoderopusfactory.cpp
+++ b/src/plugins/Input/opus/decoderopusfactory.cpp
@@ -41,9 +41,9 @@ DecoderProperties DecoderOpusFactory::properties() const
     DecoderProperties properties;
     properties.name = tr("Opus Plugin");
     properties.shortName = "opus";
-    properties.filters << "*.opus";
+    properties.filters = QStringList { "*.opus" };
     properties.description = tr("Ogg Opus Files");
-    properties.contentTypes << "audio/opus";
+    properties.contentTypes = QStringList { "audio/opus" };
     properties.hasAbout = true;
     properties.hasSettings = false;
     properties.noInput = false;
diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp
index 368f79ab6..ddb5851fc 100644
--- a/src/plugins/Input/sid/decodersidfactory.cpp
+++ b/src/plugins/Input/sid/decodersidfactory.cpp
@@ -55,14 +55,14 @@ DecoderProperties DecoderSIDFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("SID Plugin");
-    properties.filters << "*.sid" << "*.mus" << "*.str" << "*.prg" << "*.P00" << "*.c64";
+    properties.filters = QStringList { "*.sid", "*.mus", "*.str", "*.prg", "*.P00", "*.c64" };
     properties.description = tr("SID Files");
     //properties.contentType = ;
     properties.shortName = "sid";
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.noInput = true;
-    properties.protocols << "sid";
+    properties.protocols = QStringList { "sid" };
     return properties;
 }
 
diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
index 1b1a1fd56..d6184be50 100644
--- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp
+++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
@@ -116,8 +116,8 @@ DecoderProperties DecoderSndFileFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("Sndfile Plugin");
-    properties.filters << "*.wav" << "*.au" << "*.snd" << "*.aif" << "*.aiff" << "*.8svx";
-    properties.filters << "*.sph" << "*.sf" << "*.voc" << "*.w64";
+    properties.filters = QStringList { "*.wav", "*.au", "*.snd", "*.aif", "*.aiff", "*.8svx" };
+    properties.filters = QStringList { "*.sph", "*.sf", "*.voc", "*.w64" };
     properties.description = tr("PCM Files");
     //properties.contentType = "";
     properties.shortName = "sndfile";
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index a810a6462..e96f29367 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -43,9 +43,9 @@ DecoderProperties DecoderVorbisFactory::properties() const
     DecoderProperties properties;
     properties.name = tr("Ogg Vorbis Plugin");
     properties.shortName = "vorbis";
-    properties.filters << "*.ogg";
+    properties.filters = QStringList { "*.ogg" };
     properties.description = tr("Ogg Vorbis Files");
-    properties.contentTypes << "application/ogg" << "audio/x-vorbis+ogg";
+    properties.contentTypes = QStringList { "application/ogg", "audio/x-vorbis+ogg" };
     properties.hasAbout = true;
     properties.hasSettings = false;
     properties.noInput = false;
diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
index 76472af30..dd9b2ced1 100644
--- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
+++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
@@ -37,14 +37,14 @@ DecoderProperties DecoderWavPackFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("WavPack Plugin");
-    properties.filters << "*.wv";
+    properties.filters = QStringList { "*.wv" };
     properties.description = tr("WavPack Files");
-    properties.contentTypes << "audio/x-wavpack";
+    properties.contentTypes = QStringList { "audio/x-wavpack" };
     properties.shortName = "wavpack";
     properties.hasAbout = true;
     properties.hasSettings = false;
     properties.noInput = true;
-    properties.protocols << "file" << "wvpack";
+    properties.protocols = QStringList { "file", "wvpack" };
     return properties;
 }
 
diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
index b32023f7d..eb3541722 100644
--- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
+++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
@@ -47,9 +47,9 @@ DecoderProperties DecoderWildMidiFactory::properties() const
 {
     DecoderProperties properties;
     properties.name = tr("WildMidi Plugin");
-    properties.filters << "*.mid";
+    properties.filters = QStringList { "*.mid" };
 #if defined(LIBWILDMIDI_VERSION) && (LIBWILDMIDI_VERSION >= 0x000400)
-    properties.filters << "*.mus" << "*.xmi";
+    properties.filters << QStringList { "*.mus", "*.xmi" };
 #endif
     properties.description = tr("Midi Files");
     //properties.contentType = ;
@@ -57,7 +57,7 @@ DecoderProperties DecoderWildMidiFactory::properties() const
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.noInput = true;
-    properties.protocols << "file";
+    properties.protocols = QStringList { "file" };
     return properties;
 }
 
diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
index 29eb042e0..2867e0531 100644
--- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
@@ -27,9 +27,9 @@
 PlayListFormatProperties M3UPlaylistFormat::properties() const
 {
     PlayListFormatProperties p;
-    p.filters << "*.m3u" << "*.m3u8";
+    p.filters = QStringList { "*.m3u", "*.m3u8" };
     p.shortName = "m3u";
-    p.contentTypes << "audio/x-mpegurl";
+    p.contentTypes = QStringList { "audio/x-mpegurl" };
     return p;
 }
 
diff --git a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
index 532acb2f1..b2e7bfb56 100644
--- a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
@@ -26,8 +26,8 @@
 PlayListFormatProperties PLSPlaylistFormat::properties() const
 {
     PlayListFormatProperties p;
-    p.filters << "*.pls";
-    p.contentTypes << "audio/x-scpls";
+    p.filters = QStringList { "*.pls" };
+    p.contentTypes = QStringList { "audio/x-scpls" };
     p.shortName = "pls";
     return p;
 }
diff --git a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
index cbea9ea57..ab02ea0f9 100644
--- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
@@ -31,9 +31,9 @@
 PlayListFormatProperties XSPFPlaylistFormat::XSPFPlaylistFormat::properties() const
 {
     PlayListFormatProperties p;
-    p.filters << "*.xspf";
+    p.filters = QStringList { "*.xspf" };
     p.shortName = "xspf";
-    p.contentTypes << "application/xspf+xml";
+    p.contentTypes = QStringList { "application/xspf+xml" };
     return p;
 }
 
diff --git a/src/plugins/Transports/http/httpinputfactory.cpp b/src/plugins/Transports/http/httpinputfactory.cpp
index 230eaeb7e..7513bc9df 100644
--- a/src/plugins/Transports/http/httpinputfactory.cpp
+++ b/src/plugins/Transports/http/httpinputfactory.cpp
@@ -29,7 +29,7 @@
 InputSourceProperties HTTPInputFactory::properties() const
 {
     InputSourceProperties properties;
-    properties.protocols << "http" << "https";
+    properties.protocols = QStringList { "http", "https" };
     properties.name = tr("HTTP Plugin");
     properties.shortName = "http";
     properties.hasAbout = true;
diff --git a/src/plugins/Transports/mms/mmsinputfactory.cpp b/src/plugins/Transports/mms/mmsinputfactory.cpp
index 8ab97b5c3..6168f80c4 100644
--- a/src/plugins/Transports/mms/mmsinputfactory.cpp
+++ b/src/plugins/Transports/mms/mmsinputfactory.cpp
@@ -28,7 +28,7 @@
 InputSourceProperties MMSInputFactory::properties() const
 {
     InputSourceProperties properties;
-    properties.protocols << "mms" << "mmsh" << "mmst" << "mmsu";
+    properties.protocols = QStringList { "mms", "mmsh", "mmst", "mmsu" };
     properties.name = tr("MMS Plugin");
     properties.shortName = "mms";
     properties.hasAbout = true;
diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
index b7f0f1641..7043b7a3b 100644
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -105,13 +105,10 @@ void ProjectMWidget::initializeGL()
         QString presetPath = QString::fromLocal8Bit(m_projectM->settings().presetURL.c_str());
         QDir presetDir(presetPath);
         presetDir.setFilter(QDir::Files);
-        QStringList filters;
-        filters << "*.prjm" << "*.milk";
+        const QStringList filters = { "*.prjm", "*.milk" };
         const QFileInfoList l = presetDir.entryInfoList(filters);
 
-        RatingList list;
-        list.push_back(3);
-        list.push_back(3);
+        const RatingList list = { 3, 3 };
         for(const QFileInfo &info : qAsConst(l))
         {
             m_projectM->addPresetURL (info.absoluteFilePath().toStdString(), info.fileName().toStdString(), list);