From 616de4966f7d4229c839baa0536a39f8600bd756 Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Mon, 24 Apr 2017 20:19:50 +0100
Subject: [PATCH] Deprecate Twitter support

.. move the twitter dialog into the deprecated folder
.. remove all remaining references to twitter
---
 {src/Cloud => deprecated}/TwitterDialog.cpp |  0
 {src/Cloud => deprecated}/TwitterDialog.h   |  0
 src/Cloud/OAuthDialog.h                     |  1 -
 src/Core/Settings.cpp                       |  2 --
 src/Core/Settings.h                         | 10 +++-------
 src/Gui/MainWindow.cpp                      |  3 ---
 src/src.pro                                 |  7 -------
 7 files changed, 3 insertions(+), 20 deletions(-)
 rename {src/Cloud => deprecated}/TwitterDialog.cpp (100%)
 rename {src/Cloud => deprecated}/TwitterDialog.h (100%)

diff --git a/src/Cloud/TwitterDialog.cpp b/deprecated/TwitterDialog.cpp
similarity index 100%
rename from src/Cloud/TwitterDialog.cpp
rename to deprecated/TwitterDialog.cpp
diff --git a/src/Cloud/TwitterDialog.h b/deprecated/TwitterDialog.h
similarity index 100%
rename from src/Cloud/TwitterDialog.h
rename to deprecated/TwitterDialog.h
diff --git a/src/Cloud/OAuthDialog.h b/src/Cloud/OAuthDialog.h
index 95fbd4355..611cfa26a 100644
--- a/src/Cloud/OAuthDialog.h
+++ b/src/Cloud/OAuthDialog.h
@@ -84,7 +84,6 @@ private slots:
     void onSslErrors(QNetworkReply *reply, const QList<QSslError>&error);
 
 #ifdef GC_HAVE_KQOAUTH
-    // Twitter OAUTH
     void onTemporaryTokenReceived(QString, QString);
     void onAuthorizationReceived(QString, QString);
     void onAccessTokenReceived(QString token, QString tokenSecret);
diff --git a/src/Core/Settings.cpp b/src/Core/Settings.cpp
index 12de9642b..f5f82ddc6 100644
--- a/src/Core/Settings.cpp
+++ b/src/Core/Settings.cpp
@@ -712,8 +712,6 @@ GSettings::upgradeAthlete(QString athlete) {
     migrateCValue(athlete, GC_DVPASS);
     migrateCValue(athlete, GC_DVCALDAVTYPE);
     migrateCValue(athlete, GC_DVGOOGLE_CALID);
-    migrateCValue(athlete, GC_TWITTER_TOKEN);
-    migrateCValue(athlete, GC_TWITTER_SECRET);
     migrateCValue(athlete, GC_GOOGLE_CALENDAR_REFRESH_TOKEN);
     migrateCValue(athlete, GC_STRAVA_TOKEN);
     migrateCValue(athlete, GC_CYCLINGANALYTICS_TOKEN);
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index d03818253..2ff9d6b9c 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -35,9 +35,6 @@
 #define GC_UNIT_METRIC                       "Metric"
 #define GC_UNIT_IMPERIAL                     "Imperial"
 
-//Twitter oauth keys / see also Athlete parameter
-#define GC_TWITTER_CONSUMER_KEY    "qbbmhDt8bG8ZBcT3r9nYw" //< consumer key
-
 //Google Calendar-CALDAV oauthkeys / see also Athlete parameter
 #define GC_GOOGLE_CALENDAR_CLIENT_ID      "426009671216-c588t1u6hafep30tfs7g0g1nuo72s8ko.apps.googleusercontent.com"
 
@@ -286,9 +283,11 @@
 #define GC_DVCALDAVTYPE                 "<athlete-private>dv/type"
 #define GC_DVGOOGLE_CALID               "<athlete-private>dv/googlecalid"
 #define GC_DVGOOGLE_DRIVE               "<athlete-private>dv/googledrive"
-//Twitter oauth keys
+//Dropbox oauth keys
 #define GC_DROPBOX_TOKEN                "<athlete-private>dropbox/token"
 #define GC_DROPBOX_FOLDER               "<athlete-private>dropbox/folder"
+
+//Google oauth keys
 #define GC_GOOGLE_DRIVE_AUTH_SCOPE      "<athlete-private>google-drive/auth_scope"
 #define GC_GOOGLE_DRIVE_ACCESS_TOKEN   "<athlete-private>google-drive/access_token"
 #define GC_GOOGLE_DRIVE_REFRESH_TOKEN   "<athlete-private>google-drive/refresh_token"
@@ -296,9 +295,6 @@
 
 #define GC_GOOGLE_DRIVE_FOLDER          "<athlete-private>google-drive/folder"
 #define GC_GOOGLE_DRIVE_FOLDER_ID       "<athlete-private>google-drive/folder_id"
-//Twitter
-#define GC_TWITTER_TOKEN                "<athlete-private>twitter_token"
-#define GC_TWITTER_SECRET               "<athlete-private>twitter_secret"
 //Withings
 #define GC_WITHINGS_TOKEN               "<athlete-private>withings_token"
 #define GC_WITHINGS_SECRET              "<athlete-private>withings_secret"
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index a073c6fec..366061b12 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -65,9 +65,6 @@
 #include "MergeActivityWizard.h"
 #include "GenerateHeatMapDialog.h"
 #include "BatchExportDialog.h"
-#ifdef GC_HAVE_KQOAUTH
-#include "TwitterDialog.h"
-#endif
 #include "ShareDialog.h"
 #include "TodaysPlan.h"
 #include "BodyMeasuresDownload.h"
diff --git a/src/src.pro b/src/src.pro
index 4f0ec6309..a15bd3135 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -323,13 +323,6 @@ unix:!macx {
     }
 }
 
-# if we have it we can add twitter support
-contains(DEFINES, "GC_HAVE_KQOAUTH") {
-        SOURCES     += Cloud/TwitterDialog.cpp
-        HEADERS     += Cloud/TwitterDialog.h
-}
-
-
 ###=======================================================
 ### OPTIONAL => D2XX FOR FTDI DRIVERS ON WINDOWS PLATFORMS
 ###=======================================================