CLIProcessor.cpp   CLIProcessor.cpp 
skipping to change at line 57 skipping to change at line 57
std::cout << "Usage:\n" std::cout << "Usage:\n"
<< " " << " "
<< qPrintable(binName) << " [options]\n\n" << qPrintable(binName) << " [options]\n\n"
<< "Options:\n" << "Options:\n"
<< "--version (or -v) : Print program name a nd version and exit.\n" << "--version (or -v) : Print program name a nd version and exit.\n"
<< "--help (or -h) : This cruft.\n" << "--help (or -h) : This cruft.\n"
<< "--config-file (or -c) : Use an alternative n ame for the config file\n" << "--config-file (or -c) : Use an alternative n ame for the config file\n"
<< "--user-dir (or -u) : Use an alternative u ser data directory\n" << "--user-dir (or -u) : Use an alternative u ser data directory\n"
//<< "--safe-mode (or -s) : Disable GL shaders and use older GL engine\n" //<< "--safe-mode (or -s) : Disable GL shaders and use older GL engine\n"
//<< " Try this is you ha << "--dump-opengl-details (or -d) : dump informati
ve graphics problems\n" on about OpenGL support to logfile\n"
<< " Try this is you have
graphics problems\n"
<< "--full-screen (or -f) : With argument \"yes\ " or \"no\" over-rides\n" << "--full-screen (or -f) : With argument \"yes\ " or \"no\" over-rides\n"
<< " the full screen sett ing in the config file\n" << " the full screen sett ing in the config file\n"
<< "--screenshot-dir : Specify directory to save screenshots\n" << "--screenshot-dir : Specify directory to save screenshots\n"
<< "--startup-script : Specify name of star tup script\n" << "--startup-script : Specify name of star tup script\n"
<< "--home-planet : Specify observer pla net (English name)\n" << "--home-planet : Specify observer pla net (English name)\n"
<< "--altitude : Specify observer alt itude in meters\n" << "--altitude : Specify observer alt itude in meters\n"
<< "--longitude : Specify longitude, e .g. +53d58\\'16.65\\\"\n" << "--longitude : Specify longitude, e .g. +53d58\\'16.65\\\"\n"
<< "--latitude : Specify latitude, e. g. -1d4\\'27.48\\\"\n" << "--latitude : Specify latitude, e. g. -1d4\\'27.48\\\"\n"
<< "--list-landscapes : Print a list of valu e landscape IDs\n" << "--list-landscapes : Print a list of valu e landscape IDs\n"
<< "--landscape : Start using landscap e whose ID (dir name)\n" << "--landscape : Start using landscap e whose ID (dir name)\n"
skipping to change at line 123 skipping to change at line 124
void CLIProcessor::parseCLIArgsPostConfig(const QStringList& argList, QSett ings* confSettings) void CLIProcessor::parseCLIArgsPostConfig(const QStringList& argList, QSett ings* confSettings)
{ {
// Over-ride config file options with command line options // Over-ride config file options with command line options
// We should catch exceptions from argsGetOptionWithArg... // We should catch exceptions from argsGetOptionWithArg...
int fullScreen, altitude; int fullScreen, altitude;
float fov; float fov;
QString landscapeId, homePlanet, longitude, latitude, skyDate, skyTi me; QString landscapeId, homePlanet, longitude, latitude, skyDate, skyTi me;
QString projectionType, screenshotDir, multiresImage, startupScript; QString projectionType, screenshotDir, multiresImage, startupScript;
try try
{ {
bool dumpOpenGLDetails = argsGetOption(argList, "-d", "--dum
p-opengl-details");
qApp->setProperty("dump_OpenGL_details", dumpOpenGLDetails);
fullScreen = argsGetYesNoOption(argList, "-f", "--full-scree n", -1); fullScreen = argsGetYesNoOption(argList, "-f", "--full-scree n", -1);
landscapeId = argsGetOptionWithArg(argList, "", "--landscape ", "").toString(); landscapeId = argsGetOptionWithArg(argList, "", "--landscape ", "").toString();
homePlanet = argsGetOptionWithArg(argList, "", "--home-plane t", "").toString(); homePlanet = argsGetOptionWithArg(argList, "", "--home-plane t", "").toString();
altitude = argsGetOptionWithArg(argList, "", "--altitude", - 1).toInt(); altitude = argsGetOptionWithArg(argList, "", "--altitude", - 1).toInt();
longitude = argsGetOptionWithArg(argList, "", "--longitude", "").toString(); longitude = argsGetOptionWithArg(argList, "", "--longitude", "").toString();
latitude = argsGetOptionWithArg(argList, "", "--latitude", " ").toString(); latitude = argsGetOptionWithArg(argList, "", "--latitude", " ").toString();
skyDate = argsGetOptionWithArg(argList, "", "--sky-date", "" ).toString(); skyDate = argsGetOptionWithArg(argList, "", "--sky-date", "" ).toString();
skyTime = argsGetOptionWithArg(argList, "", "--sky-time", "" ).toString(); skyTime = argsGetOptionWithArg(argList, "", "--sky-time", "" ).toString();
fov = argsGetOptionWithArg(argList, "", "--fov", -1.f).toFlo at(); fov = argsGetOptionWithArg(argList, "", "--fov", -1.f).toFlo at();
projectionType = argsGetOptionWithArg(argList, "", "--projec tion-type", "").toString(); projectionType = argsGetOptionWithArg(argList, "", "--projec tion-type", "").toString();
 End of changes. 2 change blocks. 
2 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/