diff options
| author | Stanisław Halik <sthalik@misaki.pl> | 2017-05-14 16:22:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-14 16:22:09 +0200 |
| commit | 5c23666b58bb1dd4aea15c0d62a2f716d5be7f52 (patch) | |
| tree | e6497e9b55c073be209ec673ef05e62bf57a2c8f /gui/main.cpp | |
| parent | 4701dd3b0c8323a11cf7d5ad09c579a9864a41bd (diff) | |
| parent | c392181211b245e74292424500265323c960c1aa (diff) | |
Merge branch 'unstable' into unstable
Diffstat (limited to 'gui/main.cpp')
| -rw-r--r-- | gui/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/main.cpp b/gui/main.cpp index 80040732..16e08b6e 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -129,13 +129,13 @@ main(int argc, char** argv) if (!QSettings(OPENTRACK_ORG).value("disable-translation", false).toBool()) { - (void) t.load(QLocale(), "", "", QCoreApplication::applicationDirPath() + "/" + OPENTRACK_I18N_PATH, ".qm"); + (void) t.load(QLocale(), "", "", QCoreApplication::applicationDirPath() + "/" OPENTRACK_I18N_PATH, ".qm"); (void) QCoreApplication::installTranslator(&t); } do { - mem<MainWindow> w = std::make_shared<MainWindow>(); + std::shared_ptr<MainWindow> w = std::make_shared<MainWindow>(); if (!w->isEnabled()) break; |