From 76efc414f1e2655172a1f8318ff0aa0cefdef67e Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Tue, 21 Jun 2022 14:56:14 +0200 Subject: [PATCH 1/2] Fix replace-avatar-url option Fixes [WARNING] [default] QCommandLineParser: option not defined: "replaceAvatarURL" --- interface/src/Application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6a9f5936c8..c3222b9761 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1453,8 +1453,8 @@ Application::Application( // If someone specifies both --avatarURL and --replaceAvatarURL, // the replaceAvatarURL wins. So only set the _overrideUrl if this // does have a non-empty string. - if (parser.isSet("replaceAvatarURL")) { - QString replaceURL = parser.value("replaceAvatarURL"); + if (parser.isSet("replace-avatar-url")) { + QString replaceURL = parser.value("replace-avatar-url"); _avatarOverrideUrl = QUrl::fromUserInput(replaceURL); _saveAvatarOverrideUrl = true; } From 661b7c3a7d1171017b38c0872e6fbf07fc6b002c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sun, 26 Jun 2022 14:32:31 +0200 Subject: [PATCH 2/2] fix replace avatar url option according to coding standards --- interface/src/Application.cpp | 4 ++-- interface/src/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c3222b9761..6a9f5936c8 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1453,8 +1453,8 @@ Application::Application( // If someone specifies both --avatarURL and --replaceAvatarURL, // the replaceAvatarURL wins. So only set the _overrideUrl if this // does have a non-empty string. - if (parser.isSet("replace-avatar-url")) { - QString replaceURL = parser.value("replace-avatar-url"); + if (parser.isSet("replaceAvatarURL")) { + QString replaceURL = parser.value("replaceAvatarURL"); _avatarOverrideUrl = QUrl::fromUserInput(replaceURL); _saveAvatarOverrideUrl = true; } diff --git a/interface/src/main.cpp b/interface/src/main.cpp index e18312f8b7..44cef0f242 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -161,7 +161,7 @@ int main(int argc, const char* argv[]) { "url" ); QCommandLineOption replaceAvatarURLOption( - "replace-avatar-url", + "replaceAvatarURL", "Replaces the avatar U.R.L. When used with --avatarURL, this takes precedence.", "url" );