summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-18 19:40:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-18 19:40:52 +0300
commitc5f42689b4950ae4759031f2094be3693779d2c6 (patch)
tree6cc683524ee52bdf4ee01a2731b803aa6b34cde2
parentb1624af2bac77d1676d9bca6c08402b7a1212211 (diff)
downloadmv-c5f42689b4950ae4759031f2094be3693779d2c6.tar.gz
mv-c5f42689b4950ae4759031f2094be3693779d2c6.tar.bz2
mv-c5f42689b4950ae4759031f2094be3693779d2c6.tar.xz
mv-c5f42689b4950ae4759031f2094be3693779d2c6.zip
Fix code style in commandline.
-rw-r--r--src/commandline.cpp100
1 files changed, 61 insertions, 39 deletions
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 389d38434..889438ec1 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -37,76 +37,95 @@
static void printHelp()
{
- std::cout
+ std::cout <<
// TRANSLATORS: command line help
- << _("manaplus [options] [manaplus-file]") << std::endl << std::endl
+ _("manaplus [options] [manaplus-file]") <<
+ std::endl << std::endl <<
// TRANSLATORS: command line help
- << _("[manaplus-file] : The manaplus file is an XML file (.manaplus)")
- << std::endl
+ _("[manaplus-file] : The manaplus file is an XML file (.manaplus)") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" used to set custom parameters") << std::endl
+ _(" used to set custom parameters") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" to the manaplus client.")
- << std::endl << std::endl
+ _(" to the manaplus client.") <<
+ std::endl << std::endl <<
// TRANSLATORS: command line help
- << _("Options:") << std::endl
+ _("Options:") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -l --log-file : Log file to use") << std::endl
+ _(" -l --log-file : Log file to use") << std::endl <<
// TRANSLATORS: command line help
- << _(" -a --chat-log-dir : Chat log dir to use") << std::endl
+ _(" -a --chat-log-dir : Chat log dir to use") << std::endl <<
// TRANSLATORS: command line help
- << _(" -v --version : Display the version") << std::endl
+ _(" -v --version : Display the version") << std::endl <<
// TRANSLATORS: command line help
- << _(" -h --help : Display this help") << std::endl
+ _(" -h --help : Display this help") << std::endl <<
// TRANSLATORS: command line help
- << _(" -C --config-dir : Configuration directory to use")
- << std::endl
+ _(" -C --config-dir : Configuration directory to use") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -U --username : Login with this username") << std::endl
+ _(" -U --username : Login with this username") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -P --password : Login with this password") << std::endl
+ _(" -P --password : Login with this password") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -c --character : Login with this character") << std::endl
+ _(" -c --character : Login with this character") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -s --server : Login server name or IP") << std::endl
+ _(" -s --server : Login server name or IP") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -y --server-type : Login server type") << std::endl
+ _(" -y --server-type : Login server type") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -p --port : Login server port") << std::endl
+ _(" -p --port : Login server port") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -H --update-host : Use this update host") << std::endl
+ _(" -H --update-host : Use this update host") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -D --default : Choose default character server and "
- "character") << std::endl
+ _(" -D --default : Choose default character server and "
+ "character") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -u --skip-update : Skip the update downloads") << std::endl
+ _(" -u --skip-update : Skip the update downloads") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -d --data : Directory to load game "
- "data from") << std::endl
+ _(" -d --data : Directory to load game data from") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -L --localdata-dir : Directory to use as local data"
- " directory") << std::endl
+ _(" -L --localdata-dir : Directory to use as local "
+ "data directory") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" --screenshot-dir : Directory to store screenshots")
- << std::endl
+ _(" --screenshot-dir : Directory to store screenshots") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" --safemode : Start game in safe mode") << std::endl
+ _(" --safemode : Start game in safe mode") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" --renderer : Set renderer type") << std::endl
+ _(" --renderer : Set renderer type") <<
+ std::endl <<
// TRANSLATORS: command line help
- << _(" -T --tests : Start testing drivers and "
- "auto configuring") << std::endl
+ _(" -T --tests : Start testing drivers and "
+ "auto configuring") <<
+ std::endl
#ifdef USE_OPENGL
+ <<
// TRANSLATORS: command line help
- << _(" -O --no-opengl : Disable OpenGL for this session")
- << std::endl
+ _(" -O --no-opengl : Disable OpenGL for this session") <<
+ std::endl
#endif
;
}
static void printVersion()
{
- std::cout << strprintf("ManaPlus client %s", FULL_VERSION) << std::endl;
+ std::cout <<
+ strprintf("ManaPlus client %s", FULL_VERSION) <<
+ std::endl;
}
void parseOptions(const int argc, char *const argv[])
@@ -144,8 +163,11 @@ void parseOptions(const int argc, char *const argv[])
while (optind < argc)
{
- const int result = getopt_long(argc, argv,
- optstring, long_options, nullptr);
+ const int result = getopt_long(argc,
+ argv,
+ optstring,
+ long_options,
+ nullptr);
if (result == -1)
break;