refactor: ArgParser::parsePlatformArgs remove unused argument isServer
This commit is contained in:
parent
c2eae36650
commit
e436b41ab0
2 changed files with 4 additions and 8 deletions
|
|
@ -30,7 +30,7 @@ bool ArgParser::parseServerArgs(deskflow::ServerArgs &args, int argc, const char
|
||||||
updateCommonArgs(argv);
|
updateCommonArgs(argv);
|
||||||
int i = 1;
|
int i = 1;
|
||||||
while (i < argc) {
|
while (i < argc) {
|
||||||
if (parsePlatformArgs(args, argc, argv, i, true) || parseGenericArgs(argc, argv, i) ||
|
if (parsePlatformArgs(args, argc, argv, i) || parseGenericArgs(argc, argv, i) ||
|
||||||
parseDeprecatedArgs(argc, argv, i) || isArg(i, argc, argv, nullptr, "server")) {
|
parseDeprecatedArgs(argc, argv, i) || isArg(i, argc, argv, nullptr, "server")) {
|
||||||
++i;
|
++i;
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -60,7 +60,7 @@ bool ArgParser::parseClientArgs(deskflow::ClientArgs &args, int argc, const char
|
||||||
|
|
||||||
int i{1};
|
int i{1};
|
||||||
while (i < argc) {
|
while (i < argc) {
|
||||||
if (parsePlatformArgs(args, argc, argv, i, false) || parseGenericArgs(argc, argv, i) ||
|
if (parsePlatformArgs(args, argc, argv, i) || parseGenericArgs(argc, argv, i) ||
|
||||||
parseDeprecatedArgs(argc, argv, i) || isArg(i, argc, argv, nullptr, "client")) {
|
parseDeprecatedArgs(argc, argv, i) || isArg(i, argc, argv, nullptr, "client")) {
|
||||||
++i;
|
++i;
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -98,9 +98,7 @@ bool ArgParser::parseClientArgs(deskflow::ClientArgs &args, int argc, const char
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ArgParser::parsePlatformArgs(
|
bool ArgParser::parsePlatformArgs(deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i) const
|
||||||
deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i, bool isServer
|
|
||||||
) const
|
|
||||||
{
|
{
|
||||||
#if !WINAPI_XWINDOWS
|
#if !WINAPI_XWINDOWS
|
||||||
// no options for carbon or windows
|
// no options for carbon or windows
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,7 @@ public:
|
||||||
|
|
||||||
bool parseServerArgs(deskflow::ServerArgs &args, int argc, const char *const *argv) const;
|
bool parseServerArgs(deskflow::ServerArgs &args, int argc, const char *const *argv) const;
|
||||||
bool parseClientArgs(deskflow::ClientArgs &args, int argc, const char *const *argv) const;
|
bool parseClientArgs(deskflow::ClientArgs &args, int argc, const char *const *argv) const;
|
||||||
bool parsePlatformArgs(
|
bool parsePlatformArgs(deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i) const;
|
||||||
deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i, bool isServer
|
|
||||||
) const;
|
|
||||||
bool parseGenericArgs(int argc, const char *const *argv, int &i) const;
|
bool parseGenericArgs(int argc, const char *const *argv, int &i) const;
|
||||||
bool parseDeprecatedArgs(int argc, const char *const *argv, int &i) const;
|
bool parseDeprecatedArgs(int argc, const char *const *argv, int &i) const;
|
||||||
void setArgsBase(deskflow::ArgsBase &argsBase) const
|
void setArgsBase(deskflow::ArgsBase &argsBase) const
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue