app: Cleanup extra command line arguments.

openmv · Nov 22, 2024 · 86d009d · 86d009d
1 parent bcc78d4
commit 86d009d
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 31 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -69,16 +69,14 @@ const char fixedOptionsC[]
       "    -version                      Display program version\n"
       // OPENMV-DIFF //
       // "    -client                       Attempt to connect to already running first instance\n"
-      // OPENMV-DIFF //
-      "    -settingspath <path>          Override the default path where user settings are stored\n"
-      "    -installsettingspath <path>   Override the default path from where user-independent "
-      "settings are read\n"
-      "    -temporarycleansettings, -tcs Use clean settings for debug or testing reasons\n"
-      // OPENMV-DIFF //
+      // "    -settingspath <path>          Override the default path where user settings are stored\n"
+      // "    -installsettingspath <path>   Override the default path from where user-independent "
+      // "settings are read\n"
+      // "    -temporarycleansettings, -tcs Use clean settings for debug or testing reasons\n"
       // "    -pid <pid>                    Attempt to connect to instance given by pid\n"
       // "    -block                        Block until editor is closed\n"
+      // "    -pluginpath <path>            Add a custom search path for plugins\n"
       // OPENMV-DIFF //
-      "    -pluginpath <path>            Add a custom search path for plugins\n"
       "    -language <locale>            Set the UI language\n";
 
 const char HELP_OPTION1[] = "-h";
@@ -352,34 +350,44 @@ Options parseCommandLine(int argc, char *argv[])
         const bool hasNext = it + 1 != end;
         const auto nextArg = hasNext ? QString::fromLocal8Bit(*(it + 1)) : QString();
 
-        if (arg == SETTINGS_OPTION && hasNext) {
-            ++it;
-            options.settingsPath = QDir::fromNativeSeparators(nextArg);
-            options.preAppArguments << arg << nextArg;
-        } else if (arg == INSTALL_SETTINGS_OPTION && hasNext) {
-            ++it;
-            options.installSettingsPath = QDir::fromNativeSeparators(nextArg);
-            options.preAppArguments << arg << nextArg;
-        } else if (arg == PLUGINPATH_OPTION && hasNext) {
-            ++it;
-            options.customPluginPaths += QDir::fromNativeSeparators(nextArg);
-            options.preAppArguments << arg << nextArg;
-        } else if (arg == LANGUAGE_OPTION && hasNext) {
+        // OPENMV-DIFF //
+        // if (arg == SETTINGS_OPTION && hasNext) {
+        //     ++it;
+        //     options.settingsPath = QDir::fromNativeSeparators(nextArg);
+        //     options.preAppArguments << arg << nextArg;
+        // } else if (arg == INSTALL_SETTINGS_OPTION && hasNext) {
+        //     ++it;
+        //     options.installSettingsPath = QDir::fromNativeSeparators(nextArg);
+        //     options.preAppArguments << arg << nextArg;
+        // } else if (arg == PLUGINPATH_OPTION && hasNext) {
+        //     ++it;
+        //     options.customPluginPaths += QDir::fromNativeSeparators(nextArg);
+        //     options.preAppArguments << arg << nextArg;
+        // } else if (arg == LANGUAGE_OPTION && hasNext) {
+        //     ++it;
+        //     options.uiLanguage = nextArg;
+        //     options.preAppArguments << arg << nextArg;
+        // } else if (arg == USER_LIBRARY_PATH_OPTION && hasNext) {
+        //     ++it;
+        //     options.userLibraryPath = nextArg;
+        //     options.preAppArguments << arg << nextArg;
+        // } else if (arg == TEMPORARY_CLEAN_SETTINGS1 || arg == TEMPORARY_CLEAN_SETTINGS2) {
+        //     options.wantsCleanSettings = true;
+        //     options.preAppArguments << arg;
+        // } else { // arguments that are still passed on to the application
+        //     if (arg == TEST_OPTION)
+        //         options.hasTestOption = true;
+        //     options.appArguments.push_back(*it);
+        // }
+        // OPENMV-DIFF //
+        if (arg == LANGUAGE_OPTION && hasNext) {
             ++it;
             options.uiLanguage = nextArg;
             options.preAppArguments << arg << nextArg;
-        } else if (arg == USER_LIBRARY_PATH_OPTION && hasNext) {
-            ++it;
-            options.userLibraryPath = nextArg;
-            options.preAppArguments << arg << nextArg;
-        } else if (arg == TEMPORARY_CLEAN_SETTINGS1 || arg == TEMPORARY_CLEAN_SETTINGS2) {
-            options.wantsCleanSettings = true;
-            options.preAppArguments << arg;
         } else { // arguments that are still passed on to the application
-            if (arg == TEST_OPTION)
-                options.hasTestOption = true;
             options.appArguments.push_back(*it);
         }
+        // OPENMV-DIFF //
         ++it;
     }
     return options;

diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
@@ -779,7 +779,12 @@ void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation,
                 // OPENMV-DIFF //
                 // formatOption(str, pad.name, pad.parameter, pad.description, optionIndentation, descriptionIndentation);
                 // OPENMV-DIFF //
-                if (ps->name() != QStringLiteral("Core") || ((pad.name != QStringLiteral("-color")) && (pad.name != QStringLiteral("-theme"))))
+                if ((ps->name() != QStringLiteral("Core") || ((pad.name != QStringLiteral("-color")) &&
+                                                             (pad.name != QStringLiteral("-theme")) &&
+                                                             (pad.name != QStringLiteral("-lastsession")) &&
+                                                             (pad.name != QStringLiteral("<session>"))))
+                && (ps->name() != QStringLiteral("ProjectExplorer") || ((pad.name != QStringLiteral("-customwizard-verbose")) &&
+                                                                        (pad.name != QStringLiteral("-ensure-kit-for-binary")))))
                     formatOption(str, pad.name, pad.parameter, pad.description, optionIndentation, descriptionIndentation);
                 // OPENMV-DIFF //
         }

diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -850,7 +850,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     qRegisterMetaType<ProjectExplorer::RunControl *>();
     qRegisterMetaType<ProjectExplorer::DeployableFile>("ProjectExplorer::DeployableFile");
 
-    handleCommandLineArguments(arguments);
+    // OPENMV-DIFF //
+    // handleCommandLineArguments(arguments);
+    // OPENMV-DIFF //
+    Q_UNUSED(arguments)
+    // OPENMV-DIFF //
 
     dd->m_toolChainManager = new ToolchainManager;