desktop: remove user survey

We have never made good use of the results. Let's just remove it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

4 files changed, 1 insertions, 19 deletions

diff --git a/core/dive.h b/core/dive.h
index f15204a4a..2c5a28d72 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -243,7 +243,7 @@ extern bool autogroup;
 struct dive *unregister_dive(int idx);
 extern void delete_single_dive(int idx);
 
-extern int run_survey, quit, force_root, ignore_bt;
+extern int quit, force_root, ignore_bt;
 #ifdef SUBSURFACE_MOBILE_DESKTOP
 extern char *testqml;
 #endif
diff --git a/core/settings/qPrefDisplay.cpp b/core/settings/qPrefDisplay.cpp
index cea33a90a..c733b0c6b 100644
--- a/core/settings/qPrefDisplay.cpp
+++ b/core/settings/qPrefDisplay.cpp
@@ -17,9 +17,6 @@ static const QString st_lastDir_default;
 QString qPrefDisplay::st_theme;
 static const QString st_theme_default = QStringLiteral("Blue");
 
-QString qPrefDisplay::st_userSurvey;
-static const QString st_userSurvey_default;
-
 QByteArray qPrefDisplay::st_mainSplitter;
 static const QByteArray st_mainSplitter_default;
 
@@ -61,7 +58,6 @@ void qPrefDisplay::loadSync(bool doSync)
 	if (!doSync) {
 		load_tooltip_position();
 		load_theme();
-		load_userSurvey();
 		load_mainSplitter();
 		load_topSplitter();
 		load_bottomSplitter();
@@ -186,8 +182,6 @@ 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_QBYTEARRAY(Display, "MainWindow/mainSplitter", mainSplitter);
 
 HANDLE_PROP_QBYTEARRAY(Display, "MainWindow/topSplitter", topSplitter);
diff --git a/core/settings/qPrefDisplay.h b/core/settings/qPrefDisplay.h
index 42d5c8e84..61fa5dbaf 100644
--- a/core/settings/qPrefDisplay.h
+++ b/core/settings/qPrefDisplay.h
@@ -17,7 +17,6 @@ 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(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)
@@ -45,7 +44,6 @@ 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 QByteArray mainSplitter() { return st_mainSplitter; }
 	static QByteArray topSplitter() { return st_topSplitter; }
 	static QByteArray bottomSplitter() { return st_bottomSplitter; }
@@ -65,7 +63,6 @@ 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_mainSplitter(const QByteArray &value);
 	static void set_topSplitter(const QByteArray &value);
 	static void set_bottomSplitter(const QByteArray &value);
@@ -85,7 +82,6 @@ signals:
 	void show_developerChanged(bool value);
 	void themeChanged(const QString &value);
 	void tooltip_positionChanged(const QPointF &value);
-	void userSurveyChanged(const QString &value);
 	void mainSplitterChanged(const QByteArray &value);
 	void topSplitterChanged(const QByteArray &value);
 	void bottomSplitterChanged(const QByteArray &value);
@@ -110,7 +106,6 @@ private:
 	static void load_lastDir();
 	static void load_theme();
 	static void load_tooltip_position();
-	static void load_userSurvey();
 	static void load_mainSplitter();
 	static void load_topSplitter();
 	static void load_bottomSplitter();
@@ -127,7 +122,6 @@ private:
 	static QString st_lastDir;
 	static QString st_theme;
 	static QPointF st_tooltip_position;
-	static QString st_userSurvey;
 	static QByteArray st_mainSplitter;
 	static QByteArray st_topSplitter;
 	static QByteArray st_bottomSplitter;
diff --git a/core/subsurfacestartup.c b/core/subsurfacestartup.c
index bf61f9878..c5fb7b611 100644
--- a/core/subsurfacestartup.c
+++ b/core/subsurfacestartup.c
@@ -103,7 +103,6 @@ struct preferences default_prefs = {
 	.extract_video_thumbnails_position = 20,		// The first fifth seems like a reasonable place
 };
 
-int run_survey;
 int ignore_bt;
 #ifdef SUBSURFACE_MOBILE_DESKTOP
 char *testqml = NULL;
@@ -184,7 +183,6 @@ static void print_help()
 	printf("\n --import logfile ...  Logs before this option is treated as base, everything after is imported");
 	printf("\n --verbose|-v          Verbose debug (repeat to increase verbosity)");
 	printf("\n --version             Prints current version");
-	printf("\n --survey              Offer to submit a user survey");
 	printf("\n --user=<test>         Choose configuration space for user <test>");
 #ifdef SUBSURFACE_MOBILE_DESKTOP
 	printf("\n --testqml=<dir>       Use QML files from <dir> instead of QML resources");
@@ -243,10 +241,6 @@ void parse_argument(const char *arg)
 				print_version();
 				exit(0);
 			}
-			if (strcmp(arg, "--survey") == 0) {
-				run_survey = true;
-				return;
-			}
 			if (strcmp(arg, "--allow_run_as_root") == 0) {
 				++force_root;
 				return;