Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip argument parsing under Android

This commit is contained in:
Martchus 2018-08-31 19:54:05 +02:00
parent bf854cb131
commit ff6ddc6976
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
main.cpp
View File

@ -24,14 +24,27 @@ ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES
#include <iostream> #include <iostream>
// force (preferably Qt Quick) GUI under Android
#ifdef Q_OS_ANDROID
#if defined(PASSWORD_MANAGER_GUI_QTWIDGETS) || defined(PASSWORD_MANAGER_GUI_QTQUICK)
#define PASSWORD_MANAGER_FORCE_GUI
#else
#error "Must build at least one kind of GUI under Android."
#endif
#endif
using namespace std; using namespace std;
using namespace ApplicationUtilities; using namespace ApplicationUtilities;
using namespace Util; using namespace Util;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// setup argument parser
SET_APPLICATION_INFO; SET_APPLICATION_INFO;
QT_CONFIG_ARGUMENTS qtConfigArgs;
int returnCode = 0;
#ifndef PASSWORD_MANAGER_FORCE_GUI
// setup argument parser
ArgumentParser parser; ArgumentParser parser;
// file argument // file argument
Argument fileArg("file", 'f', "specifies the file to be opened (or created when using --modify)"); Argument fileArg("file", 'f', "specifies the file to be opened (or created when using --modify)");
@ -40,8 +53,6 @@ int main(int argc, char *argv[])
fileArg.setCombinable(true); fileArg.setCombinable(true);
fileArg.setRequired(false); fileArg.setRequired(false);
fileArg.setImplicit(true); fileArg.setImplicit(true);
// Qt configuration arguments
QT_CONFIG_ARGUMENTS qtConfigArgs;
qtConfigArgs.qtWidgetsGuiArg().addSubArgument(&fileArg); qtConfigArgs.qtWidgetsGuiArg().addSubArgument(&fileArg);
qtConfigArgs.qtQuickGuiArg().addSubArgument(&fileArg); qtConfigArgs.qtQuickGuiArg().addSubArgument(&fileArg);
// cli argument // cli argument
@ -51,12 +62,14 @@ int main(int argc, char *argv[])
// help argument // help argument
HelpArgument helpArg(parser); HelpArgument helpArg(parser);
parser.setMainArguments({ &qtConfigArgs.qtWidgetsGuiArg(), &qtConfigArgs.qtQuickGuiArg(), &cliArg, &helpArg }); parser.setMainArguments({ &qtConfigArgs.qtWidgetsGuiArg(), &qtConfigArgs.qtQuickGuiArg(), &cliArg, &helpArg });
// holds the application's return code
int res = 0;
// parse the specified arguments // parse the specified arguments
parser.parseArgsOrExit(argc, argv); parser.parseArgsOrExit(argc, argv);
// init open ssl #endif
// init OpenSSL
OpenSsl::init(); OpenSsl::init();
#ifndef PASSWORD_MANAGER_FORCE_GUI
// start either interactive CLI or GUI // start either interactive CLI or GUI
if (cliArg.isPresent()) { if (cliArg.isPresent()) {
Cli::InteractiveCli cli; Cli::InteractiveCli cli;
@ -72,31 +85,39 @@ int main(int argc, char *argv[])
#endif #endif
if (qtConfigArgs.qtWidgetsGuiArg().isPresent()) { if (qtConfigArgs.qtWidgetsGuiArg().isPresent()) {
#ifdef PASSWORD_MANAGER_GUI_QTWIDGETS #ifdef PASSWORD_MANAGER_GUI_QTWIDGETS
res = QtGui::runWidgetsGui(argc, argv, qtConfigArgs, file); returnCode = QtGui::runWidgetsGui(argc, argv, qtConfigArgs, file);
#else #else
CMD_UTILS_START_CONSOLE; CMD_UTILS_START_CONSOLE;
cerr << "The application has not been built with Qt widgets support." << endl; cerr << "The application has not been built with Qt widgets support." << endl;
#endif #endif
} else if (qtConfigArgs.qtQuickGuiArg().isPresent()) { } else if (qtConfigArgs.qtQuickGuiArg().isPresent()) {
#ifdef PASSWORD_MANAGER_GUI_QTQUICK #ifdef PASSWORD_MANAGER_GUI_QTQUICK
res = QtGui::runQuickGui(argc, argv, qtConfigArgs, file); returnCode = QtGui::runQuickGui(argc, argv, qtConfigArgs, file);
#else #else
CMD_UTILS_START_CONSOLE; CMD_UTILS_START_CONSOLE;
cerr << "The application has not been built with Qt quick support." << endl; cerr << "The application has not been built with Qt quick support." << endl;
#endif #endif
} else { } else {
#if defined(PASSWORD_MANAGER_GUI_QTQUICK) #if defined(PASSWORD_MANAGER_GUI_QTQUICK)
res = QtGui::runQuickGui(argc, argv, qtConfigArgs, file); returnCode = QtGui::runQuickGui(argc, argv, qtConfigArgs, file);
#elif defined(PASSWORD_MANAGER_GUI_QTWIDGETS) #elif defined(PASSWORD_MANAGER_GUI_QTWIDGETS)
res = QtGui::runWidgetsGui(argc, argv, qtConfigArgs, file); returnCode = QtGui::runWidgetsGui(argc, argv, qtConfigArgs, file);
#else #else
CMD_UTILS_START_CONSOLE; CMD_UTILS_START_CONSOLE;
cerr << "See --help for usage." << endl; cerr << "See --help for usage." << endl;
#endif #endif
} }
} }
#else
#ifdef PASSWORD_MANAGER_GUI_QTQUICK
returnCode = QtGui::runQuickGui(argc, argv, qtConfigArgs, QString());
#else
returnCode = QtGui::runWidgetsGui(argc, argv, qtConfigArgs, QString());
#endif
#endif
// clean open ssl // clean OpenSSL
OpenSsl::clean(); OpenSsl::clean();
return res;
return returnCode;
} }