summaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/main.cpp b/main.cpp
index e5a53a3d8..2642ccc5c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -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;
}