From 7f3b790328035b94b8fcc05acd74ea815df008ef Mon Sep 17 00:00:00 2001
From: Craig Watson <craig@watsons.ch>
Date: Thu, 14 Apr 2016 14:36:32 +0200
Subject: [PATCH] Removed some old, unused settings

---
 resources/etc/OpenBoard.config |  5 -----
 src/core/UBSettings.cpp        | 10 ----------
 src/core/UBSettings.h          | 10 ----------
 3 files changed, 25 deletions(-)

diff --git a/resources/etc/OpenBoard.config b/resources/etc/OpenBoard.config
index a2eefe93..cdef9239 100644
--- a/resources/etc/OpenBoard.config
+++ b/resources/etc/OpenBoard.config
@@ -113,11 +113,6 @@ WindowsMediaBitsPerSecond=1700000
 [SVG]
 ViewBoxMargin=50
 
-[UniboardWeb]
-Author=
-EMail=
-GoogleMapAPIKey=ABQIAAAAsWU4bIbaeCLinpZ30N_erRQEk562OPinwQkG9J-ZXUNAqYhJ5RT_z2EmpfVXiUg8c41BcsD_XM6P5g
-
 [Voting]
 ReplyPlusAddressingMode=static
 ReplyPlusConnectionURL=USB
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index 9fca5af2..5a74a416 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -385,10 +385,6 @@ void UBSettings::init()
     youTubeUserEMail = new UBSetting(this, "YouTube", "UserEMail", "");
     youTubeCredentialsPersistence = new UBSetting(this,"YouTube", "CredentialsPersistence",false);
 
-    uniboardWebEMail = new UBSetting(this, "UniboardWeb", "EMail", "");
-    uniboardWebAuthor = new UBSetting(this, "UniboardWeb", "Author", "");
-    uniboardWebGoogleMapApiKey = new UBSetting(this, "UniboardWeb", "GoogleMapAPIKey", "ABQIAAAAsWU4bIbaeCLinpZ30N_erRQEk562OPinwQkG9J-ZXUNAqYhJ5RT_z2EmpfVXiUg8c41BcsD_XM6P5g");
-
     communityUser = new UBSetting(this, "Community", "Username", "");
     communityPsw = new UBSetting(this, "Community", "Password", "");
     communityCredentialsPersistence = new UBSetting(this,"Community", "CredentialsPersistence",false);
@@ -400,12 +396,6 @@ void UBSettings::init()
     // removed in version 4.4.b.2
     mUserSettings->remove("Podcast/RecordMicrophone");
 
-    replyWWSerialPort = new UBSetting(this, "Voting", "ReplyWWSerialPort", 3);
-
-    replyPlusConnectionURL = new UBSetting(this, "Voting", "ReplyPlusConnectionURL", "USB");
-    replyPlusAddressingMode = new UBSetting(this, "Voting", "ReplyPlusAddressingMode", "static");
-    replyPlusMaxKeypads = new UBSetting(this, "Voting", "ReplyPlusMaxKeypads", "100");
-
     documentThumbnailWidth = new UBSetting(this, "Document", "ThumbnailWidth", UBSettings::defaultThumbnailWidth);
 
     imageThumbnailWidth = new UBSetting(this, "Library", "ImageThumbnailWidth", UBSettings::defaultImageWidth);
diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h
index 900c1d8c..bbbcfdb4 100644
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
@@ -337,22 +337,12 @@ class UBSettings : public QObject
         UBSetting* youTubeUserEMail;
         UBSetting* youTubeCredentialsPersistence;
 
-        UBSetting* uniboardWebEMail;
-        UBSetting* uniboardWebAuthor;
-        UBSetting* uniboardWebGoogleMapApiKey;
-
         UBSetting* podcastPublishToIntranet;
         UBSetting* intranetPodcastPublishingUrl;
         UBSetting* intranetPodcastAuthor;
 
         UBSetting* favoritesNativeToolUris;
 
-        UBSetting* replyWWSerialPort;
-        UBSetting* replyPlusConnectionURL;
-        UBSetting* replyPlusAddressingMode;
-
-        UBSetting* replyPlusMaxKeypads;
-
         UBSetting* documentThumbnailWidth;
         UBSetting* imageThumbnailWidth;
         UBSetting* videoThumbnailWidth;