From 6d3a4ec9b28ac794ae8e9a6231272e2ebe573af5 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 21 May 2013 20:31:56 -0700 Subject: Initialize QSettings earlier & change the Organization to "Subsurface" The first change allows the default_filename to be found again. The second change switches us to .config/Subsurface/Subsurface.conf which I find much more useful. QtCreator also fixed a few indentation issues for me. How helpful. Signed-off-by: Dirk Hohndel --- main.c | 2 +- qt-gui.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index 510dbfa68..a0174dcd8 100644 --- a/main.c +++ b/main.c @@ -217,7 +217,7 @@ int main(int argc, char **argv) subsurface_command_line_init(&argc, &argv); parse_xml_init(); - init_ui(&argc, &argv); /* the gtk stuff is needed for parsing below */ + init_ui(&argc, &argv); for (i = 1; i < argc; i++) { const char *a = argv[i]; diff --git a/qt-gui.cpp b/qt-gui.cpp index aa4765fe5..fb092a742 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -39,7 +39,7 @@ public: ~Translator() {} virtual QString translate(const char *context, const char *sourceText, - const char *disambiguation = NULL) const; + const char *disambiguation = NULL) const; }; Translator::Translator(QObject *parent): @@ -48,7 +48,7 @@ Translator::Translator(QObject *parent): } QString Translator::translate(const char *context, const char *sourceText, - const char *disambiguation) const + const char *disambiguation) const { return gettext(sourceText); } @@ -61,9 +61,6 @@ const char *existing_filename; void init_qt_ui(int *argcp, char ***argvp) { application->installTranslator(new Translator(application)); - QCoreApplication::setOrganizationName("hohndel"); - QCoreApplication::setOrganizationDomain("hohndel.org"); - QCoreApplication::setApplicationName("Subsurface"); MainWindow *window = new MainWindow(); window->show(); } @@ -80,6 +77,9 @@ void init_ui(int *argcp, char ***argvp) // [http://www.iana.org/assignments/character-sets/character-sets.xml] QTextCodec::setCodecForCStrings(QTextCodec::codecForMib(106)); #endif + QCoreApplication::setOrganizationName("Subsurface"); + QCoreApplication::setOrganizationDomain("subsurface.hohndel.org"); + QCoreApplication::setApplicationName("Subsurface"); QSettings settings; settings.beginGroup("GeneralSettings"); -- cgit v1.2.3-70-g09d2