aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2017-12-22 14:02:07 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-01-18 17:36:31 +0200
commit65caddb29492cf0321ac252f08da57933f507df1 (patch)
tree6306cbe05338769cb4e2bc0ef7f5d4a93ac6fa46
parent3d02edf61e222a9bc839fd9ad294ab1ab1ea8615 (diff)
downloadsubsurface-65caddb29492cf0321ac252f08da57933f507df1.tar.gz
code cleanup: translators are not global
Un-globalize unused global variables. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
-rw-r--r--core/qt-init.cpp2
-rw-r--r--core/qthelper.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/core/qt-init.cpp b/core/qt-init.cpp
index 99b101fdc..aae24bda4 100644
--- a/core/qt-init.cpp
+++ b/core/qt-init.cpp
@@ -7,7 +7,7 @@
#include "core/subsurface-qt/SettingsObjectWrapper.h"
char *settings_suffix = NULL;
-QTranslator *qtTranslator, *ssrfTranslator;
+static QTranslator *qtTranslator, *ssrfTranslator;
void init_qt_late()
{
diff --git a/core/qthelper.h b/core/qthelper.h
index d23695f7f..c5aef1dd1 100644
--- a/core/qthelper.h
+++ b/core/qthelper.h
@@ -10,9 +10,6 @@
#include <QTranslator>
#include <QDir>
-// global pointers for our translation
-extern QTranslator *qtTranslator, *ssrfTranslator;
-
QString weight_string(int weight_in_grams);
QString distance_string(int distanceInMeters);
bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0);