diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2014-03-19 18:23:43 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-03-19 09:37:49 -0700 |
| commit | ee2e43f11aedf615df0f21a8fc32e8fe6bc9782c (patch) | |
| tree | 1144ad187f1198ea844a29484fcacb506d894122 /qt-gui.cpp | |
| parent | 71f2fd91b5a75a3c98020145e419ae7a1cb48cfe (diff) | |
| download | subsurface-ee2e43f11aedf615df0f21a8fc32e8fe6bc9782c.tar.gz | |
Main: separate the QApplication and UI creation
When some arguments like --help and --version are passed to the
executable, we don't need to create the UI at all.
This patch separates the QApplication creation which is at first
only needed to parse the arguments and then if exit() is not
called from subsurfacestartup.c, we can call some of the
"init" methods such as setup_system_prefs(), fill_profile_color()
etc.
At this point init_ui() can be called which no longer needs
to accept the command line argument list.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-gui.cpp')
| -rw-r--r-- | qt-gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qt-gui.cpp b/qt-gui.cpp index 2b16c2d77..a3b8b44b6 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -78,12 +78,14 @@ static QString decodeUtf8(const QByteArray &fname) } #endif -void init_ui(int *argcp, char ***argvp) +void init_qt(int *argcp, char ***argvp) { - QVariant v; - application = new QApplication(*argcp, *argvp); +} +void init_ui(void) +{ + QVariant v; // tell Qt to use system proxies // note: on Linux, "system" == "environment variables" QNetworkProxyFactory::setUseSystemConfiguration(true); @@ -155,8 +157,6 @@ void init_ui(int *argcp, char ***argvp) window->setTitle(MWTF_FILENAME); else window->setTitle(MWTF_DEFAULT); - - return; } void run_ui(void) |