Fix c++ style

Author: mnesarco

src/deployers/PluginsDeployerFactory.cpp

@@ -42,11 +42,7 @@ std::vector<std::shared_ptr<PluginsDeployer>> PluginsDeployerFactory::getDeploye
         return {getInstance<XcbglIntegrationPluginsDeployer>(moduleName)};
     }
 
-    if (moduleName == "network") {
-        if (qtMajorVersion == 6) {
-            // Qt6 has no bearer plugin.
-            return {getInstance<BasicPluginsDeployer>(moduleName)};
-        }
+    if (moduleName == "network" && qtMajorVersion < 6) {
         return {getInstance<BearerPluginsDeployer>(moduleName)};
     }
 

src/deployers/PluginsDeployerFactory.h

@@ -23,7 +23,7 @@ namespace linuxdeploy {
                 const boost::filesystem::path qtInstallQmlPath;
                 const boost::filesystem::path qtTranslationsPath;
                 const boost::filesystem::path qtDataPath;
-                const int qtMajorVersion{5};
+                const int qtMajorVersion;
 
                 template<typename T>
                 std::shared_ptr<PluginsDeployer> getInstance(const std::string& moduleName) {

src/main.cpp

@@ -105,7 +105,7 @@ int main(const int argc, const char *const *const argv) {
         return 1;
     }
 
-    int qtMajorVersion = atoi(qtVersion.c_str());
+    int qtMajorVersion = std::stoi(qtVersion, nullptr, 10);
     if (qtMajorVersion < 5) {
         ldLog() << std::endl << LD_WARNING << "Minimum Qt version supported is 5" << std::endl;
         qtMajorVersion = 5;
@@ -172,9 +172,9 @@ int main(const int argc, const char *const *const argv) {
         return false;
     };
 
-    const std::vector<QtModule> *qtmodules = qtMajorVersion == 6 ? &Qt6Modules : &Qt5Modules;
+    const std::vector<QtModule>& qtmodules = getQtModules(qtMajorVersion);
 
-    std::copy_if(qtmodules->begin(), qtmodules->end(), std::back_inserter(foundQtModules),
+    std::copy_if(qtmodules.begin(), qtmodules.end(), std::back_inserter(foundQtModules),
                  [&matchesQtModule, &libraryNames](const QtModule &module) {
                      return std::find_if(libraryNames.begin(), libraryNames.end(),
                                          [&matchesQtModule, &module](const std::string &libraryName) {
@@ -188,7 +188,7 @@ int main(const int argc, const char *const *const argv) {
         extraPluginsFromEnv = linuxdeploy::util::split(std::string(extraPluginsFromEnvData), ';');
 
     for (const auto& pluginsList : {static_cast<std::vector<std::string>>(extraPlugins.Get()), extraPluginsFromEnv}) {
-        std::copy_if(qtmodules->begin(), qtmodules->end(), std::back_inserter(extraQtModules),
+        std::copy_if(qtmodules.begin(), qtmodules.end(), std::back_inserter(extraQtModules),
             [&matchesQtModule, &libraryNames, &pluginsList](const QtModule &module) {
                 return std::find_if(pluginsList.begin(), pluginsList.end(),
                     [&matchesQtModule, &module](const std::string &libraryName) {

src/qt-modules.h

@@ -166,3 +166,15 @@ static const std::vector<QtModule> Qt6Modules = {
     */
 
 };
+
+static const std::vector<QtModule> EmptyQtModules = {};
+
+inline const std::vector<QtModule>& getQtModules(const int version) {
+    if (version == 5) {
+        return Qt5Modules;
+    }
+    else if (version == 6) {
+        return Qt6Modules;
+    }
+    return EmptyQtModules;
+}