diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2016-05-01 21:27:35 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-05-02 07:07:21 -0700 |
| commit | 8f35b7324e7ee053711363791a660bd279b81cc7 (patch) | |
| tree | 32d0812bf56909716f0ad10d7fd48360c84523ed | |
| parent | 744e59688342ecdbbbadf1f2275b31d074647d7b (diff) | |
| download | subsurface-8f35b7324e7ee053711363791a660bd279b81cc7.tar.gz | |
Move the qtTranslator and ssrfTranslator pointers to qt-init.cpp
No point in having it defined in each main program's .cpp. Especially
since the unit tests don't define them.
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/qt-init.cpp | 1 | ||||
| -rw-r--r-- | export-html.cpp | 3 | ||||
| -rw-r--r-- | subsurface-desktop-main.cpp | 2 | ||||
| -rw-r--r-- | subsurface-mobile-main.cpp | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/core/qt-init.cpp b/core/qt-init.cpp index 5dc25f9fc..3dffc6f31 100644 --- a/core/qt-init.cpp +++ b/core/qt-init.cpp @@ -5,6 +5,7 @@ #include "helpers.h" char *settings_suffix = NULL; +QTranslator *qtTranslator, *ssrfTranslator; void init_qt_late() { diff --git a/export-html.cpp b/export-html.cpp index 0c270c6fc..e030cb6c5 100644 --- a/export-html.cpp +++ b/export-html.cpp @@ -5,6 +5,7 @@ #include <QDebug> #include "qt-gui.h" +#include "qthelper.h" #include "dive.h" #include "save-html.h" #include "stdio.h" @@ -14,8 +15,6 @@ #include "windowtitleupdate.h" #include "statistics.h" -QTranslator *qtTranslator, *ssrfTranslator; - int main(int argc, char **argv) { QApplication *application = new QApplication(argc, argv); diff --git a/subsurface-desktop-main.cpp b/subsurface-desktop-main.cpp index 0bdad42a2..165d1f7d9 100644 --- a/subsurface-desktop-main.cpp +++ b/subsurface-desktop-main.cpp @@ -21,8 +21,6 @@ #include <QLoggingCategory> #include <git2.h> -QTranslator *qtTranslator, *ssrfTranslator; - static bool filesOnCommandLine = false; int main(int argc, char **argv) diff --git a/subsurface-mobile-main.cpp b/subsurface-mobile-main.cpp index b7259c44a..f32f11edc 100644 --- a/subsurface-mobile-main.cpp +++ b/subsurface-mobile-main.cpp @@ -17,8 +17,6 @@ #include <QLoggingCategory> #include <git2.h> -QTranslator *qtTranslator, *ssrfTranslator; - int main(int argc, char **argv) { int i; |