Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
436b30c6
Commit
436b30c6
authored
Oct 01, 2015
by
Don Gagne
Browse files
Changed option loading mechanism
parent
60099c12
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/CmdLineOptParser.cc
View file @
436b30c6
...
...
@@ -51,7 +51,9 @@ void ParseCmdLineOptions(int& argc, ///< count of ar
if
(
arg
.
startsWith
(
QString
(
"%1:"
).
arg
(
optionStr
),
Qt
::
CaseInsensitive
))
{
found
=
true
;
prgOpts
[
iOption
].
optionArg
=
arg
.
right
(
arg
.
length
()
-
(
optionStr
.
length
()
+
1
));
if
(
prgOpts
[
iOption
].
optionArg
)
{
*
prgOpts
[
iOption
].
optionArg
=
arg
.
right
(
arg
.
length
()
-
(
optionStr
.
length
()
+
1
));
}
}
else
if
(
arg
.
compare
(
optionStr
,
Qt
::
CaseInsensitive
)
==
0
)
{
found
=
true
;
}
...
...
src/CmdLineOptParser.h
View file @
436b30c6
...
...
@@ -36,7 +36,7 @@
typedef
struct
{
const
char
*
optionStr
;
///< command line option, for example "--foo"
bool
*
optionFound
;
///< if option is found this variable will be set to true
QString
optionArg
;
///< Option has additional argument, form is option:arg
QString
*
optionArg
;
///< Option has additional argument, form is option:arg
}
CmdLineOpt_t
;
void
ParseCmdLineOptions
(
int
&
argc
,
...
...
src/main.cc
View file @
436b30c6
...
...
@@ -135,9 +135,10 @@ int main(int argc, char *argv[])
bool
quietWindowsAsserts
=
false
;
// Don't let asserts pop dialog boxes
QString
unitTestOptions
;
CmdLineOpt_t
rgCmdLineOptions
[]
=
{
{
"--unittest"
,
&
runUnitTests
,
QString
()
},
{
"--no-windows-assert-ui"
,
&
quietWindowsAsserts
,
QString
()
},
{
"--unittest"
,
&
runUnitTests
,
&
unitTestOptions
},
{
"--no-windows-assert-ui"
,
&
quietWindowsAsserts
,
NULL
},
// Add additional command line option flags here
};
...
...
@@ -181,7 +182,7 @@ int main(int argc, char *argv[])
}
// Run the test
int
failures
=
UnitTest
::
run
(
rgCmdLineOptions
[
0
].
optionArg
);
int
failures
=
UnitTest
::
run
(
unitTestOptions
);
if
(
failures
==
0
)
{
qDebug
()
<<
"ALL TESTS PASSED"
;
}
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment