summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-09-09 18:38:23 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-09-11 17:25:00 -0700
commit7e243fe363daddfa8fa8dfd8f908311804962e03 (patch)
tree251610caef4523f5e364ee9c69a5d46a5e4a989b /core
parent7129ad92a4ee5899680815c8cd2648a9f71bb651 (diff)
downloadsubsurface-7e243fe363daddfa8fa8dfd8f908311804962e03.tar.gz
core/settings: correct UserSurvey -> userSurvey in qPrefDisplay
QML is quite special, the variables needs to start with lower case in C++ and are used starting with upper case in QML Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core')
-rw-r--r--core/settings/qPrefDisplay.cpp8
-rw-r--r--core/settings/qPrefDisplay.h12
2 files changed, 10 insertions, 10 deletions
diff --git a/core/settings/qPrefDisplay.cpp b/core/settings/qPrefDisplay.cpp
index bb793d711..fcca8cd20 100644
--- a/core/settings/qPrefDisplay.cpp
+++ b/core/settings/qPrefDisplay.cpp
@@ -17,8 +17,8 @@ static const QString st_lastDir_default = "";
QString qPrefDisplay::st_theme;
static const QString st_theme_default = "Blue";
-QString qPrefDisplay::st_UserSurvey;
-static const QString st_UserSurvey_default = "";
+QString qPrefDisplay::st_userSurvey;
+static const QString st_userSurvey_default = "";
QByteArray qPrefDisplay::st_mainSplitter;
static const QByteArray st_mainSplitter_default = "";
@@ -61,7 +61,7 @@ void qPrefDisplay::loadSync(bool doSync)
if (!doSync) {
load_tooltip_position();
load_theme();
- load_UserSurvey();
+ load_userSurvey();
load_mainSplitter();
load_topSplitter();
load_bottomSplitter();
@@ -156,7 +156,7 @@ HANDLE_PROP_QSTRING(Display, "Theme/currentTheme", theme);
HANDLE_PROP_QPOINTF(Display, "ProfileMap/tooltip_position", tooltip_position);
-HANDLE_PROP_QSTRING(Display, "UserSurvey/SurveyDone", UserSurvey);
+HANDLE_PROP_QSTRING(Display, "UserSurvey/SurveyDone", userSurvey);
HANDLE_PROP_QBYTEARRAY(Display, "MainWindow/mainSplitter", mainSplitter);
diff --git a/core/settings/qPrefDisplay.h b/core/settings/qPrefDisplay.h
index bd1abb8a1..f7293e67b 100644
--- a/core/settings/qPrefDisplay.h
+++ b/core/settings/qPrefDisplay.h
@@ -16,7 +16,7 @@ class qPrefDisplay : public QObject {
Q_PROPERTY(bool show_developer READ show_developer WRITE set_show_developer NOTIFY show_developerChanged);
Q_PROPERTY(QString theme READ theme WRITE set_theme NOTIFY themeChanged);
Q_PROPERTY(QPointF tooltip_position READ tooltip_position WRITE set_tooltip_position NOTIFY tooltip_positionChanged);
- Q_PROPERTY(QString UserSurvey READ UserSurvey WRITE set_UserSurvey NOTIFY UserSurveyChanged);
+ Q_PROPERTY(QString userSurvey READ userSurvey WRITE set_userSurvey NOTIFY userSurveyChanged);
Q_PROPERTY(QByteArray mainSplitter READ mainSplitter WRITE set_mainSplitter NOTIFY mainSplitterChanged);
Q_PROPERTY(QByteArray topSplitter READ topSplitter WRITE set_topSplitter NOTIFY topSplitterChanged);
Q_PROPERTY(QByteArray bottomSplitter READ bottomSplitter WRITE set_bottomSplitter NOTIFY bottomSplitterChanged);
@@ -43,7 +43,7 @@ public:
static bool show_developer() { return prefs.show_developer; }
static QString theme() { return st_theme; }
static QPointF tooltip_position() { return st_tooltip_position; }
- static QString UserSurvey() { return st_UserSurvey; }
+ static QString userSurvey() { return st_userSurvey; }
static QByteArray mainSplitter() { return st_mainSplitter; }
static QByteArray topSplitter() { return st_topSplitter; }
static QByteArray bottomSplitter() { return st_bottomSplitter; }
@@ -61,7 +61,7 @@ public slots:
static void set_show_developer(bool value);
static void set_theme(const QString &value);
static void set_tooltip_position(const QPointF &value);
- static void set_UserSurvey(const QString &value);
+ static void set_userSurvey(const QString &value);
static void set_mainSplitter(const QByteArray &value);
static void set_topSplitter(const QByteArray &value);
static void set_bottomSplitter(const QByteArray &value);
@@ -79,7 +79,7 @@ signals:
void show_developerChanged(bool value);
void themeChanged(const QString &value);
void tooltip_positionChanged(const QPointF &value);
- void UserSurveyChanged(const QString &value);
+ void userSurveyChanged(const QString &value);
void mainSplitterChanged(const QByteArray &value);
void topSplitterChanged(const QByteArray &value);
void bottomSplitterChanged(const QByteArray &value);
@@ -100,7 +100,7 @@ private:
static void load_lastDir();
static void load_theme();
static void load_tooltip_position();
- static void load_UserSurvey();
+ static void load_userSurvey();
static void load_mainSplitter();
static void load_topSplitter();
static void load_bottomSplitter();
@@ -116,7 +116,7 @@ private:
static QString st_lastDir;
static QString st_theme;
static QPointF st_tooltip_position;
- static QString st_UserSurvey;
+ static QString st_userSurvey;
static QByteArray st_mainSplitter;
static QByteArray st_topSplitter;
static QByteArray st_bottomSplitter;