From 09b288d63c629cae55ae6df81d6e4df2262fd522 Mon Sep 17 00:00:00 2001 From: Penguin-Guru Date: Mon, 25 Oct 2021 17:33:22 -0700 Subject: [PATCH] Made lines shorter. --- interface/src/main.cpp | 150 +++++++++++++++++++++++++++++++++-------- 1 file changed, 122 insertions(+), 28 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index bf9f116ce0..5bcb9c8b8e 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -76,36 +76,130 @@ int main(int argc, const char* argv[]) { QCommandLineOption helpOption = parser.addHelpOption(); QCommandLineOption versionOption = parser.addVersionOption(); - QCommandLineOption urlOption("url", "Start at specified URL location.", "value"); - QCommandLineOption protocolVersionOption("protocolVersion", "Displays the protocol version."); - QCommandLineOption noUpdaterOption("no-updater", "Do not show auto-updater."); - QCommandLineOption checkMinSpecOption("checkMinSpec", "Check if machine meets minimum specifications."); - QCommandLineOption runServerOption("runServer", "Whether to run the server."); - QCommandLineOption listenPortOption("listenPort", "Port to listen on."); - QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content .", "serverContentPath"); // This data type will not be familiar to users. - QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache .", "dir"); - //QCommandLineOption scriptsOption("scripts", "Set path for defaultScripts.", "dir"); // Use this once SCRIPTS_SWITCH is removed. - QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run."); - QCommandLineOption displaysOption("display", "Preferred display.", "displays"); - QCommandLineOption disableDisplaysOption("disable-displays", "Displays to disable."); - QCommandLineOption disableInputsOption("disable-inputs", "Inputs to disable."); - QCommandLineOption suppressSettingsResetOption("suppress-settings-reset", "Suppress the prompt to reset interface settings."); - QCommandLineOption oculusStoreOption("oculus-store", "Let the Oculus plugin know if interface was run from the Oculus Store."); - QCommandLineOption standaloneOption("standalone", "Emulate a standalone device."); - QCommandLineOption disableWatchdogOption("disableWatchdog", "Disable the watchdog thread. The interface will crash on deadlocks."); - QCommandLineOption systemCursorOption("system-cursor", "Needs clarification!"); - QCommandLineOption concurrentDownloadsOption("concurrent-downloads", "Maximum concurrent resource downloads. Default is 16, except for Android where it is 4."); - QCommandLineOption avatarURLOption("avatarURL", "Override the avatar U.R.L."); - QCommandLineOption replaceAvatarURLOption("replace-avatar-url", "Replaces the avatar U.R.L. When used with --avatarURL, this takes precedence."); - QCommandLineOption setBookmarkOption("setBookmark", "Set bookmark as key=value pair. Including the '=' symbol in either string is unsupported.", "string"); - QCommandLineOption forceCrashReportingOption("forceCrashReporting", "Force crash reporting to initialize."); + QCommandLineOption urlOption( + "url", + "Start at specified URL location.", + "value" + ); + QCommandLineOption protocolVersionOption( + "protocolVersion", + "Displays the protocol version." + ); + QCommandLineOption noUpdaterOption( + "no-updater", + "Do not show auto-updater." + ); + QCommandLineOption checkMinSpecOption( + "checkMinSpec", + "Check if machine meets minimum specifications." + ); + QCommandLineOption runServerOption( + "runServer", + "Whether to run the server." + ); + QCommandLineOption listenPortOption( + "listenPort", + "Port to listen on." + ); + QCommandLineOption serverContentPathOption( + "serverContentPath", + "Where to find server content .", + "serverContentPath" + ); // This data type will not be familiar to users. + QCommandLineOption overrideAppLocalDataPathOption( + "cache", + "set test cache .", + "dir" + ); + //QCommandLineOption scriptsOption( + // "scripts", + // "Set path for defaultScripts.", + // "dir" + //); // Use this once SCRIPTS_SWITCH is removed. + QCommandLineOption allowMultipleInstancesOption( + "allowMultipleInstances", + "Allow multiple instances to run." + ); + QCommandLineOption displaysOption( + "display", + "Preferred display.", + "displays" + ); + QCommandLineOption disableDisplaysOption( + "disable-displays", + "Displays to disable." + ); + QCommandLineOption disableInputsOption( + "disable-inputs", + "Inputs to disable." + ); + QCommandLineOption suppressSettingsResetOption( + "suppress-settings-reset", + "Suppress the prompt to reset interface settings." + ); + QCommandLineOption oculusStoreOption( + "oculus-store", + "Let the Oculus plugin know if interface was run from the Oculus Store." + ); + QCommandLineOption standaloneOption( + "standalone", + "Emulate a standalone device." + ); + QCommandLineOption disableWatchdogOption( + "disableWatchdog", + "Disable the watchdog thread. The interface will crash on deadlocks." + ); + QCommandLineOption systemCursorOption( + "system-cursor", + "Needs clarification!" + ); + QCommandLineOption concurrentDownloadsOption( + "concurrent-downloads", + "Maximum concurrent resource downloads. Default is 16, except for Android where it is 4." + ); + QCommandLineOption avatarURLOption( + "avatarURL", + "Override the avatar U.R.L." + ); + QCommandLineOption replaceAvatarURLOption( + "replace-avatar-url", + "Replaces the avatar U.R.L. When used with --avatarURL, this takes precedence." + ); + QCommandLineOption setBookmarkOption( + "setBookmark", + "Set bookmark as key=value pair. Including the '=' symbol in either string is unsupported.", + "string" + ); + QCommandLineOption forceCrashReportingOption( + "forceCrashReporting", + "Force crash reporting to initialize." + ); // The documented "--disable-lod" does not seem to exist. // Below are undocumented. - QCommandLineOption noLauncherOption("no-launcher", "Do not execute the launcher."); - QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts ", "path"); - QCommandLineOption responseTokensOption("tokens", "set response tokens .", "json"); - QCommandLineOption displayNameOption("displayName", "set user display name .", "string"); - QCommandLineOption defaultScriptOverrideOption("defaultScriptsOverride", "override defaultsScripts.js.", "string"); + QCommandLineOption noLauncherOption( + "no-launcher", + "Do not execute the launcher." + ); + QCommandLineOption overrideScriptsPathOption( + SCRIPTS_SWITCH, + "set scripts ", + "path" + ); + QCommandLineOption responseTokensOption( + "tokens", + "set response tokens .", + "json" + ); + QCommandLineOption displayNameOption( + "displayName", + "set user display name .", + "string" + ); + QCommandLineOption defaultScriptOverrideOption( + "defaultScriptsOverride", + "override defaultsScripts.js.", + "string" + ); // "--qmljsdebugger", which appears in output from "--help-all". parser.addOption(urlOption);