From 114988153335db4562004d7e290e8827e5477eab Mon Sep 17 00:00:00 2001
From: mhogomchungu <mhogomchungu@gmail.com>
Date: Sun, 9 Feb 2025 22:00:28 +0300
Subject: [PATCH] code improvements

---
 src/utility.cpp | 41 +++++++++++++++++++++++++++++++----------
 src/utility.h   |  1 +
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/utility.cpp b/src/utility.cpp
index 23434515..6f6e9064 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -603,18 +603,34 @@ std::vector< utility::PlayerOpts > utility::getMediaPlayers()
 
 		m.emplace_back( "","Flatpak" ) ;
 	}else{
-		struct app
+		class appList
 		{
-			app( const char * u,const char * e ) : uiName( u ),exeName( e )
+		public:
+			struct app
 			{
+				app( const char * u,const char * e ) : uiName( u ),exeName( e )
+				{
+				}
+				const char * uiName ;
+				const char * exeName ;
+			} ;
+			appList()
+			{
+				m_appList.emplace_back( "VLC","vlc" ) ;
+				m_appList.emplace_back( "SMPlayer","smplayer" ) ;
+				m_appList.emplace_back( "MPV","mpv" ) ;
 			}
-			const char * uiName ;
-			const char * exeName ;
-		};
-
-		std::array< app,3 > apps = { { { "VLC","vlc" },
-					       { "SMPlayer","smplayer" },
-					       { "MPV","mpv" } } } ;
+			auto begin() const
+			{
+				return m_appList.begin() ;
+			}
+			auto end() const
+			{
+				return m_appList.end() ;
+			}
+		private:
+			std::vector< app > m_appList ;
+		} apps ;
 
 		for( const auto& it : apps ){
 
@@ -2003,7 +2019,7 @@ bool utility::cliArguments::portable() const
 
 bool utility::cliArguments::printMediaPlayers() const
 {
-	return this->contains( "--print-media-players" ) ;
+	return this->contains( "--show-media-players" ) ;
 }
 
 QString utility::cliArguments::dataPath() const
@@ -2457,6 +2473,11 @@ bool utility::Qt6Version()
 #endif
 }
 
+bool utility::Qt5Version()
+{
+	return !utility::Qt6Version() ;
+}
+
 QString utility::OSXApplicationDirPath()
 {
 	return QCoreApplication::applicationDirPath() ;
diff --git a/src/utility.h b/src/utility.h
index e4d8fb32..ea82810a 100644
--- a/src/utility.h
+++ b/src/utility.h
@@ -494,6 +494,7 @@ namespace utility
 	void failedToParseJsonData( Logger&,const QJsonParseError& ) ;
 	bool runningGitVersion() ;
 	bool Qt6Version() ;
+	bool Qt5Version() ;
 	QString runningVersionOfMediaDownloader() ;
 	QString aboutVersionInfo() ;
 	QString compileTimeVersion() ;