diff options
| author | Alon Levy <alevy@redhat.com> | 2011-01-26 01:52:45 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-01-27 17:19:05 +0200 |
| commit | 9394b2c50e8b5d7b336c6603166709ed0637bb81 (patch) | |
| tree | 46bdda0759c07f90a27a4a9ecaee1e6dd4f58dff /client/application.h | |
| parent | a13824b22a7946bbf6f8f440b44d03c28c1748be (diff) | |
| download | spice-9394b2c50e8b5d7b336c6603166709ed0637bb81.tar.gz spice-9394b2c50e8b5d7b336c6603166709ed0637bb81.tar.xz spice-9394b2c50e8b5d7b336c6603166709ed0637bb81.zip | |
client: --help should not need platform initialization
separate initialization into before command line parsing and after,
call later only if command line parsing succeeds (in particular, it
"fails" if --help is given).
Diffstat (limited to 'client/application.h')
| -rw-r--r-- | client/application.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/application.h b/client/application.h index f9bbd53b..4133dfe6 100644 --- a/client/application.h +++ b/client/application.h @@ -290,7 +290,7 @@ private: bool set_disabled_display_effects(CmdLineParser& parser, char *val, const char* arg0, DisplaySetting& disp_setting); void on_cmd_line_invalid_arg(const char* arg0, const char* what, const char* val); - bool process_cmd_line(int argc, char** argv); + bool process_cmd_line(int argc, char** argv, bool& full_screen); void register_channels(); void abort(); void init_menu(); @@ -343,7 +343,10 @@ private: static void init_logger(); static void init_globals(); + static void init_platform_globals(); + static void cleanup_platform_globals(); static void cleanup_globals(); + void init_remainder(); friend class DisconnectedEvent; friend class ConnectionErrorEvent; |