diff options
| -rw-r--r-- | main.cpp | 19 | ||||
| -rw-r--r-- | qt-gui.cpp | 10 | ||||
| -rw-r--r-- | qt-gui.h | 4 |
3 files changed, 17 insertions, 16 deletions
@@ -19,13 +19,7 @@ int main(int argc, char **argv) int i; bool no_filenames = true; - setup_system_prefs(); - prefs = default_prefs; - fill_profile_color(); - init_ui(&argc, &argv); - parse_xml_init(); - taglist_init_global(); - + init_qt(&argc, &argv); QStringList files; QStringList importedFiles; QStringList arguments = QCoreApplication::arguments(); @@ -47,13 +41,20 @@ int main(int argc, char **argv) if (!defaultFile.isEmpty()) files.push_back(QString(prefs.default_filename)); } - parse_xml_exit(); + setup_system_prefs(); + prefs = default_prefs; + fill_profile_color(); + parse_xml_init(); + taglist_init_global(); + init_ui(); + MainWindow *m = MainWindow::instance(); - m->setLoadedWithFiles( !files.isEmpty() || !importedFiles.isEmpty()); + m->setLoadedWithFiles(!files.isEmpty() || !importedFiles.isEmpty()); m->loadFiles(files); m->importFiles(importedFiles); if (!quit) run_ui(); exit_ui(); + parse_xml_exit(); return 0; } 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) @@ -1,8 +1,8 @@ #ifndef QT_GUI_H #define QT_GUI_H -void init_ui(int *argcp, char ***argvp); -void init_qt_ui(int *argcp, char ***argvp, char *errormessage); +void init_qt(int *argcp, char ***argvp); +void init_ui(void); void run_ui(void); void exit_ui(void); |