From 5692c33b2d44e64d542bc51ab5aa85ddc891001b Mon Sep 17 00:00:00 2001 From: grauser Date: Fri, 23 Dec 2016 19:27:54 +0100 Subject: [PATCH] Deprecate GoogleMap and BingMap We use RideMapWindow for several months --- {src/Charts => deprecated}/BingMap.cpp | 0 {src/Charts => deprecated}/BingMap.h | 0 {src/Charts => deprecated}/GoogleMapControl.cpp | 0 {src/Charts => deprecated}/GoogleMapControl.h | 0 src/Gui/GcWindowRegistry.cpp | 2 -- src/src.pro | 8 ++++---- 6 files changed, 4 insertions(+), 6 deletions(-) rename {src/Charts => deprecated}/BingMap.cpp (100%) rename {src/Charts => deprecated}/BingMap.h (100%) rename {src/Charts => deprecated}/GoogleMapControl.cpp (100%) rename {src/Charts => deprecated}/GoogleMapControl.h (100%) diff --git a/src/Charts/BingMap.cpp b/deprecated/BingMap.cpp similarity index 100% rename from src/Charts/BingMap.cpp rename to deprecated/BingMap.cpp diff --git a/src/Charts/BingMap.h b/deprecated/BingMap.h similarity index 100% rename from src/Charts/BingMap.h rename to deprecated/BingMap.h diff --git a/src/Charts/GoogleMapControl.cpp b/deprecated/GoogleMapControl.cpp similarity index 100% rename from src/Charts/GoogleMapControl.cpp rename to deprecated/GoogleMapControl.cpp diff --git a/src/Charts/GoogleMapControl.h b/deprecated/GoogleMapControl.h similarity index 100% rename from src/Charts/GoogleMapControl.h rename to deprecated/GoogleMapControl.h diff --git a/src/Gui/GcWindowRegistry.cpp b/src/Gui/GcWindowRegistry.cpp index f14dfe708..f19bca2a1 100644 --- a/src/Gui/GcWindowRegistry.cpp +++ b/src/Gui/GcWindowRegistry.cpp @@ -54,8 +54,6 @@ #ifndef NOWEBKIT #include "RideWindow.h" #endif -#include "GoogleMapControl.h" -#include "BingMap.h" #include "RideMapWindow.h" #include "WebPageWindow.h" #ifdef GC_WANT_R diff --git a/src/src.pro b/src/src.pro index a705fe3f3..411979d5d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -641,9 +641,9 @@ HEADERS += ANT/ANTChannel.h ANT/ANT.h ANT/ANTlocalController.h ANT/ANTLogger.h # Charts and associated widgets HEADERS += Charts/Aerolab.h Charts/AerolabWindow.h Charts/AllPlot.h Charts/AllPlotInterval.h Charts/AllPlotSlopeCurve.h \ - Charts/AllPlotWindow.h Charts/BingMap.h Charts/BlankState.h Charts/ChartBar.h Charts/ChartSettings.h \ + Charts/AllPlotWindow.h Charts/BlankState.h Charts/ChartBar.h Charts/ChartSettings.h \ Charts/CpPlotCurve.h Charts/CPPlot.h Charts/CriticalPowerWindow.h Charts/DaysScaleDraw.h Charts/ExhaustionDialog.h Charts/GcOverlayWidget.h \ - Charts/GcPane.h Charts/GoldenCheetah.h Charts/GoogleMapControl.h Charts/HistogramWindow.h Charts/HomeWindow.h \ + Charts/GcPane.h Charts/GoldenCheetah.h Charts/HistogramWindow.h Charts/HomeWindow.h \ Charts/HrPwPlot.h Charts/HrPwWindow.h Charts/IndendPlotMarker.h Charts/IntervalSummaryWindow.h Charts/LogTimeScaleDraw.h \ Charts/LTMCanvasPicker.h Charts/LTMChartParser.h Charts/LTMOutliers.h Charts/LTMPlot.h Charts/LTMPopup.h \ Charts/LTMSettings.h Charts/LTMTool.h Charts/LTMTrend2.h Charts/LTMTrend.h Charts/LTMWindow.h \ @@ -721,9 +721,9 @@ SOURCES += ANT/ANTChannel.cpp ANT/ANT.cpp ANT/ANTlocalController.cpp ANT/ANTLogg ## Charts and related SOURCES += Charts/Aerolab.cpp Charts/AerolabWindow.cpp Charts/AllPlot.cpp Charts/AllPlotInterval.cpp Charts/AllPlotSlopeCurve.cpp \ - Charts/AllPlotWindow.cpp Charts/BingMap.cpp Charts/BlankState.cpp Charts/ChartBar.cpp Charts/ChartSettings.cpp \ + Charts/AllPlotWindow.cpp Charts/BlankState.cpp Charts/ChartBar.cpp Charts/ChartSettings.cpp \ Charts/CPPlot.cpp Charts/CpPlotCurve.cpp Charts/CriticalPowerWindow.cpp Charts/ExhaustionDialog.cpp Charts/GcOverlayWidget.cpp Charts/GcPane.cpp \ - Charts/GoldenCheetah.cpp Charts/GoogleMapControl.cpp Charts/HistogramWindow.cpp Charts/HomeWindow.cpp Charts/HrPwPlot.cpp \ + Charts/GoldenCheetah.cpp Charts/HistogramWindow.cpp Charts/HomeWindow.cpp Charts/HrPwPlot.cpp \ Charts/HrPwWindow.cpp Charts/IndendPlotMarker.cpp Charts/IntervalSummaryWindow.cpp Charts/LogTimeScaleDraw.cpp \ Charts/LTMCanvasPicker.cpp Charts/LTMChartParser.cpp Charts/LTMOutliers.cpp Charts/LTMPlot.cpp Charts/LTMPopup.cpp \ Charts/LTMSettings.cpp Charts/LTMTool.cpp Charts/LTMTrend.cpp Charts/LTMWindow.cpp \