summaryrefslogtreecommitdiffstats
path: root/qt-gui.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-21 20:31:56 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-21 20:37:32 -0700
commit6d3a4ec9b28ac794ae8e9a6231272e2ebe573af5 (patch)
tree03b314ea76256fbcf3c5887209ffc150fbbca425 /qt-gui.cpp
parent238c80a70888f6f1850083205e2177d71254c0ae (diff)
downloadsubsurface-6d3a4ec9b28ac794ae8e9a6231272e2ebe573af5.tar.gz
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 <dirk@hohndel.org>
Diffstat (limited to 'qt-gui.cpp')
-rw-r--r--qt-gui.cpp10
1 files changed, 5 insertions, 5 deletions
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");