Revert "Add ANT+ product info (#3307)" (#3309)

This reverts commit d7fce1565c.

.gitattributes

@@ -0,0 +1,5 @@
+# Added this line to .gitattributes
+*.pbxproj -crlf -diff -merge
+src/translations/* linguist-documentation
+src/Resources/translations/* linguist-documentation
+test/* linguist-vendored

.gitignore

@@ -13,6 +13,7 @@ Makefile
 *.prl
 *.swp
 *.user
+*.AppImage
 
 # osx noise
 .DS_Store
@@ -49,3 +50,6 @@ qwt/src/Makefile.Debug
 qwt/textengines/mathml/debug/
 qwt/textengines/mathml/release/
 build.pro.user
+build.pro.user.*
+doc/contrib/WASP Packet Protocol.pdf
+

.travis.yml

@@ -1,124 +1,60 @@
 branches:
-- master
-language:
-- objective-c
-compiler:
-- clang
-- gcc
+  only:
+  - master
+  - /^[vV]\d+\.\d+(\.\d+)?(-\S*)?$/
+os:
+- osx
+- linux
+dist: xenial
+language: c++
 env:
-  matrix:
-  - BRANCH=master QT=qt4 QT_PATH=qt
-  - BRANCH=master QT=qt5 QT_PATH=qt5 QT_VER=5.5.1
   global:
+  - BRANCH=master
   - secure: iqYW7f3//ZkMVzeCEarYn0S0DqKjFU9juBh0KF6WTlUsKX902Jtsk7dFoJlNDYBf63HLgV+wW2Hc6MxI9sGiUkom0gY9/To/aeGIJFGEX2sLm/e0Ok3qN521FA0Q/OiCFsD0RC6J+yrHxzI+rf8Z1rujceUsz2KgsrfAjYYv+BY=
   - secure: C6f58PXwvvHeVOjCLbyDRjgyF0tk+bXjCNUDur8VJLhJEGNdnrt+rH+d3azYaX0n348ZnQZ14as4M4rHjN1A/3DRbdUdOS7PQZrkj/n363ck1tvYOG/tzYqkEcVoQyjIJ7ZoTuBXDQry/VJmLxQjM0glTa2upNFHMOMwqZNkF+I=
   - secure: mgf181ok4rJTHxAdSaeIb/OzUx7PQc6UjJYfhJQcZDjN1Nou+Um6OHpnooMHeEq0CdGuLSiv2xVmuQnRjI5MfG5re/a3l39hSzi9tPLWi1y7uOLCtQFooJw3H+LhiKZcgAtEnkTmEhUCEu5uZ7cp4lWhrQZWCR5mCDNtJrGHjiw=
   - secure: UkW6SpgeACb6enGZADTAtPPRe23Tffne/SRQoBsZ3kGbKzgv8kTCLY0G5N71B1xEGdLB/36piOa0yji2SMW1jbflxR7tdOsiNpfd9R5qYqWVZRulY0qite8ZCwU5dqgy87pp4ECC1hNSOTq17aa4Sc4G4egg9AOy8cntLBTtxJA=
   - secure: rb/MKPHEK8yOK5uYpXq2o+MQ7h65ft+c/xE9XmLFk1jLnK0oxe6+KeoSFlQ0n5UwLSsHrytMXVaUHex6EEt0TheXFlohi7BcNFWRWXr+wLucuaPjMnU49VErrSigjJ5VW/rcR7fORmnDwn5y06r3Rer9SC1hImCxf/pqF8hFZps=
   - secure: FXJzm98lwbc1R2eh9/CvVReVRHEPLDm+sCRjiV9HJgeCveIUauLasp9Skamz0c6OKLmkjLY8JERPT491ZgCG8YcQ9x1bM8HGbmRqnn9xSUxINIRzVmyTiLMBoT/ibHHeFjFpyiGfukOAkHwMNNsrSrbaekhiJuekaXo7iTwYQB0=
+  - secure: K9+6ufffQ2a6dCTwVSI5ZtrGE+JSsj2ZeQwJ8Xk/y1yhSlbnW6Uptfs5oZ4XJ/BAQbuKbctnczP/jwDtGBG/Y0WOxn8m1DYBrkeLeToc0JZ8dn2lF6H6BEcB3VI3iPUtxAXWHNeSCk2qaC83z80Ydjc5GCxoAOwlw5/BEsRYI/s=
+  - secure: n6khzr3bPnvh2lTE1NmcaPWRWkqLBUcXZL20EO0Q0HyhH2O22fwsKfnODCDtP1UEQxW+E0G3DkedSz/RmpMWbv1KpWKNNKl74wIdUE53nRIBLTULRoypCq1tDZzQqkoogbXu3pWrb23YoUuM2p5zxM9l3TiNbcrdZeQ+PInVL6o=
+  - secure: mJEJUwt1jhx5qx5h5C8gnYJyaUb5fItSJGU/Tgp0IMCPCUSXtjHf9QTKITAKvg/hY8zggSwo+Vg2VzdMypdxDKqAeH/xAjq/o1+4linWphSjWpUGTqF/B8sR37WtduXtetamX+ctsbG4I77Xw+7y8OPPoCPxDct9hWxfCw6eBrI=
+  - secure: BX7lVlMs6c6qOCMc7Eu0s3G7/es+3h/EGElS/4wjw4/nxp91bd0RbkOmGmgEKOFw5XRFl8gV0kEzmFhrJTdGfTnWHmdsGjSo2VzwePgW/PbDdQrTVD2rYBmmPoeTXf3S3v0P7d3pBrpuxAqkmj7bFkpnvviCN9erC4bUhSg6jEI=
+  - secure: AC6pelym0R1Pq6GgcAy7E/BmlNWrni+41P8V8PMtjBKEtiyJ3tQa+KCn5g0UfGzktRHk+0l+szz3Wdy+bzl+ifiJVhXXs95B9F9El03p33UQLFPi+wFlivddP5DLc+4vIsDUiaNX97p89vo1/R96OLjpF1mUzfOMKYmAiMGP/Co=
+  - secure: QXyyyutxesRVae/WFi75dxlNw2qTyWc6WQ3vmRER9BFhlrNtt8lmE+M6ghMDOhxigzSXWxHcG9r66BLOw4DML7AXg4f3NIAIYuYQrpfsWQ1TKGC/vVvIPDlNBKL62zSOoNowjup1HfZpB575wl4JkmHjoMPDfQ4yM/JVR+MKmIM=
+  - secure: lefpL3SB8yN0Vn1R2e0hAFpJgFnu4rJ/vn7DucSKQvJ61K7t3LrUHFXElDQGFZMbytx4OJDeYsJtrccrIHjcsSAEIyW8TTcwn5/JopnyeQ3ukV5AYpEoQusym09XKru9E7awqvnZrXz6mdoIum5JP7+H116mPN4vsvz5nkNWxeg=
+  - secure: RAGPq/thN9x6STNueDbeJWGUN75OLNcUVUkLHI/eZwPrkMaiQPfxIaJ+8eO2PszDcBojw3eYVhzbRvLnLiXmHL3buwD6oXMTyYnxGzCZ61DeDQ2cQa8ynKmRim5JL3viKMqtdyasXVoGf/u0GqMsgaLcqN6e/vXuXMGu6kkUPEQ=
+  - secure: Lydms45scczE9gZvkWze2fXVbEInKW48DOCIRJWziEzxKkvXUE7WPy74fLvfvL+0JW0LH/ZLZ9EbgHcJAYYs8CBrfAeOOtnyo2DZ0ouEO13RmomSZneEKSpJxRtErcPIu+B0LzcEGyAgf7bxPVevEte50CK0pZJ7z7bHMhU23pY=
+  - secure: cc0pAJjkmFNw2bO3zVACmtyHTwINAHALrtUxi+nRD+FhOO9KxuxuuwvcKCZKfp9EUOjz5PrYWKV1ZH/zt/jMix8A4Gyue2mWX8WYih7aTmJBcJWsFNTCybnClreKBCh18kHdWWhkmhk8EMINDvlqxzJZGpcNO04gxhL9wuLLrNQ=
+  - secure: em0xXIm69rMHsHXYQiizeJB7dEFBkX33PsWDHwBNrX6lFBued23eL96KJC4RVbk6A+AHFtXFATrreZ14D5JH/E/37CXhe3X2R93WqiPUSH0s7NI4fFA1BroKUNAlqO4bMqDBidtNmwMPaLTXjaOnOZyvbAG7z+QV3TKC8tOeZDU=
+  - secure: VFaSERlgsjzjiDQhKw8XFvQrjdvFzHHL7V3NQg+RfELHoT6I1pAGFdl/+lRBIVOiVkbQ6XnpBA28nlf0QydPHElRZdqmh0azQV/bkUXD4ffPE8q0iSqeqhAZ+5L05K5K+Gby/y8TZE4FX6e/7trFL7oq+h9x0gq5RQO8rAcTV84=
+  matrix:
+    include:
+      - os: osx
+        osx_image: xcode10.1
+        compiler: clang
+      - os: linux
+        compiler: gcc
 before_install:
-## try early just to check, can delete later
-- date
-- brew update
-- sh travis/install-qt.sh
-##- brew install $QT
-- brew install libical
-- brew install libusb libusb-compat
-- brew install srmio
-- brew install libsamplerate
-- brew tap homebrew/science
-- brew install r
-## Disable KML for now
-##- brew install --HEAD travis/libkml.rb
-- sudo chmod -R +w /usr/local
-- curl -O http://www.ftdichip.com/Drivers/D2XX/MacOSX/D2XX1.2.2.dmg
-- git clone --depth 1 https://github.com/sintegrial/qwtplot3d.git qwtplot3d
-- cd qwtplot3d
-- CC=clang CXX=clang++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing"
-- CC=clang CXX=clang++ make -j2
-- cd ..
-- git clone --branch 0.98 https://github.com/kypeli/kQOAuth.git kQOAuth-0.98
-- cd kQOAuth-0.98
-- CC=clang CXX=clang++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing"
-- CC=clang CXX=clang++ make -j2 qmake_all
-- CC=clang CXX=clang++ sudo make install
-- cd ..
-- hdiutil mount D2XX1.2.2.dmg
+- travis/$TRAVIS_OS_NAME/before_install.sh
 before_script:
-- mkdir D2XX
-- cp /Volumes/release/D2XX/Object/10.5-10.7/x86_64/libftd2xx.1.2.2.dylib D2XX
-- sudo cp /Volumes/release/D2XX/Object/10.5-10.7/x86_64/libftd2xx.1.2.2.dylib /usr/local/lib
-- cp /Volumes/release/D2XX/bin/*.h D2XX
-- sed -i "" "s|libftd2xx.dylib|@executable_path/../Frameworks/libftd2xx.1.2.2.dylib|"
-  src/FileIO/D2XX.cpp
-- cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
-- cp src/gcconfig.pri.in src/gcconfig.pri
-- /usr/local/opt/$QT_PATH/bin/lupdate src/src.pro
-- sed -i "" "s|#\(CONFIG += release.*\)|\1 static |" src/gcconfig.pri
-- sed -i "" "s|#\(QMAKE_LRELEASE\).*|\1 += /usr/local/opt/$QT_PATH/bin/lrelease|"
-  src/gcconfig.pri
-- sed -i "" "s|#\(QMAKE_CXXFLAGS\).*|\1_RELEASE += -mmacosx-version-min=10.7 -arch
-  x86_64|" src/gcconfig.pri
-- sed -i "" "s|^#CloudDB|CloudDB|" src/gcconfig.pri
-- sed -i "" "s|^#LIBZ|LIBZ|" src/gcconfig.pri
-- sed -i "" "s|#\(SRMIO_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
-- sed -i "" "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX|" src/gcconfig.pri
-- sed -i "" "s|#\(D2XX_LIBS    =.*\)|\1 -L../D2XX -lftd2xx.1.2.2|" src/gcconfig.pri
-- sed -i "" "s|#\(KQOAUTH_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
-- sed -i "" "s|#\(KQOAUTH_INCLUDE =.*\)|\1 \$\$[QT_INSTALL_LIBS]/kqoauth.framework/Headers|"
-  src/gcconfig.pri
-- sed -i "" "s|#\(KQOAUTH_LIBS =.*\)|\1 -F\$\$[QT_INSTALL_LIBS] -framework kqoauth|"
-  src/gcconfig.pri
-- sed -i "" "s|#\(QWT3D_INSTALL =.*\)|\1 ../qwtplot3d|" src/gcconfig.pri
-## Disable KML for now
-##- sed -i "" "s|#\(KML_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
-##- sed -i "" "s|#\(KML_LIBS    =.*\)|\1 -L/usr/local/lib -lkmlxsd -lkmlregionator -lkmldom
-##  -lkmlconvenience -lkmlengine -lkmlbase|" src/gcconfig.pri
-- sed -i "" "s|#\(ICAL_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
-- sed -i "" "s|#\(ICAL_LIBS    =.*\)|\1 -L/usr/local/lib -lical|" src/gcconfig.pri
-- sed -i "" "s|#\(LIBUSB_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
-- sed -i "" "s|#\(LIBUSB_LIBS    =.*\)|\1 -L/usr/local/lib -lusb -lusb-1.0|" src/gcconfig.pri
-- sed -i "" "s|#\(SAMPLERATE_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
-- sed -i "" "s|#\(SAMPLERATE_LIBS =\).*|\1 -L/usr/local/lib -lsamplerate|" src/gcconfig.pri
-- sed -i "" "s|#\(DEFINES += GC_HAVE_LION*\)|\1|" src/gcconfig.pri
-- sed -i "" "s|#\(HTPATH = ../httpserver.*\)|\1 |" src/gcconfig.pri
-- sed -i "" "s|#\(DEFINES += GC_WANT_ROBOT.*\)|\1 |" src/gcconfig.pri
-- sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri
-- sed -i "" "s|#\(DEFINES += GC_VIDEO_QUICKTIME.*\)|\1 |" src/gcconfig.pri
-##Issues with c++11 and stdlib on travis and dependencies (e.g. plot3d)
-- sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\1 |" src/gcconfig.pri
-- echo "QMAKE_CFLAGS_RELEASE += -mmacosx-version-min=10.7 -arch x86_64" >> src/gcconfig.pri
-- sed -i "" "s/__GC_GOOGLE_CALENDAR_CLIENT_SECRET__/"$GC_GOOGLE_CALENDAR_CLIENT_SECRET"/" src/Core/Secrets.h
-- sed -i "" "s/__GC_STRAVA_CLIENT_SECRET__/"$GC_STRAVA_CLIENT_SECRET"/" src/Core/Secrets.h
-- sed -i "" "s/__GC_DROPBOX_CLIENT_SECRET__/"$GC_DROPBOX_CLIENT_SECRET"/" src/Core/Secrets.h
-- sed -i "" "s/__GC_CYCLINGANALYTICS_CLIENT_SECRET__/"$GC_CYCLINGANALYTICS_CLIENT_SECRET"/" src/Core/Secrets.h
-- sed -i "" "s/__GC_TWITTER_CONSUMER_SECRET__/"$GC_TWITTER_CONSUMER_SECRET"/" src/Core/Secrets.h
-- cat src/gcconfig.pri
+- travis/$TRAVIS_OS_NAME/before_script.sh
 script:
-- CC=clang CXX=clang++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing"
-- CC=clang CXX=clang++ make qmake_all
-- CC=clang CXX=clang++ make -j4 sub-qwt --silent
-- CC=clang CXX=clang++ make -j4 sub-src
+- travis/$TRAVIS_OS_NAME/script.sh
 after_success:
-- cd src
-- ls -laR GoldenCheetah.app
-- GoldenCheetah.app/Contents/MacOS/GoldenCheetah --help
-- /usr/local/opt/$QT_PATH/bin/macdeployqt GoldenCheetah.app -verbose=2 -dmg
-## fix up the bundle with macdeployqtfix
-- python ../travis/macdeployqtfix.py GoldenCheetah.app /usr/local/opt/$QT_PATH
-- brew remove $QT
-- mv GoldenCheetah.dmg GoldenCheetah_$QT.dmg
-- hdiutil mount GoldenCheetah_$QT.dmg
-- cd /Volumes/GoldenCheetah
-- ls -laR GoldenCheetah.app
-- GoldenCheetah.app/Contents/MacOS/GoldenCheetah --help
-##deploy broken in travis, read-only filesystem error
-##before_deploy:
-##- gem install mime-types -v 2.6.2
-##deploy:
-##  provider: releases
-##  api_key: $GH_OAUTH_TOKEN
-##  file: GoldenCheetah_$QT.dmg
-##  skip_cleanup: true
-##  on:
-##    tags: true
+- if [[ $TRAVIS_OS_NAME == "osx" ]]; then
+    export FINAL_NAME=dev-prerelease-branch-master-build-${TRAVIS_BUILD_NUMBER}.dmg;
+  else
+    export FINAL_NAME=dev-prerelease-branch-master-build-${TRAVIS_BUILD_NUMBER}.AppImage;
+  fi
+- travis/$TRAVIS_OS_NAME/after_success.sh
+deploy:
+  provider: releases
+  api_key:
+    secure: KlfkRM8oGP02y5LhbdxetnhqUG3YzVylvyhT8BTYjdoJtkJr7YXYpdhj9byZ9aiy1gSWI/g7A1X6/P8/McqRtgt4dEYr4Zg8QO7Y7QdTpgNQEwu8ZrkyyG/7b/rSkfFHDjrOAHslLVXuBNwWgi8YW1aTn0rY2AqDbOri7u6tt9Q=
+  file: src/$FINAL_NAME
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: GoldenCheetah/GoldenCheetah
+

CONTRIBUTING.md

@@ -0,0 +1,49 @@
+## How to get help
+
+#### **Do you have questions about how to use GoldenCheetah?**
+
+* Ask any question about how to use GoldenCheetah on [golden-cheetah-users mailing list](https://groups.google.com/forum/#!forum/golden-cheetah-users), ideally after watching the corresponding [tutorials](https://www.goldencheetah.org/#section-tutorials) and/or reading the relevant parts of the [documentation](https://github.com/GoldenCheetah/GoldenCheetah/wiki).
+
+#### **Do you have questions about the source code?**
+
+* Ask any question about how to build GoldenCheetah or anything related to the source code in the [golden-cheetah-developers mailing list](https://groups.google.com/forum/#!forum/golden-cheetah-developers), please see the [GoldenCheetah Developers Guide](https://github.com/GoldenCheetah/GoldenCheetah/wiki/Developers-guide) for addtional information.
+
+## How to contribute to GoldenCheetah
+
+#### **Did you find a bug?**
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/GoldenCheetah/GoldenCheetah/issues).
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/GoldenCheetah/GoldenCheetah/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and **steps to reproduce the problem** or a **test file** demonstrating the expected behavior that is not occurring.
+
+#### **Did you write a patch that fixes a bug?**
+
+* Open a new GitHub pull request with the patch.
+
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+* See [GoldenCheetah Guidelines for submitting a patch](https://github.com/GoldenCheetah/GoldenCheetah/wiki/Guidelines-for-submitting-a-patch) for additional information.
+
+#### **Did you fix whitespace, format code, or make a purely cosmetic patch?**
+
+Changes that are cosmetic in nature and do not add anything substantial to the stability or functionality of GoldenCheetah will generally not be accepted.
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+* Suggest your change in the [golden-cheetah-developers mailing list](https://groups.google.com/forum/#!forum/golden-cheetah-developers) and start writing code.
+
+* Do not open an issue on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
+
+#### **Do you want to contribute to GoldenCheetah translations?**
+
+* Translators are very welcome, please see [GoldenCheetah Guidelines for translators](https://github.com/GoldenCheetah/GoldenCheetah/wiki/Guidelines-for-translators)
+
+#### **Do you want to contribute to GoldenCheetah documentation?**
+
+* The [GoldenCheetah wiki](https://github.com/GoldenCheetah/GoldenCheetah/wiki) is open to user's contributions. feel free to add what you consider relevant to make other's users experience smoother.
+
+GoldenCheetah is a volunteer effort. Contributions are welcome!
+
+Thanks!
+
+GoldenCheetah Team

COPYING

@@ -1,622 +1,281 @@
                     GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 2, June 1991
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
 
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
 this License.
 
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
 
-  13. Use with the GNU Affero General Public License.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
 
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
 
-  14. Revised Versions of this License.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
 
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
 
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
 
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
+                            NO WARRANTY
 
-  15. Disclaimer of Warranty.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
 
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
 
@@ -628,15 +287,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
+convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software: you can redistribute it and/or modify
+    This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -644,32 +303,38 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
 
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
 
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
 

INSTALL-LINUX

@@ -21,7 +21,6 @@ CONTENTS
    - FTDI D2XX
    - SRMIO
    - liboauth
-   - QwtPlot3d
    - libkml
 
 3. ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 3
@@ -34,7 +33,7 @@ CONTENTS
 1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
 =================================================
 
-Installed Ubuntu 11.04 from CD image amd-64.iso. You will not need to do this if you
+Installed Linux distribution of choice on platforms i386 or amd-64 (currently Debian-based distributions and Arch-based distributions are covered). You will not need to do this if you
 already have a Linux distribution installed. Left this step in to highlight the
 Linux distribution the commands below were executed on.
 
@@ -42,8 +41,12 @@ login and open a terminal to get a shell prompt
 
 Download MANDATORY DEPENDENCIES (browser)
 -----------------------------------------
-Download and install the Qt 4.8 SDK from http://qt-project.org/
-Once that is completed test qmake is ok with: qmake --version (should report 4.7.0 or higher)
+Download and install the Qt SDK from http://qt-project.org/
+Once that is completed test qmake is ok with: qmake --version (should report 4.9.8 or higher)
+
+
+DEBIAN-BASED DISTRIBUTION INSTRUCTIONS
+--------------------------------------
 
 Install git with:
 $ sudo apt-get install git
@@ -55,6 +58,20 @@ Install FLEX and BISON
 You will need flex v2.5.9 or later
 $ sudo apt-get install bison
 $ sudo apt-get install flex
+-----------------------------------
+
+ARCH-BASED DISTRIBUTION INSTRUCTIONS
+------------------------------------
+
+Install git:
+$ sudo pacman -S git
+
+INSTALL FLEX and BISON
+----------------------
+$ sudo pacman -S flex bison
+
+NEXT STEPS
+----------
 $ vi gcconfig.pri
 
 Ensure you have the following lines (which are now also in gcconfig.pri.in which has
@@ -74,6 +91,20 @@ $ make clean
 $ qmake
 $ make
 
+To compile translation you need QT tool - lrelease
+If it is not found using he defaults in src/src.pro then set the full path and filename in gcconfig.pri
+QMAKE_LRELEASE = /usr/bin/lrelease
+
+When build first time you get number of error messages on .qm files missing:
+    "RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'"
+You can ignore these messages for your build. The .qm files will be created during the
+build at a later point in time via the "lrelease" command you configured in gcconfig.pri)
+
+If your QT build includes its own local compress libs then you should comment the line below in gcconfig.pri,
+otherwise you will need to have the compress libraries installed separately. 
+#LIBZ_INCLUDE =
+#LIBZ_LIBS    = -lz
+
 You will now have a release3 binary but with none of the release3 dependencies compiled in.
 Get latest GOLDEN CHEETAH source files
 --------------------------------------
@@ -175,96 +206,6 @@ $ make
 
 You now have SRM support built in.
 
-OAUTH/CRYPT - For Tweet my ride (twitter) support
--------------------------------------------------
-
-You should be able to install liboauth and dependencies
-directly with:
-$ sudo apt-get install liboauth-dev
-
-If this does not work then:
-
-    Download the source from: http://sourceforge.net/projects/liboauth/files/liboauth-0.9.4.tar.gz/download and
-    unpack it into ~/Projects/liboauth-0.9.4 using archive manager
-
-    $ cd ~/Projects/liboauth-0.9.4
-
-    You may find that libcurl is not installed (which liboauth depends upon) so download it
-    from http://curl.haxx.se/download/curl-7.21.6.tar.gz and unpack it into ~/Projects/curl-7.21.6
-    using archive manager to drag and drop into your Projects folder
-
-    $ cd ~/Projects/curl-7.21.6
-    $ ./configure
-    $ make
-    $ sudo make install
-
-    You should now have libcurl and friends installed in /usr/local
-
-    You may find that liboauth also requires the openssl libs installed, these are available
-    pre-packaged thankfully so:
-    $ sudo apt-get install libssl-dev
-
-    This will also install zlibg which liboauth also desires.
-
-    $ cd ~/Projects/liboauth-0.9.4
-    $ ./configure
-    $ make
-    $ sudo make install
-
-Now we have liboauth and libcurl in /usr/local and libssl in /usr/lib, so we can go back to
-GoldenCheetah and update the gcconfig.pri to point at the right places:
-
-$ cd ~/Projects/Live/GoldenCheetah/src
-$ vi gcconfig.pri
-
-Make sure the following are set:
-LIBOAUTH_INSTALL = /usr/local
-LIBCRYPTO_INSTALL = -lcrypto
-LIBCURL_INSTALL=-lcurl
-
-Make clean is needed if you have previously built, since source files examine #defines before
-including this feature. You can skip it if you know why ;)
-$ make clean
-$ qmake
-$ make
-
-You can now tweet your rides and amaze your friends, or alternatively tweet your rides but
-omit to mention average power to hide your weaknesses.
-
-LIBQWTPLOT3D - For 3D plot
---------------------------
-
-Download the tarball from http://qwtplot3d.svn.sourceforge.net/viewvc/qwtplot3d/branches/maintain_0_2_x/qwtplot3d/?view=tar
-and unarchive it into your Projects directory using archive manager. There is no version number it just creates a
-subdirectory called qwtplot3d
-
-You will need to install libgl and extensions, this can be done with;
-$ sudo apt-get install libgl1-mesa-dev
-$ sudo apt-get install libglu-dev
-
-On Ubuntu 12.10 I also ran
-$ sudo apt-get install freeglut3 freeglut3-dev
-
-$ cd ~/Projects/qwtplot3d
-Edit the qwtplot3d.pri and add
-CONFIG += staticlib
-
-You will find that on modern Linuxes you also need to fix include/qwt3d_global.h by adding the line:
-#include <GL/glu.h>
-
-then build
-$ qmake
-$ make
-
-Then to let gc know where the qwtplot3d libs are you need to edit gcconfig.pri;
-$ cd ~/Projects/Live/GoldenCheetah/src
-$ vi gcconfig.pri
-
-And uncomment the following line and set the install directory to where you build
-QWT3D_INSTALL = ~/Projects/qwtplot3d
-
-
-
 LIBKML - For export to Google Earth
 -----------------------------------
 

INSTALL-MAC

@@ -20,8 +20,6 @@ CONTENTS
 2. ADDING OPTIONAL DEPENDENCIES
    - FTDI D2XX
    - SRMIO
-   - kQOAuth
-   - QwtPlot3d
    - libkml
    - libusb
    - libical
@@ -210,6 +208,11 @@ $ cd .. #this should put you in the top level dir containing this file
 $ qmake -recursive
 $ make
 
+When build first time you get number of error messages on .qm files missing:
+    "RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'"
+You can ignore these messages for your build. The .qm files will be created during the
+build at a later point in time via the "lrelease" command you configured in gcconfig.pri)
+
 If make fails to find a Makefile then qmake is configured, by default, to create
 an xcode project file. You will need to change the qmake command above to tell it
 to create a makefile with the following:
@@ -223,12 +226,21 @@ $ open src/GoldenCheetah.app
 
 And you're up and running.
 
+Now, if you would like to use XCode to debug the project, you can generate 
+the necessary project file. 
+$ qmake --recursive -spec macx-xcode
+
+This will create a project as: build.xcodeproj Please be sure to build via 
+the standard method before checkin to prevent build errors. If the build
+fails to launch with "couldn't be opened because you don't have permission 
+to view it" Then a work around would be to open the project and attach
+the debugger. 
+$ open src/GoldenCheetah.app
+
 2. ADDING OPTIONAL DEPENDENCIES
 ===============================
 
    - SRMIO
-   - kQOAuth
-   - QwtPlot3d
    - libkml
    - libusb
    - libical
@@ -244,24 +256,7 @@ should be taken into account.
 SRMIO (git)
 ./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" CPPFLAGS=-I/usr/local/D2XX/ --disable-dependency-tracking
 
-2.2 kQOAuth - For OAuth Authentication
---------------------------------------
-
-kQOauth (0.98)
-
-qmake
-
-
-2.3 QwtPlot3d - For 3d plot support
------------------------------------
-
-qwtplot3d (maintain_0_2_x)
-
-Add the following to qwtplot3d.pro:
-CONFIG += x86_64 static
-QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.7.sdk
-
-2.4 libkml - For export to Google Earth
+2.2 libkml - For export to Google Earth
 ---------------------------------------
 
 expat (2.0.1)
@@ -273,7 +268,7 @@ libkml (pulled down from the svn repo)
 
 note: the added CXXFLAGS helped clear the -Werror flag that stopped compilation.
 
-2.5 libusb - For Garmin USB2 stick support
+2.3 libusb - For Garmin USB2 stick support
 ------------------------------------------
 
 libusb (0.1.12)
@@ -290,7 +285,7 @@ make install
 
 note: that the sed line updates some commands in libtool.  not sure why the arch clags are not getting passed.  
 
-2.6 libical
+2.4 libical
 -----------
 
 libical (0.46)

INSTALL-WIN32

@@ -1,117 +1,207 @@
-Please note: This is an old build instruction set for Version 2.x.
-
-Most of it is still fairly valid for version 3.x.
-
-Minimum build requirements are: Qt 4.8 with Qt.4.8.4 recommended.
-
-All other libs are find the best that you can except for libusb which requires 0.1.12.
-
-I have found that the cross compiler at http://mxe.cc/ to be great for building GC and SRMIO.
 
                                  +++++++++++++++++++++++
                                  WIN32 BUILD WALKTHROUGH
                                  +++++++++++++++++++++++
 
-                                       Gareth Coco
+                                     Joern Rischmueller
 
-                                        May 2011
+                                       February 2017
 
-For my install, I am installing all my files into the directory: d:\coding.
-You can use any directory structure you like, you’ll just have to change paths.
-Just ensure that any folder path you use does not have a space in it.
+This instruction will guide  you through a standard build of GoldenCheetah (without external
+dependencies or API based services included).
 
-Download the NSI installer application. I use the Portable Apps version from:
-  http://portableapps.com/apps/development/nsis_portable
-- Install in D:\Coding\NSISPortable\
+Prerequisites:
 
-Download Qt SDK from:
- http://qt.nokia.com/downloads/sdk-windows-cpp
- (File I am using is qt-sdk-win-opensource-2010.02.1.exe)
-- Install in D:\Coding\Qt
+To build on Windows you need the necessary toolchain to be installed. Since 2017
+GoldenCheetah is enabled to be build with the Microsoft Visual C++ 2015 toolchain,
+which is also the recommended toolchain to be used. Building with the "mingw" toolchain
+might still be possible, but may conflict with features needed from the Qt library
+which are no longer supported by the "mingw" version of Qt.
 
-Download the D2XX drivers:
- http://www.ftdichip.com/Drivers/D2XX.htm
- (File I am using is: CDM 202.06.00 WHQL Certified.zip)
-- Install in D:\Coding\D2XX
+Disclaimer:
 
-Download qwt-plot3d from:
- http://sourceforge.net/projects/qwtplot3d/files/
- (File I am using is qwtplot3d-0.2.7.zip)
-- Install in D:\Coding\qwtplot3d
+For any of the downloads and tools the document refers to, please check if you comply
+with the license agreements. I cannot any responsibility for any of the downloads you
+are doing.
 
-Edit D:\coding\qwtplot3d\src\qwt3d_function.cpp
-- Add at top of file: #include <cstdio>
-Edit D:\coding\qwtplot3d\qwtplot3d.pro
-- Comment out: #win32:TEMPLATE    = vclib
+You need:
 
-Then I start the “Qt Command Prompt” from the Qt SDK folder.
+- Microsoft Visual C++ 2015 - which is part of Visual Studio 2015
+  -- Download from Microsoft - they offer a "Community Edition" which is sufficient 
+     to build GoldenCheetah
+	 
+- Microsoft Windows SDK - which needs to be installed separately
+  -- Download from here: https://developer.microsoft.com/de-de/windows/downloads/windows-10-sdk
+  -- I am using the Windows 10 SDK - version 10.0.14393.795(since I build on Windows 10) - 
+     Note: building on other Windows Version(s) may require other SDK Version to be installed
+		   but was not tested 
+  -- When installing the SDK you have several options - for GoldenCheetah you need the "SDK" itself and
+     in case you want to Debug also the "Debugging Tools" to be installed. All other parts (to my experience)
+	 are not required.
+	 
+- Flex and Bison (below the version working for me)
+  -- Download from here: https://sourceforge.net/projects/winflexbison/
+  -- Use the "win_flex_bison-latest.zip" version
+  -- Unzip whereever you like and make sure that the location "win_bison.exe" and "win_flex.exe
+     are added to your "Path" environment variable
+	 
+- Qt C++ Framework
+  -- As of today, please use Qt 5.8.0 (which is the most recent official release) for Microsoft VC2015
+  -- Download is available here: https://www.qt.io/download/ - the OpenSource version is sufficient
+     to build GoldenCheetah
+	 You need to decide if you go for the 32Bit or the 64Bit version, all further descriptions will refer
+	 to the 64Bit version of Qt and the 64Bit Version of the Visual C++ Toolchain. 
+	 32 Bit follows the same concepts, you just need to download and/or configure the tools for 32 bit.
+	 The 
+  -- Install Qt and make sure that the \bin directory of Qt is added to your "Path" environment variable
+     (default path of Qt is C:\Qt\Qt5.8.0\5.8\msvc2015_64\bin)
+  -- To build GoldenCheetah we recommend to use "jom.exe" which is an "nmake" clone - see https://wiki.qt.io/Jom
+     With your Qt installation you also get QtCreator installed which is the free IDE for Qt. Jom is 
+	 part of the QtCreator installation. For the later build process, make sure that the path to "jom.exe"
+	 is added to your "Path" environment variable.
+	 (default path of QtCreator/Jom is C:\Qt\Qt5.8.0\Tools\QtCreator\bin)
+	 
+Note: Building a 32bit version / Building for Windows XP
+	-- 32bit follows the same concepts, you just need to download and/or configure the tools for 32 bit.
+	-- The Visual Studio standard toolchain as well as the SDK do not support Windows XP any more.
+	
 
-d:
-cd d:\coding\qwtplot3d\
-qmake -win32
-mingw32-make release
+	 
+Building from command line without additional dependencies:
 
-Now check out your favourite web sites until the code is built.
+For this build, I am installing all source code,... into the directory: c:\coding
 
-Leave the Qt Command Prompt window open as we use it later.
+- Download GoldenCheetah source (either using Git or downloading the ZIP file)
+  -- Download from here: https://github.com/GoldenCheetah/GoldenCheetah
+  -- Install in c:\coding\GoldenCheetah
+  
+- Setup the configuration of GoldenCheetah for the Qt windows build
+  -- Copy C:\coding\GoldenCheetah\qwt\qwtconfig.pri.in to C:\coding\GoldenCheetah\qwt\qwtconfig.pri     
+  -- Copy C:\coding\GoldenCheetah\src\gccconfig.pri.in to C:\coding\GoldenCheetah\src\gccconfig.pri 
+  -- Edit the "gcconfig.pri" file (see also instructions in the file itself)
+     Lines to be changed (from Default to New - or Add(ed):
+ 	 Default										New
+     #CONFIG += release					 		    CONFIG += release	
+     #DEFINES += NOWEBKIT                		    DEFINES += NOWEBKIT
+	 #QMAKE_LRELEASE = /usr/bin/lrelease			QMAKE_LRELEASE = lrelease
+	 
+	 Default
+	 #WINKIT_INSTALL= "C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64"
+	 New
+	 WINKIT_INSTALL= "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64"
+	 Note: This is the default path for the SDK - depending on how you installed the 
+	       SDK the path my deviate from the example.
+		   
+	 Add Lines
+	 CONFIG += lex
+	 CONFIG += yacc
+	 
+	 Default										New
+	 #QMAKE_LEX = win_flex							QMAKE_LEX  = win_flex --wincompat
+	 #QMAKE_YACC = win_bison						QMAKE_YACC = win_bison --file-prefix=y -t
+	 
+	 Add Lines
+	 # Make sure that LEX/YACC is executed first (to allow multi-core compilation via Jom)
+	 lex.CONFIG += target_predeps
+	 yacc_impl.CONFIG += target_predeps
+	 yacc_decl.CONFIG += target_predeps
+	 
 
-Download GoldenCheetah source
-(Either use GIT – git://github.com/GoldenCheetah/GoldenCheetah.git
- or download the zip file:
- http://github.com/GoldenCheetah/GoldenCheetah/zipball/master)
-- Install in D:\Coding\GoldenCheetah
+- Open the console tool of your choice in folder c:\coding\GoldenCheetah to run the build process
+  (I assume cmd.com with prompt ">")
+  -- Initialize the Visual C++ compile for 64 Bit Builds
+	 >CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+  -- Run "qmake" to prepare the build for Qt
+     >qmake build.pro -spec win32-msvc2015
+  -- Run "jom" to prepare and run the GoldenCheetah build
+     >jom qmake_all && jom
+     Note: When build first time you get number of error messages on .qm files missing.
+	       "RCC: Error in 'Resources\application.qrc': Cannot find file 'translations/gc_fr.qm'"
+           You can ignore these messages for your build. The .qm files will be created during
+		   the build at a later point in time via the "lrelease.exe" command you configured in 
+		   gcconfig.pri)
+	 Hint: In some (still inpredictable cases) the build stops during compilation of the "qwt"
+	       library. Just re-start it by running "jom" again, without any other action. Your
+		   build will continue without problems.
+		   
+- Wait - the compile with "jom" just uses 1 core. If you want to use more of your machine,
+  you may use "jom" with option "-j <no_of_cores>" e.g. "jom -j 4".
+  
+  
+- Since your are doing an "in-source" build you will find a release version of "GoldenCheetah.exe" 
+  in folder: "C:\coding\GoldenCheetah\src\release". You can run the .exe from that location as long
+  as the Qt libraries are on your "Path".
+  
+- To run GoldenCheetah.exe on a different machine (withoug Qt being installed), you need to collect
+  the Qt libraries. Easiest way is the "windeployqt" tool provided with Qt. 
+  Details can be found here: http://doc.qt.io/qt-5/windows-deployment.html
 
-Copy D:\Coding\GoldenCheetah\src\gccconfig.pri.in
-  to D:\Coding\GoldenCheetah\src\gccconfig.pri and edit
-- Set: D2XX_INCLUDE = d:/coding/D2XX
-- Comment out #SRMIO_INSTALL
-- Comment out: CONFIG += debug
-- Uncomment: CONFIG += static
 
-Copy D:\Coding\GoldenCheetah\qwt\qwtconfig.pri.in
-  to D:\Coding\GoldenCheetah\qwt\qwtconfig.pri and edit
-- Set win32 { INSTALLBASE    = D:/Coding/Qt  }
-- In #Qt4 win32 { section
-  – Comment out: #CONFIG           += debug     # release/debug/debug_and_release
-  – Add in:   CONFIG           += release
+Building with additional dependencies:
+ 
+We use a number of libraries for specific functions of GoldenCheetah. You find the list of dependencies
+and their sources documented in "gccconfig.pri.in". Here just a short summary which of those libraries
+are available in the official GoldenCheetah builds and some hints how to build them to be usable.
 
-Using the “Qt Command Prompt” window from before:
+Info: I plan to provide a pre-compiled set of the dependencies for the Windows version of GoldenCheetah,
+      so that not everybody has to invest the efforts to build the .dll's for the different tools.
+	  
+	  
+- SRM download support via SRMIO
+  -- Is NOT part of the official Windows builds since I was not able to create a .DLL which works
+     with an MSVC2015 based build of GoldenCheetah. If anybody finds a solution to add this dependency
+	 again - highly welcome.
+	 
+- D2XX device download support
+  -- Is part of the official Windows builds - we use the libs and do static linking.
+     The version currently used is: "CDM v2.10.00 WHQL Certified" - while there are more recent
+	 version available for download.
+	 
+- Google Earth .kml files (export)
+  -- Is part of the official build as a static lib - build is done with MSVC2015 - the build uses Release 1.2
+     (path of source code has changed to https://github.com/google/libkml)
 
-cd d:\coding\GoldenCheetah
-qmake -win32 -recursive
-mingw32-make release
+- iCal Calendar support (prerequisite for the "Diary" view)
+  -- Is part of the official build as a static lib - the build uses Release 1.0.1
+  
+- USB1 support via USBExpress
+  -- Is part of the official build as .dll - the build uses Release 3.5.1
+  
+- USB2 support via libusb
+  -- Is part of the official build - the build uses the pre-compiled release 1.2.6.0
+  
+- Video Playback via VLC
+  -- Is part of the official build as .dll - the build uses the pre-compiled release 2.2.1
+  
+- Resampling via libsamplerate
+  -- Is part of the official build as .dll - the build uses 
+  
 
-Go back to checking your email or favourite web sites while this builds.
+Building with integration to external services (via APIs)
 
-When all is finished, you should have a release version in:
+As of today a number of integrations with external services like Strava, Cyclinganalytics,
+Google Calendar, Dropbox, Today's Plan, Google Drive, CloudDB) exist in the official GoldenCheetah
+builds. The permission to use API's of such services requires a dedicated registration (in this case
+for "GoldenCheetah" as the consumer of the services) where in return the GoldenCheetah team get's 
+specific credentials to access the services.
 
-D:\Coding\GoldenCheetah\src\release\
+All of the services request that the access credentials are kept private and are under responsibility
+of the team/company/individual who has registered for the API use with the company providing the services.
 
-Next , move required build files into the d:\coding\GoldenCheetah\src\release directory.
+You can always start your personal registration process with the services to get your own credentials
+to build GoldenCheetah version which can use the service APIs. But you are doing that on your own full
+responsibility.
+
+*****************************************************************************************************
+
+Have fun to build your own version. Feedback/Contributions to this guide are welcome. The easiest way
+to contribute is to provide a pull-request.
+
+Cheers.
+Joern
+ 
 
-cd d:\coding\GoldenCheetah
-copy /y ..\Qt\qt\bin\mingwm10.dll src\release\
-copy /y ..\Qt\qt\bin\QtCore4.dll src\release\
-copy /y ..\Qt\qt\bin\QtGui4.dll src\release\
-copy /y ..\Qt\qt\bin\QtSql4.dll src\release\
-copy /y ..\Qt\qt\bin\QtXml4.dll src\release\
-copy /y ..\Qt\qt\bin\QtNetwork4.dll src\release\
-copy /y ..\Qt\qt\bin\QtOpenGL4.dll src\release\
-copy /y ..\Qt\qt\bin\QtWebKit4.dll src\release\
-copy /y ..\Qt\qt\bin\QtXmlPatterns4.dll src\release\
-copy /y ..\Qt\qt\bin\phonon4.dll src\release\
-copy /y ..\Qt\qt\bin\libgcc_s_dw2-1.dll src\release\
-copy /y ..\qwtplot3d\lib\qwtplot3d.dll src\release\
-mkdir src\release\sqldrivers
-copy /y ..\Qt\qt\plugins\sqldrivers\qsqlite4.dll src\release\sqldrivers\
-mkdir src\release\imageformats
-copy /y ..\Qt\qt\plugins\imageformats\qjpeg4.dll src\release\imageformats\
 
-To build the self installer:
 
-cd d:\coding\GoldenCheetah\src\win32
-d:\coding\NSISPortable\App\NSIS\makensis.exe GoldenCheetahInstall.nsi
 
-You should find the installer file in the directory you are in.
 
-Install and enjoy.

ISSUE_TEMPLATE.md

@@ -0,0 +1 @@
+Issue tracker is **only** for Bugs and Features, before to open a new issue please read the Contributing document (link at the right) and use the forums if you need help.

README.md

@@ -1,9 +1,30 @@
+<img src="src/Resources/images/gc.png" height="25%" width="25%">
+
+# GoldenCheetah
+
+## About 
+
+GoldenCheetah is an open-source data analysis tool primarily written in C++
+with Qt for cyclists and triathletes 
+with support for training as well. 
+
+GoldenCheetah can connect with indoor trainers and cycling equipment such 
+as cycling computers and power meters to import data. 
+
+In addition, GoldenCheetah can connect to cloud services. 
+
+It can then manipulate and view the data, as well as analyze it.
+
+
+
+## Installing 
+
 Golden Cheetah install and build instructions are documented
 for each platform;
 
 INSTALL-WIN32   For building on Microsoft Windows
 
-INSTALL-LINUX   For building on Ubuntu Linux
+INSTALL-LINUX   For building on Linux
 
 INSTALL-MAC     For building on Apple OS X
 
@@ -14,6 +35,6 @@ Windows: [![Build status](https://ci.appveyor.com/api/projects/status/i6dwn4m8oy
 
 [![Coverity Status](https://scan.coverity.com/projects/7503/badge.svg)](https://scan.coverity.com/projects/goldencheetah-goldencheetah)
 
-Alternatively official builds are available from http://www.goldencheetah.org
+Alternatively, official builds are available from http://www.goldencheetah.org
 
-whilst latest developer builds are available from https://github.com/GoldenCheetah/GoldenCheetah/releases
+whilst the latest developer builds are available from https://github.com/GoldenCheetah/GoldenCheetah/releases

appveyor.yml

@@ -2,9 +2,9 @@ version: ci.{build}
 image: Visual Studio 2015
 clone_depth: 1
 init:
-# Setup QT 5.6.0 - 64Bit
+# Setup QT 5.9 - 64Bit
 
-- set QTDIR=C:\Qt\5.6\msvc2015_64
+- set QTDIR=C:\Qt\5.9\msvc2015_64
 - set PATH=%QTDIR%\bin;%PATH%
 
 # Setup MSVC - VS 2015
@@ -22,7 +22,7 @@ install:
 - copy c:\libs\gcconfig64-Release.appveyor.pri src\gcconfig.pri
 
 build_script:
-- qmake.exe build.pro -r -spec win32-msvc2015
+- qmake.exe build.pro -r -spec win32-msvc
 - nmake
 
 #notifications:

build.pro

@@ -1,7 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS = qwt
-unix:!macx {
-    SUBDIRS += kqoauth
-}
 SUBDIRS += src
 CONFIG += ordered

deprecated/ModelPlot.cpp

@@ -702,7 +702,7 @@ ModelDataProvider::ModelDataProvider (ModelPlot &plot, ModelSettings *settings)
         xscale = 1;
         yscale = (maxbinx-minbinx)/(maxbiny-minbiny);
         zscale = (maxbinx-minbinx)/(maxz-minz);
-    } else if ((maxbiny-minbiny) >= (maxbinx-minbinx) && (maxbiny >= minbiny) >= (maxz-minz)) {
+    } else if ((maxbiny-minbiny) >= (maxbinx-minbinx) && (maxbiny-minbiny) >= (maxz-minz)) {
         // scale is set off the y-axis
         xscale = (maxbiny-minbiny)/(maxbinx-minbinx);
         yscale = 1;

deprecated/OAuthManager.cpp

@@ -0,0 +1,707 @@
+/*
+ * Copyright (c) 2010 Justin Knotzke (jknotzke@shampoo.ca)
+ * Copyright (c) 2017 Mark Liversedge (liversedge@gmail.com)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include "Secrets.h"
+
+#include "OAuthManager.h"
+#include "OAuthDialog.h"
+#include "Athlete.h"
+#include "Context.h"
+#include "Settings.h"
+#include "Colors.h"
+#include "TimeUtils.h"
+
+#if QT_VERSION > 0x050000
+#include "GoogleDrive.h"
+#include "PolarFlow.h"
+
+#include <QJsonParseError>
+#endif
+
+OAuthManager::OAuthManager(Context *context, OAuthSite site, CloudService *service, QString baseURL, QString clientsecret) :
+    context(context), site(site), service(service), baseURL(baseURL), clientsecret(clientsecret)
+{
+
+    if (service) { // ultimately this will be the only way this works
+        if (service->id() == "Strava") site = this->site = STRAVA;
+        if (service->id() == "Dropbox") site = this->site = DROPBOX;
+        if (service->id() == "Cycling Analytics") site = this->site = CYCLING_ANALYTICS;
+        if (service->id() == "Google Drive") site = this->site = GOOGLE_DRIVE;
+        if (service->id() == "University of Kent") site = this->site = KENTUNI;
+        if (service->id() == "Today's Plan") site = this->site = TODAYSPLAN;
+        if (service->id() == "Withings") site = this->site = WITHINGS;
+        if (service->id() == "PolarFlow") site = this->site = POLAR;
+        if (service->id() == "SportTracks.mobi") site = this->site = SPORTTRACKS;
+        if (service->id() == "Xert") site = this->site = XERT;
+    }
+
+    // check if SSL is available - if not - message and end
+    if (!QSslSocket::supportsSsl()) {
+        QString text = QString(tr("SSL Security Libraries required for 'Authorise' are missing in this installation."));
+        QMessageBox sslMissing(QMessageBox::Critical, tr("Authorization Error"), text);
+        sslMissing.exec();
+        noSSLlib = true;
+        return;
+    }
+
+    // ignore responses to false, used by POLARFLOW when binding the user
+    ignore = false;
+
+    // SSL is available - so authorisation can take place
+    noSSLlib = false;
+}
+
+void
+OAuthManager::authorize()
+{
+    //
+    // All services have some kind of initial authorisation URL where the user needs
+    // to login and confirm they are willing to authorise the particular app and
+    // provide a temporary token to get the real token with
+    //
+    QString urlstr = "";
+
+    if (site == STRAVA) {
+
+        urlstr = QString("https://www.strava.com/oauth/authorize?");
+        urlstr.append("client_id=").append(GC_STRAVA_CLIENT_ID).append("&");
+        urlstr.append("scope=view_private,write&");
+        urlstr.append("redirect_uri=http://www.goldencheetah.org/&");
+        urlstr.append("response_type=code&");
+        urlstr.append("approval_prompt=force");
+
+    } else if (site == DROPBOX) {
+
+        urlstr = QString("https://www.dropbox.com/oauth2/authorize?");
+#ifdef GC_DROPBOX_CLIENT_ID
+        urlstr.append("client_id=").append(GC_DROPBOX_CLIENT_ID).append("&");
+#endif
+        urlstr.append("redirect_uri=https://goldencheetah.github.io/blank.html&");
+        urlstr.append("response_type=code&");
+        urlstr.append("force_reapprove=true");
+
+    } else if (site == CYCLING_ANALYTICS) {
+
+        urlstr = QString("https://www.cyclinganalytics.com/api/auth?");
+        urlstr.append("client_id=").append(GC_CYCLINGANALYTICS_CLIENT_ID).append("&");
+        urlstr.append("scope=modify_rides&");
+        urlstr.append("redirect_uri=http://www.goldencheetah.org/&");
+        urlstr.append("response_type=code&");
+        urlstr.append("approval_prompt=force");
+
+#if QT_VERSION >= 0x050000
+
+    } else if (site == GOOGLE_DRIVE) {
+
+        const QString scope =  service->getSetting(GC_GOOGLE_DRIVE_AUTH_SCOPE, "drive.appdata").toString();
+        // OAUTH 2.0 - Google flow for installed applications
+        urlstr = QString("https://accounts.google.com/o/oauth2/auth?");
+        // We only request access to the application data folder, not all files.
+        urlstr.append("scope=https://www.googleapis.com/auth/" + scope + "&");
+        urlstr.append("redirect_uri=urn:ietf:wg:oauth:2.0:oob&");
+        urlstr.append("response_type=code&");
+        urlstr.append("client_id=").append(GC_GOOGLE_DRIVE_CLIENT_ID);
+
+    } else if (site == KENTUNI) {
+
+        const QString scope =  service->getSetting(GC_UOK_GOOGLE_DRIVE_AUTH_SCOPE, "drive.appdata").toString();
+
+        // OAUTH 2.0 - Google flow for installed applications
+        urlstr = QString("https://accounts.google.com/o/oauth2/auth?");
+        // We only request access to the application data folder, not all files.
+        urlstr.append("scope=https://www.googleapis.com/auth/" + scope + "&");
+        urlstr.append("redirect_uri=urn:ietf:wg:oauth:2.0:oob&");
+        urlstr.append("response_type=code&");
+        urlstr.append("client_id=").append(GC_GOOGLE_DRIVE_CLIENT_ID);
+
+#endif
+
+    } else if (site == TODAYSPLAN) {
+
+        //urlstr = QString("https://whats.todaysplan.com.au/en/authorize/"); //XXX fixup below when pages.cpp goes
+        if (baseURL=="") baseURL=service->getSetting(GC_TODAYSPLAN_URL, "https://whats.todaysplan.com.au").toString();
+        urlstr = QString("%1/authorize/").arg(baseURL);
+        urlstr.append(GC_TODAYSPLAN_CLIENT_ID);
+
+    } else if (site == POLAR) {
+
+        // OAUTH 2.0 - Google flow for installed applications
+        urlstr = QString("%1?").arg(GC_POLARFLOW_OAUTH_URL);
+        // We only request access to the application data folder, not all files.
+        urlstr.append("response_type=code&");
+        urlstr.append("client_id=").append(GC_POLARFLOW_CLIENT_ID);
+
+    } else if (site == SPORTTRACKS) {
+
+        // We only request access to the application data folder, not all files.
+        urlstr = QString("https://api.sporttracks.mobi/oauth2/authorize?");
+        urlstr.append("redirect_uri=http://www.goldencheetah.org&");
+        urlstr.append("state=xyzzy&");
+        urlstr.append("response_type=code&");
+        urlstr.append("client_id=").append(GC_SPORTTRACKS_CLIENT_ID);
+
+    } else if (site == WITHINGS) {
+
+        // Withings is the only service that uses KQOauth for now.
+
+#ifdef GC_HAVE_KQOAUTH
+        oauthRequest = new KQOAuthRequest;
+        oauthManager = new KQOAuthManager(this);
+
+        connect(oauthManager, SIGNAL(temporaryTokenReceived(QString,QString)), this, SLOT(onTemporaryTokenReceived(QString, QString)));
+        connect(oauthManager, SIGNAL(authorizationReceived(QString,QString)), this, SLOT( onAuthorizationReceived(QString, QString)));
+        connect(oauthManager, SIGNAL(accessTokenReceived(QString,QString)), this, SLOT(onAccessTokenReceived(QString,QString)));
+        connect(oauthManager, SIGNAL(requestReady(QByteArray)), this, SLOT(onRequestReady(QByteArray)));
+        connect(oauthManager, SIGNAL(authorizationPageRequested(QUrl)), this, SLOT(onAuthorizationPageRequested(QUrl)));
+
+        oauthRequest->initRequest(KQOAuthRequest::TemporaryCredentials, QUrl("https://oauth.withings.com/account/request_token"));
+        //oauthRequest->setEnableDebugOutput(true);
+        oauthRequest->setHttpMethod(KQOAuthRequest::GET);
+        oauthRequest->setConsumerKey(GC_WITHINGS_CONSUMER_KEY);
+        oauthRequest->setConsumerSecretKey(GC_WITHINGS_CONSUMER_SECRET);
+        //oauthRequest->setCallbackUrl(QUrl("http://www.goldencheetah.org"));
+        oauthManager->setHandleUserAuthorization(true); // false to use callback
+        oauthManager->setHandleAuthorizationPageOpening(false);
+
+        oauthManager->executeRequest(oauthRequest);
+#endif
+
+    } else if (site == XERT) {
+        getTokenWithCode("");
+    }
+
+    //
+    // STEP 1: LOGIN AND AUTHORISE THE APPLICATION
+    //
+    /*if (site == DROPBOX || site == STRAVA || site == CYCLING_ANALYTICS || site == POLAR || site == SPORTTRACKS || site == GOOGLE_DRIVE || site == KENTUNI || site == TODAYSPLAN) {
+
+        url = QUrl(urlstr);
+        view->setUrl(url);
+
+        // connects
+        connect(view, SIGNAL(urlChanged(const QUrl&)), this, SLOT(urlChanged(const QUrl&)));
+        connect(view, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
+    }*/
+
+}
+
+// just ignore SSL handshake errors at all times
+void
+OAuthManager::onSslErrors(QNetworkReply *reply, const QList<QSslError>&)
+{
+    reply->ignoreSslErrors();
+}
+
+
+#ifdef GC_HAVE_KQOAUTH
+
+//
+// KQOauth call backs
+//
+void
+OAuthManager::onTemporaryTokenReceived(QString, QString)
+{
+    //qDebug() << "onTemporaryTokenReceived";
+    QUrl userAuthURL;
+
+    if (site == WITHINGS) {
+        userAuthURL = "https://oauth.withings.com/account/authorize";
+    }
+
+    if(oauthManager->lastError() == KQOAuthManager::NoError) {
+        oauthManager->getUserAuthorization(userAuthURL);
+    } else
+        qDebug() << "error" << oauthManager->lastError();
+
+}
+
+void
+OAuthManager::onAuthorizationReceived(QString, QString)
+{
+    //qDebug() << "Authorization token received: " << token << verifier;
+
+    if (site == WITHINGS) {
+        oauthManager->getUserAccessTokens(QUrl("https://oauth.withings.com/account/access_token"));
+    }
+
+    if(oauthManager->lastError() != KQOAuthManager::NoError) {
+        QString error = QString(tr("Error fetching OAuth credentials - Endpoint: /oauth/access_token"));
+        QMessageBox oautherr(QMessageBox::Critical, tr("Authorization Error"), error);
+        oautherr.exec();
+        //accept();
+    }
+}
+
+void
+OAuthManager::onAccessTokenReceived(QString token, QString tokenSecret)
+{
+    //qDebug() << "Access token received: " << token << tokenSecret;
+
+    QString info;
+    if (site == WITHINGS) {
+        service->setSetting(GC_WITHINGS_TOKEN, token);
+        service->setSetting(GC_WITHINGS_SECRET, tokenSecret);
+        appsettings->setCValue(context->athlete->cyclist, GC_NOKIA_REFRESH_TOKEN, "");
+
+        info = QString(tr("Nokia Health (Withings) authorization was successful."));
+    }
+
+
+    QMessageBox information(QMessageBox::Information, tr("Information"), info);
+    information.exec();
+    //accept();
+}
+
+
+void
+OAuthManager::onAuthorizedRequestDone()  {} // request sent - do nothing
+
+void
+OAuthManager::onRequestReady(QByteArray response)
+{
+    //qDebug() << "Response received: " << response;
+
+    QString r = response;
+    if (r.contains("\"errors\"", Qt::CaseInsensitive)) {
+
+        QMessageBox oautherr(QMessageBox::Critical, tr("Error in authorization"),
+             tr("There was an error during authorization. Please check the error description."));
+             oautherr.setDetailedText(r); // probably blank
+         oautherr.exec();
+
+    } else {
+
+        if (site == WITHINGS) {
+
+            QString userid;
+
+#if QT_VERSION > 0x050000
+            QUrlQuery params;
+            params.setQuery(response);
+#else
+            QUrl params;
+            params.setEncodedQuery(response);
+#endif
+            userid = params.queryItemValue("userid");
+
+            if (userid.isEmpty() == false) {
+                service->setSetting(GC_WIUSER, userid);
+            }
+        }
+    }
+}
+
+
+void OAuthManager::onAuthorizationPageRequested(QUrl url) {
+    // open Authorization page in view
+    view->setUrl(url);
+
+}
+#endif // KQOAuth callbacks used by Withings only
+
+
+//
+// STEP 2: AUTHORISATION REDIRECT WITH TEMPORARY CODE
+//
+// When the URL changes, it will be the redirect with the temporary token after
+// the initial authorisation. The URL will have some parameters to indicate this
+// if they exist we should intercept the redirect to get the permanent token.
+// If they don't get passed then we don't need to do anything.
+//
+void
+OAuthManager::getTokenWithCode(QString code)
+{
+    QString authheader;
+
+    // sites that use this scheme
+    if (site == DROPBOX || site == STRAVA || site == CYCLING_ANALYTICS || site == TODAYSPLAN || site == POLAR || site == SPORTTRACKS || site == XERT) {
+
+
+            // sporttracks insists on passing state
+            if (code.endsWith("&state=xyzzy")) code = code.mid(0,code.length()-12);
+
+            QByteArray data;
+#if QT_VERSION > 0x050000
+            QUrlQuery params;
+#else
+            QUrl params;
+#endif
+            QString urlstr = "";
+
+            // now get the final token to store
+            if (site == DROPBOX) {
+
+                urlstr = QString("https://api.dropboxapi.com/oauth2/token?");
+                urlstr.append("redirect_uri=https://goldencheetah.github.io/blank.html&");
+                params.addQueryItem("grant_type", "authorization_code");
+#ifdef GC_DROPBOX_CLIENT_ID
+                params.addQueryItem("client_id", GC_DROPBOX_CLIENT_ID);
+#endif
+#ifdef GC_DROPBOX_CLIENT_SECRET
+                params.addQueryItem("client_secret", GC_DROPBOX_CLIENT_SECRET);
+#endif
+
+            } else if (site == POLAR) {
+
+                urlstr = QString("%1?").arg(GC_POLARFLOW_TOKEN_URL);
+                urlstr.append("redirect_uri=http://www.goldencheetah.org");
+                params.addQueryItem("grant_type", "authorization_code");
+#if (defined GC_POLARFLOW_CLIENT_ID) && (defined GC_POLARFLOW_CLIENT_SECRET)
+                authheader = QString("%1:%2").arg(GC_POLARFLOW_CLIENT_ID).arg(GC_POLARFLOW_CLIENT_SECRET);
+#endif
+
+            } else if (site == SPORTTRACKS) {
+
+                urlstr = QString("https://api.sporttracks.mobi/oauth2/token?");
+                params.addQueryItem("client_id", GC_SPORTTRACKS_CLIENT_ID);
+                params.addQueryItem("client_secret", GC_SPORTTRACKS_CLIENT_SECRET);
+                params.addQueryItem("redirect_uri","http://www.goldencheetah.org");
+                params.addQueryItem("grant_type", "authorization_code");
+
+            } else if (site == STRAVA) {
+
+                urlstr = QString("https://www.strava.com/oauth/token?");
+                params.addQueryItem("client_id", GC_STRAVA_CLIENT_ID);
+#ifdef GC_STRAVA_CLIENT_SECRET
+                params.addQueryItem("client_secret", GC_STRAVA_CLIENT_SECRET);
+#endif
+
+            }  else if (site == CYCLING_ANALYTICS) {
+
+                urlstr = QString("https://www.cyclinganalytics.com/api/token?");
+                params.addQueryItem("client_id", GC_CYCLINGANALYTICS_CLIENT_ID);
+#ifdef GC_CYCLINGANALYTICS_CLIENT_SECRET
+                params.addQueryItem("client_secret", GC_CYCLINGANALYTICS_CLIENT_SECRET);
+#endif
+                params.addQueryItem("grant_type", "authorization_code");
+
+            }  else if (site == TODAYSPLAN) {
+
+                if (baseURL=="") baseURL=service->getSetting(GC_TODAYSPLAN_URL, "https://whats.todaysplan.com.au").toString();
+                urlstr = QString("%1/rest/oauth/access_token?").arg(baseURL);
+                params.addQueryItem("client_id", GC_TODAYSPLAN_CLIENT_ID);
+#ifdef GC_TODAYSPLAN_CLIENT_SECRET
+                if (clientsecret != "") //XXX get rid when pages.cpp goes
+                    params.addQueryItem("client_secret", clientsecret);
+                else if (service->getSetting(GC_TODAYSPLAN_USERKEY, "").toString() != "")
+                    params.addQueryItem("client_secret", service->getSetting(GC_TODAYSPLAN_USERKEY, "").toString());
+                else
+                    params.addQueryItem("client_secret", GC_TODAYSPLAN_CLIENT_SECRET);
+
+#endif
+                params.addQueryItem("grant_type", "authorization_code");
+                params.addQueryItem("redirect_uri", "https://goldencheetah.github.io/blank.html");
+
+            }  else if (site == XERT) {
+
+                urlstr = QString("https://www.xertonline.com/oauth/token");
+                params.addQueryItem("username", service->getSetting(GC_XERTUSER, "").toString());
+                params.addQueryItem("password", service->getSetting(GC_XERTPASS, "").toString());
+                params.addQueryItem("grant_type", "password");
+
+                authheader = QString("%1:%1").arg("xert_public");
+            }
+
+            // all services will need us to send the temporary code received
+            params.addQueryItem("code", code);
+
+#if QT_VERSION > 0x050000
+            data.append(params.query(QUrl::FullyEncoded));
+#else
+            data=params.encodedQuery();
+#endif
+
+            // trade-in the temporary access code retrieved by the Call-Back URL for the finale token
+            QUrl url = QUrl(urlstr);
+
+            QNetworkRequest request = QNetworkRequest(url);
+            request.setHeader(QNetworkRequest::ContentTypeHeader,"application/x-www-form-urlencoded");
+
+            // client id and secret are encoded and sent in the header for POLAR and XERT
+            if (site == POLAR || site == XERT)  request.setRawHeader("Authorization", "Basic " +  authheader.toLatin1().toBase64());
+
+            // now get the final token - but ignore errors
+            manager = new QNetworkAccessManager(this);
+            connect(manager, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
+            //connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkRequestFinished(QNetworkReply*)));
+            QNetworkReply *reply = manager->post(request, data);
+
+            QEventLoop loop;
+            connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
+            loop.exec();
+            networkRequestFinished(reply);
+
+
+    }
+}
+
+//
+// GOOGLE DRIVE gets the code in the HTML title field (different to other services)
+//
+void
+OAuthManager::loadFinished(bool ok)
+{
+
+    if (site == GOOGLE_DRIVE || site == KENTUNI) {
+
+        if (ok && url.toString().startsWith("https://accounts.google.com/o/oauth2/auth")) {
+
+            // retrieve the code from the HTML page title
+            QString title = view->title();
+
+            if (title.contains("code")) {
+
+                QString code = title.right(title.length()-title.indexOf("code=")-5);
+                QByteArray data;
+#if QT_VERSION > 0x050000
+                QUrlQuery params;
+#else
+                QUrl params;
+#endif
+                QString urlstr = "https://www.googleapis.com/oauth2/v3/token?";
+                params.addQueryItem("client_id", GC_GOOGLE_DRIVE_CLIENT_ID);
+
+                if (site == GOOGLE_DRIVE || site == KENTUNI) {
+                    params.addQueryItem("client_secret", GC_GOOGLE_DRIVE_CLIENT_SECRET);
+                }
+
+                params.addQueryItem("code", code);
+                params.addQueryItem("redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
+                params.addQueryItem("grant_type", "authorization_code");
+
+#if QT_VERSION > 0x050000
+                data.append(params.query(QUrl::FullyEncoded));
+#else
+                data=params.encodedQuery();
+#endif
+
+                // trade-in the temporary access code retrieved by the
+                // Call-Back URL for the finale token
+                QUrl url = QUrl(urlstr);
+                QNetworkRequest request = QNetworkRequest(url);
+                request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+
+                // not get the final token - ignoring errors
+                manager = new QNetworkAccessManager(this);
+                connect(manager, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
+                connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkRequestFinished(QNetworkReply*)));
+                manager->post(request, data);
+            }
+        }
+    }
+}
+
+#if QT_VERSION < 0x050000
+static QString RawJsonStringGrab(const QByteArray& payload,
+                                 const QString& needle) {
+    // A RegExp based JSON string parser. Not the best, but it does the job.
+    QString regex =
+        // This matches the key.
+        "(" + needle + "|\"" + needle + "\"|'" + needle + "')"
+        // Matches the separator.
+        "[\\s]*:[\\s]*"
+        // matches the value.
+        "(\"\\S+\"|'\\S+')";
+    QRegExp q(regex);
+    if (!q.isValid()) {
+        // Somehow failed to build the regex.
+        return "";
+    }
+    int start = q.indexIn(payload);
+    int pos = q.pos(2);
+    if (start == -1 || pos == -1) {
+        // Failed to find the key or the value.
+        return "";
+    }
+    QString ret = payload.mid(pos, q.matchedLength() + start - pos);
+    // Remove " or ' from the value.
+    ret.remove(0, 1);
+    ret.remove(ret.size() - 1, 1);
+    return ret;
+}
+#endif
+
+//
+// STEP 3: REFRESH AND ACCESS TOKEN RECEIVED
+//
+// this is when we get the refresh or access tokens after a redirect has been loaded
+// so pretty much at the end of the process. Each service can have slightly special
+// needs and certainly needs to set the right setting anyway.
+//
+void
+OAuthManager::networkRequestFinished(QNetworkReply *reply)
+{
+
+    // we've been told to ignore responses (used by POLAR, maybe others in future)
+    if (ignore) return;
+
+    // we can handle SSL handshake errors, if we got here then some kind of protocol was agreed
+    if (reply->error() == QNetworkReply::NoError || reply->error() == QNetworkReply::SslHandshakeFailedError) {
+
+        QByteArray payload = reply->readAll(); // JSON
+        QString refresh_token;
+        QString access_token;
+        double polar_userid=0;
+
+        // parse the response and extract the tokens, pretty much the same for all services
+        // although polar choose to also pass a user id, which is needed for future calls
+#if QT_VERSION > 0x050000
+        QJsonParseError parseError;
+        QJsonDocument document = QJsonDocument::fromJson(payload, &parseError);
+        if (parseError.error == QJsonParseError::NoError) {
+            refresh_token = document.object()["refresh_token"].toString();
+            access_token = document.object()["access_token"].toString();
+            if (site == POLAR)  polar_userid = document.object()["x_user_id"].toDouble();
+        }
+#else
+        refresh_token = RawJsonStringGrab(payload, "refresh_token");
+        access_token = RawJsonStringGrab(payload, "access_token");
+#endif
+
+        // if we failed to extract then we have a big problem
+        // google uses a refresh token so trap for them only
+        if (((site == GOOGLE_DRIVE || site == KENTUNI) && refresh_token == "") || access_token == "") {
+
+            // Something failed.
+            // Only Google uses both refresh and access tokens.
+            QString error = QString(tr("Error retrieving authoriation credentials"));
+            QMessageBox oautherr(QMessageBox::Critical, tr("Authorization Error"), error);
+            oautherr.setDetailedText(error);
+            oautherr.exec();
+
+            return;
+        }
+
+        // now set the tokens etc
+        if (site == DROPBOX) {
+
+            service->setSetting(GC_DROPBOX_TOKEN, access_token);
+            QString info = QString(tr("Dropbox authorization was successful."));
+            QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            information.exec();
+
+        } else if (site == SPORTTRACKS) {
+
+            service->setSetting(GC_SPORTTRACKS_TOKEN, access_token);
+            service->setSetting(GC_SPORTTRACKS_REFRESH_TOKEN, refresh_token);
+            service->setSetting(GC_SPORTTRACKS_LAST_REFRESH, QDateTime::currentDateTime());
+            QString info = QString(tr("SportTracks authorization was successful."));
+            QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            information.exec();
+
+        } else if (site == POLAR) {
+
+            service->setSetting(GC_POLARFLOW_TOKEN, access_token);
+            service->setSetting(GC_POLARFLOW_USER_ID, polar_userid);
+
+            // we now need to bind the user, this is a one time deal.
+            QString url = QString("%1/v3/users").arg(GC_POLARFLOW_URL);
+
+            // request using the bearer token
+            QNetworkRequest request(url);
+            request.setRawHeader("Authorization", (QString("Bearer %1").arg(access_token)).toLatin1());
+            request.setRawHeader("Accept", "application/json");
+            request.setRawHeader("Content-Type", "application/json");
+
+            // data to post
+            QByteArray data;
+            data.append(QString("{\"member-id\":\"%1\"}").arg(context->athlete->cyclist));
+
+            // the request will fallback to this method on networkRequestFinished
+            // but we are done, so set ignore= true to get this function to just
+            // return without doing anything
+            ignore=true;
+            QNetworkReply *bind = manager->post(request, data);
+
+            // blocking request
+            QEventLoop loop;
+            connect(bind, SIGNAL(finished()), &loop, SLOT(quit()));
+            loop.exec();
+
+            // Bind response lists athlete details, we ignore them for now
+            QByteArray r = bind->readAll();
+            //qDebug()<<bind->errorString()<< "bind response="<<r;
+
+            QString info = QString(tr("PolarFlow authorization was successful."));
+            QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            information.exec();
+
+        } else if (site == STRAVA) {
+
+            service->setSetting(GC_STRAVA_TOKEN, access_token);
+            QString info = QString(tr("Strava authorization was successful."));
+            QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            information.exec();
+
+        } else if (site == CYCLING_ANALYTICS) {
+
+            service->setSetting(GC_CYCLINGANALYTICS_TOKEN, access_token);
+            QString info = QString(tr("Cycling Analytics authorization was successful."));
+            QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            information.exec();
+
+        } else if (site == KENTUNI) {
+
+            service->setSetting(GC_UOK_GOOGLE_DRIVE_REFRESH_TOKEN, refresh_token);
+            service->setSetting(GC_UOK_GOOGLE_DRIVE_ACCESS_TOKEN, access_token);
+            service->setSetting(GC_UOK_GOOGLE_DRIVE_LAST_ACCESS_TOKEN_REFRESH, QDateTime::currentDateTime());
+            QString info = QString(tr("Kent University Google Drive authorization was successful."));
+            QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            information.exec();
+
+        } else if (site == GOOGLE_DRIVE) {
+
+            service->setSetting(GC_GOOGLE_DRIVE_REFRESH_TOKEN, refresh_token);
+            service->setSetting(GC_GOOGLE_DRIVE_ACCESS_TOKEN, access_token);
+            service->setSetting(GC_GOOGLE_DRIVE_LAST_ACCESS_TOKEN_REFRESH, QDateTime::currentDateTime());
+            QString info = QString(tr("Google Drive authorization was successful."));
+            QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            information.exec();
+
+        } else if (site == TODAYSPLAN) {
+            service->setSetting(GC_TODAYSPLAN_TOKEN, access_token);
+            QString info = QString(tr("Today's Plan authorization was successful."));
+            QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            information.exec();
+        } else if (site == XERT) {
+
+            service->setSetting(GC_XERT_TOKEN, access_token);
+            service->setSetting(GC_XERT_REFRESH_TOKEN, refresh_token);
+
+            // Try without Message Box
+
+            //QString info = QString(tr("Xert authorization was successful."));
+            //QMessageBox information(QMessageBox::Information, tr("Information"), info);
+            //information.exec();
+
+            service->message = "Xert authorization was successful.";
+
+        }
+
+    } else {
+
+            // general error getting response
+            QString error = QString(tr("Error retrieving access token, %1 (%2)")).arg(reply->errorString()).arg(reply->error());
+            QMessageBox oautherr(QMessageBox::Critical, tr("SSL Token Refresh Error"), error);
+            oautherr.setDetailedText(error);
+            oautherr.exec();
+    }
+
+    // job done, dialog can be closed
+    //accept();
+}

deprecated/OAuthManager.h

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2009 Justin F. Knotzke (jknotzke@shampoo.ca)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef OAUTHMANAGER_H
+#define OAUTHMANAGER_H
+#include "GoldenCheetah.h"
+#include "Pages.h"
+#include "CloudService.h"
+#ifdef GC_HAVE_KQOAUTH
+#include <kqoauthmanager.h>
+#endif
+#include <QObject>
+#include <QtGui>
+#include <QWidget>
+#include <QStackedLayout>
+#include <QUrl>
+#include <QSslSocket>
+#ifndef NOWEBKIT
+#include <QtWebKit>
+#include <QWebView>
+#include <QWebFrame>
+#endif
+
+// QUrl split into QUrlQuerty in QT5
+#if QT_VERSION > 0x050000
+#include <QUrlQuery>
+#endif
+// QWebEngine if on Mac, -or- we don't have webkit
+#if defined(NOWEBKIT) || ((QT_VERSION > 0x050000) && defined(Q_OS_MAC))
+#include <QWebEngineHistory>
+#include <QWebEngineHistoryItem>
+#include <QWebEnginePage>
+#include <QWebEngineView>
+#include <QWebEngineProfile>
+#if (QT_VERSION >= 0x050600)
+#include <QWebEngineCookieStore>
+#endif
+#endif
+
+
+class OAuthManager : QObject
+{
+    Q_OBJECT
+    G_OBJECT
+
+public:
+    typedef enum {
+        NONE=0,
+        STRAVA,
+        DROPBOX,
+        CYCLING_ANALYTICS,
+        GOOGLE_DRIVE,
+        SPORTTRACKS,
+        TODAYSPLAN,
+        WITHINGS,
+        POLAR,
+        KENTUNI,
+        XERT
+    } OAuthSite;
+
+    // will work with old config via site and new via cloudservice (which is null for calendar and withings for now)
+    OAuthManager(Context *context, OAuthSite site, CloudService *service, QString baseURL="", QString clientsecret="");
+
+    void authorize();
+    void getTokenWithCode(QString code);
+    bool sslLibMissing() { return noSSLlib; }
+
+private slots:
+    // Strava/Cyclinganalytics/Google
+
+    void loadFinished(bool ok);
+    void networkRequestFinished(QNetworkReply *reply);
+    void onSslErrors(QNetworkReply *reply, const QList<QSslError>&error);
+
+#ifdef GC_HAVE_KQOAUTH
+    void onTemporaryTokenReceived(QString, QString);
+    void onAuthorizationReceived(QString, QString);
+    void onAccessTokenReceived(QString token, QString tokenSecret);
+    void onAuthorizedRequestDone();
+    void onRequestReady(QByteArray response);
+    void onAuthorizationPageRequested (QUrl pageUrl);
+#endif
+
+
+private:
+    Context *context;
+    bool noSSLlib;
+    bool ignore;
+    OAuthSite site;
+    CloudService *service;
+    QString baseURL; // can be passed, but typically is blank (used by Todays Plan)
+    QString clientsecret; // can be passed, but typicall is blank (used by Todays Plan)
+
+    QVBoxLayout *layout;
+
+    // QUrl split into QUrlQuerty in QT5
+#if defined(NOWEBKIT) || ((QT_VERSION > 0x050000) && defined(Q_OS_MAC))
+    QWebEngineView *view;
+#else
+    QWebView *view;
+#endif
+
+    QNetworkAccessManager* manager;
+
+    QUrl url;
+
+#ifdef GC_HAVE_KQOAUTH
+    KQOAuthManager *oauthManager;
+    KQOAuthRequest *oauthRequest;
+#endif
+};
+
+#endif // OAUTHMANAGER_H

deprecated/ShareDialog.cpp

@@ -31,6 +31,7 @@
 
 // access to metrics
 #include "RideMetric.h"
+#include "JsonRideFile.h"
 #include "TcxRideFile.h"
 
 #ifdef Q_CC_MSVC
@@ -55,6 +56,13 @@ ShareDialogUploader::wasUploaded()
     return false;
 }
 
+// just ignore handshake errors
+void
+ShareDialogUploader::onSslErrors(QNetworkReply *reply, const QList<QSslError>&)
+{
+    reply->ignoreSslErrors();
+}
+
 //
 // Utility function to create a QByteArray of data in GZIP format
 // This is essentially the same as qCompress but creates it in
@@ -130,6 +138,15 @@ ShareDialog::ShareDialog(Context *context, RideItem *item) :
     }
     vbox1->addWidget(rideWithGPSChk,0,col++);
 
+    todaysPlanUploader = new TodaysPlanUploader(context, ride, this);
+    todaysPlanChk = new QCheckBox(tr("Today's Plan"));
+    if( ! todaysPlanUploader->canUpload( err ) ){
+        todaysPlanChk->setEnabled( false );
+    } else if( ! todaysPlanUploader->wasUploaded() ){
+        todaysPlanChk->setChecked( true );
+    }
+    vbox1->addWidget(todaysPlanChk,0,col++);
+
     cyclingAnalyticsUploader = new CyclingAnalyticsUploader(context, ride, this);
     cyclingAnalyticsChk = new QCheckBox(tr("Cycling Analytics"));
     if( ! cyclingAnalyticsUploader->canUpload( err ) ){
@@ -239,15 +256,17 @@ ShareDialog::ShareDialog(Context *context, RideItem *item) :
     commuteChk = new QCheckBox(tr("Commute"));
     trainerChk = new QCheckBox(tr("Trainer"));
 
-    const RideFileDataPresent *dataPresent = ride->ride()->areDataPresent();
-    altitudeChk->setEnabled(dataPresent->alt);
-    altitudeChk->setChecked(dataPresent->alt);
-    powerChk->setEnabled(dataPresent->watts);
-    powerChk->setChecked(dataPresent->watts);
-    cadenceChk->setEnabled(dataPresent->cad);
-    cadenceChk->setChecked(dataPresent->cad);
-    heartrateChk->setEnabled(dataPresent->hr);
-    heartrateChk->setChecked(dataPresent->hr);
+    if (ride) {
+        const RideFileDataPresent *dataPresent = ride->ride()->areDataPresent();
+        altitudeChk->setEnabled(dataPresent->alt);
+        altitudeChk->setChecked(dataPresent->alt);
+        powerChk->setEnabled(dataPresent->watts);
+        powerChk->setChecked(dataPresent->watts);
+        cadenceChk->setEnabled(dataPresent->cad);
+        cadenceChk->setChecked(dataPresent->cad);
+        heartrateChk->setEnabled(dataPresent->hr);
+        heartrateChk->setChecked(dataPresent->hr);
+    }
 
     QGridLayout *vbox3 = new QGridLayout();
     //vbox3->addWidget(gpsChk,0,0);
@@ -297,6 +316,7 @@ ShareDialog::upload()
     if ( !rideWithGPSChk->isChecked() && !selfLoopsChk->isChecked()
         && !veloHeroChk->isChecked() && !trainingstagebuchChk->isChecked()
         && !stravaChk->isChecked() && !cyclingAnalyticsChk->isChecked()
+        && !todaysPlanChk->isChecked()
         && !sportplushealthChk->isChecked() //&& !garminChk->isChecked()
         ) {
         QMessageBox aMsgBox;
@@ -318,6 +338,9 @@ ShareDialog::upload()
     if (rideWithGPSChk->isChecked()) {
         shareSiteCount ++;
     }
+    if (todaysPlanChk->isChecked()) {
+        shareSiteCount ++;
+    }
     if (cyclingAnalyticsChk->isChecked()) {
         shareSiteCount ++;
     }
@@ -343,6 +366,9 @@ ShareDialog::upload()
     if (rideWithGPSChk->isEnabled() && rideWithGPSChk->isChecked()) {
         doUploader( rideWithGpsUploader );
     }
+    if (todaysPlanChk->isEnabled() && todaysPlanChk->isChecked()) {
+        doUploader( todaysPlanUploader );
+    }
     if (cyclingAnalyticsChk->isEnabled() && cyclingAnalyticsChk->isChecked()) {
         doUploader( cyclingAnalyticsUploader );
     }
@@ -417,6 +443,13 @@ ShareDialog::doUploader( ShareDialogUploader *uploader )
     uploader->upload();
 }
 
+//
+// Uploader
+//
+
+// Strava
+// ----------------
+
 StravaUploader::StravaUploader(Context *context, RideItem *ride, ShareDialog *parent) :
     ShareDialogUploader( tr("Strava"), context, ride, parent)
 {
@@ -489,6 +522,8 @@ StravaUploader::requestUploadStrava()
 
     // trap network response from access manager
     networkManager->disconnect();
+    connect(networkManager, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this,
+            SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
     connect(networkManager, SIGNAL(finished(QNetworkReply*)), this,
             SLOT(requestUploadStravaFinished(QNetworkReply*)));
     connect(networkManager, SIGNAL(finished(QNetworkReply *)), eventLoop,
@@ -706,6 +741,9 @@ StravaUploader::requestVerifyUploadFinished(QNetworkReply *reply)
     }
 }
 
+// RideWithGps
+// ----------------
+
 RideWithGpsUploader::RideWithGpsUploader(Context *context, RideItem *ride, ShareDialog *parent) :
     ShareDialogUploader( tr("Ride With GPS"), context, ride, parent)
 {
@@ -767,6 +805,7 @@ RideWithGpsUploader::requestUploadRideWithGPS()
     QTime rideTime = QTime(hour, minute, second);
     QDateTime rideDateTime = QDateTime(rideDate, rideTime);
 
+    connect(&networkMgr, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
     connect(&networkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestUploadRideWithGPSFinished(QNetworkReply*)));
     connect(&networkMgr, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));
     QString out, data;
@@ -889,6 +928,161 @@ RideWithGpsUploader::requestUploadRideWithGPSFinished(QNetworkReply *reply)
     }
 }
 
+// Today's Plan
+// ----------------
+
+TodaysPlanUploader::TodaysPlanUploader(Context *context, RideItem *ride, ShareDialog *parent) :
+    ShareDialogUploader(tr("TodaysPlan"), context, ride, parent)
+{
+    todaysPlanUploadId = ride->ride()->getTag("TodaysPlan uploadId", "0").toInt();
+}
+
+bool
+TodaysPlanUploader::canUpload( QString &err )
+{
+#ifdef GC_TODAYSPLAN_CLIENT_SECRET
+    token = appsettings->cvalue(context->athlete->cyclist, GC_TODAYSPLAN_TOKEN, "").toString();
+    if( token!="" )
+        return true;
+
+    err = tr("no Today's Plan token set. Please authorize in Settings.");
+#else
+    err = tr("Today's Plan support isn't enabled in this build");
+#endif
+    return false;
+}
+
+bool
+TodaysPlanUploader::wasUploaded()
+{
+    return todaysPlanUploadId>0;
+}
+
+void
+TodaysPlanUploader::upload()
+{
+    // OAuth no more login
+    token = appsettings->cvalue(context->athlete->cyclist, GC_TODAYSPLAN_TOKEN, "").toString();
+    if (token=="")
+        return;
+
+    requestUploadTodaysPlan();
+
+    if(!uploadSuccessful)
+    {
+        parent->progressLabel->setText(tr("Error uploading to Today's Plan"));
+    }
+    else
+    {
+        parent->progressLabel->setText(tr("Successfully uploaded to Today's Plan"));
+    }
+}
+
+void
+TodaysPlanUploader::requestUploadTodaysPlan()
+{
+    parent->progressLabel->setText(tr("Upload to Today's Plan..."));
+    parent->progressBar->setValue(parent->progressBar->value()+10/parent->shareSiteCount);
+
+    QEventLoop eventLoop;
+    QNetworkAccessManager networkMgr;
+
+    connect(&networkMgr, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
+    connect(&networkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestUploadTodaysPlanFinished(QNetworkReply*)));
+    connect(&networkMgr, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));
+
+    QString url = QString("%1/rest/files/upload")
+          .arg(appsettings->cvalue(context->athlete->cyclist, GC_TODAYSPLAN_URL, "https://whats.todaysplan.com.au").toString());
+
+    QNetworkRequest request(url);
+
+    QString boundary = QVariant(qrand()).toString()+QVariant(qrand()).toString()+QVariant(qrand()).toString();
+
+    //TcxFileReader reader;
+    JsonFileReader reader;
+    QByteArray file = zCompress(reader.toByteArray(context, ride->ride(), parent->altitudeChk->isChecked(), parent->powerChk->isChecked(), parent->heartrateChk->isChecked(), parent->cadenceChk->isChecked()));
+    QString    rideName = ride->fileName;
+    rideName.append(".gz");
+
+    // MULTIPART *****************
+
+    QHttpMultiPart *multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
+    multiPart->setBoundary(boundary.toLatin1());
+
+    request.setRawHeader("Authorization", (QString("Bearer %1").arg(token)).toLatin1());
+
+    QHttpPart jsonPart;
+    jsonPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"json\""));
+    QString json = QString("{ filename: \"%1\"; name: \"%2\" }").arg(rideName).arg(parent->titleEdit->text());
+    jsonPart.setBody(json.toLatin1());
+
+    QHttpPart attachmentPart;
+    attachmentPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"attachment\"; type=\"text/xml\""));
+    attachmentPart.setBody(file);
+
+    multiPart->append(jsonPart);
+    multiPart->append(attachmentPart);
+
+    networkMgr.post(request, multiPart);
+
+    parent->progressBar->setValue(parent->progressBar->value()+30/parent->shareSiteCount);
+    parent->progressLabel->setText(tr("Upload... Sending to Today's Plan"));
+
+    eventLoop.exec();
+}
+
+void
+TodaysPlanUploader::requestUploadTodaysPlanFinished(QNetworkReply *reply)
+{
+    parent->progressBar->setValue(parent->progressBar->value()+50/parent->shareSiteCount);
+    parent->progressLabel->setText(tr("Upload to Today's Plan finished."));
+    uploadSuccessful = false;
+
+    QString uploadError;
+    try {
+
+        // parse the response
+        QString response = reply->readAll();
+        //qDebug() << "response" << response;
+        MVJSONReader jsonResponse(string(response.toLatin1()));
+
+        // get values
+        QString state = jsonResponse.root->getFieldString("state").c_str();
+        if (state == "error")
+            uploadError = jsonResponse.root->getFieldString("message").c_str();
+        todaysPlanUploadId = jsonResponse.root->getFieldInt("id");
+
+    } catch(...) {
+
+        // problem!
+        uploadError = "bad response or parser exception.";
+        todaysPlanUploadId = 0;
+    }
+
+    // if not there clean out
+    if (uploadError.toLower() == "none" || uploadError.toLower() == "null")
+        uploadError = "";
+
+    if (uploadError.length()>0 || reply->error() != QNetworkReply::NoError) {
+        //qDebug() << "Error " << reply->error() ;
+        //qDebug() << "Error " << uploadError;
+        parent->errorLabel->setText(parent->errorLabel->text()+ tr(" Error from Today's Plan: ") + uploadError + "\n" );
+
+    } else {
+
+        // Success
+        ride->ride()->setTag("TodaysPlan uploadId", QString("%1").arg(todaysPlanUploadId));
+        ride->setDirty(true);
+
+        //qDebug() << "uploadId: " << todaysPlanUploadId << rideName;
+        parent->progressBar->setValue(parent->progressBar->value()+10/parent->shareSiteCount);
+        uploadSuccessful = true;
+    }
+}
+
+// CyclingAnalytics
+// ----------------
+
 CyclingAnalyticsUploader::CyclingAnalyticsUploader(Context *context, RideItem *ride, ShareDialog *parent) :
     ShareDialogUploader(tr("CyclingAnalytics"), context, ride, parent)
 {
@@ -945,6 +1139,7 @@ CyclingAnalyticsUploader::requestUploadCyclingAnalytics()
     QEventLoop eventLoop;
     QNetworkAccessManager networkMgr;
 
+    connect(&networkMgr, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
     connect(&networkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestUploadCyclingAnalyticsFinished(QNetworkReply*)));
     connect(&networkMgr, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));
 
@@ -1038,6 +1233,9 @@ CyclingAnalyticsUploader::requestUploadCyclingAnalyticsFinished(QNetworkReply *r
     }
 }
 
+// SelfLoops
+// ----------------
+
 SelfLoopsUploader::SelfLoopsUploader(Context *context, RideItem *ride, ShareDialog *parent) :
     ShareDialogUploader(tr("SelfLoops"),context, ride, parent)
 {
@@ -1098,6 +1296,7 @@ SelfLoopsUploader::requestUploadSelfLoops()
     QEventLoop eventLoop;
     QNetworkAccessManager networkMgr;
 
+    connect(&networkMgr, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
     connect(&networkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestUploadSelfLoopsFinished(QNetworkReply*)));
     connect(&networkMgr, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));
 

deprecated/ShareDialog.h

@@ -63,6 +63,10 @@ protected:
     Context *context;
     RideItem *ride;
     ShareDialog *parent;
+
+private slots:
+    void onSslErrors(QNetworkReply *reply, const QList<QSslError>&error);
+
 };
 
 // uploader to strava.com
@@ -123,6 +127,33 @@ private:
     bool loggedIn, uploadSuccessful;
 };
 
+// uploader to todaysplan.com
+class TodaysPlanUploader : public ShareDialogUploader
+{
+    Q_OBJECT
+    G_OBJECT
+
+public:
+    TodaysPlanUploader(Context *context, RideItem *item, ShareDialog *parent = 0);
+
+    virtual bool canUpload( QString &err );
+    virtual bool wasUploaded();
+    virtual void upload();
+
+private slots:
+    void requestUploadTodaysPlan();
+    void requestUploadTodaysPlanFinished(QNetworkReply *reply);
+
+private:
+    QString token;
+
+    bool loggedIn, uploadSuccessful;
+
+    QString uploadStatus;
+    int uploadProgress;
+    int todaysPlanUploadId;
+};
+
 // uploader to cyclinganalytics.com
 class CyclingAnalyticsUploader : public ShareDialogUploader
 {
@@ -261,6 +292,7 @@ private:
 
 
      QCheckBox *stravaChk;
+     QCheckBox *todaysPlanChk;
      QCheckBox *cyclingAnalyticsChk;
      QCheckBox *rideWithGPSChk;
      QCheckBox *selfLoopsChk;
@@ -272,6 +304,7 @@ private:
      RideItem *ride;
 
      ShareDialogUploader *stravaUploader;
+     ShareDialogUploader *todaysPlanUploader;
      ShareDialogUploader *cyclingAnalyticsUploader;
      ShareDialogUploader *rideWithGpsUploader;
      ShareDialogUploader *selfLoopsUploader;

deprecated/TwitterDialog.cpp

@@ -21,6 +21,7 @@
 #include "Context.h"
 #include "Settings.h"
 #include "TimeUtils.h"
+#include "Secrets.h"
 #include <QUrl>
 #include <kqoauthmanager.h>
 #include <kqoauthrequest.h>

deprecated/kqoauth/kqoauthmanager.cpp

@@ -228,6 +228,7 @@ void KQOAuthManager::executeRequest(KQOAuthRequest *request) {
         urlWithParams.setQuery(query);
 #endif
         networkRequest.setUrl(urlWithParams);
+        qDebug() << "urlWithParams:" << urlWithParams;
 
         // Submit the request including the params.
         QNetworkReply *reply = d->networkManager->get(networkRequest);

doc/user/bodymeasures-format-example-date.csv

@@ -0,0 +1,4 @@
+date,weightkg,fatkg,boneskg,musclekg,leankg,fatpercent,comment
+2017-01-01T12:00:00Z,2,3,4,5,6,7,Useless data - but valid format
+2017-01-02T12:00:00Z,80.15,12.10,5.4,0,32.5,11.57,Test Value
+2017-01-03T12:00:00Z,81.15,12.10,5.4,0,32.5,12.57,"Here the comment text contain commas itself, so it needs quotes"

doc/user/bodymeasures-format-example-ts.csv

@@ -0,0 +1,4 @@
+ts,weightkg,fatkg,boneskg,musclekg,leankg,fatpercent,comment
+1,2,3,4,5,6,7,Is a technically valid entry but the timestamp is 1 second of Epoch so it will never be in the possible time range
+1479632565,80.15,12.10,5.4,0,32.5,11.57,Test Value
+1479632865,81.15,12.10,5.4,0,32.5,12.57,"Here the comment text contain commas itself, so it needs quotes"

doc/user/bodymeasures-format.txt

@@ -0,0 +1,59 @@
+Description of File-Format for "Body Measures - .CSV Import" function
+---------------------------------------------------------------------
+
+Example for Timestamp is provided here:
+
+----
+ts,weightkg,fatkg,boneskg,musclekg,leankg,fatpercent,comment
+1,2,3,4,5,6,7,Is a technically valid entry, but the timestamp is 1 second of Epoch
+1479632565,80.15,12.10,5.4,0,32.5,1157,Test Value
+1479632865,80.15,12.10,5.4,0,32.5,1157,"Here the comment text contain commas itself, so it needs quotes"
+
+----
+Example for Date/Time is provided here:
+
+date,weightkg,fatkg,boneskg,musclekg,leankg,fatpercent,comment
+2017-01-01T12:00:00Z,2,3,4,5,6,7,Useless data - but valid format
+2017-01-02T12:00:00Z,80.15,12.10,5.4,0,32.5,1157,Test Value
+2017-01-02T12:00:00Z,80.15,12.10,5.4,0,32.5,1157,"Here the comment text contain commas itself, so it needs quotes"
+
+
+a) Header Line
+First Line of a valid file has to contain header information. This has to be a comma-separated 
+list of the measures provided in the data lines. You do not need to provide all possible measures,
+but at least "ts" and "weightkg".
+
+As mandatory field you need time/date of the measures. There are 2 options:
+- "ts" 			- Unix timestamp (in seconds) since Epoch. The value can be calcuated in XLS - just Google how-to.
+OR
+- "date"		- ISO8601 formatted Date/Time String 
+
+The mandatory measure is:
+- "weightkg" 	- Athlete weight in kilograms
+
+The optional measures are:
+- "fatkg" 		- Fat mass in kg
+- "boneskg" 	- Bone mass in kg
+- "musclekg"	- Muscle mass in kg
+- "leankg"		- Lean mass in kg
+- "fatpercent"	- Fat percentage
+- "comment"		- A description of the measures
+
+Data formats:
+
+- "ts" 		is a 64Bit Integer - any other time will be rejected
+- "date"	is a ISO8601 formated date/time 
+- "comment"	is a String - if it contains "commas" itself the string must be enclosed by "string with comma, and more comment"
+- all other measures are float/double in format <xxxxxxx.yyy> 
+
+There are very strict format checks when importing. Only if the whole
+file is correct the data is imported. Any error (even in a single entry)
+will block the complete import.
+
+The following error will stop the import.
+- Unknown measures in header
+- Number of measures in header is different to number in an item
+- Item measure in wrong format
+- "ts" or "weightkg" is missing
+
+

doc/user/formula-syntax.txt

@@ -23,6 +23,10 @@ isinf(p1)
 isnan(p1)
 
 LIST / VECTOR REDUCE FUNCTIONS
+Vectors are about collecting data from across a date range, specified as
+    expression[[Date_From:Date_To]]
+where dates can be absolute s.t. 2017/09/19 or relative s.t. Date-7
+you can use them within a formula using the following functions:
 sum(...)
 mean(...)
 max(...)
@@ -77,6 +81,9 @@ DATA PROCESSOR FUNCTIONS
 autoprocess(filter)
 postprocess(processor, filter)
 
+DAILY MEASURES ACCESS
+measure(date, "group", "field")
+
 RIDE SAMPLE DATA
 
 SECS

doc/user/hrvmeasures-format.txt

@@ -0,0 +1,47 @@
+Description of File-Format for "HRV Measures - .CSV Import" function
+---------------------------------------------------------------------
+
+Example file:
+
+timestamp_measurement,HR,AVNN,SDNN,rMSSD,pNN50,LF,HF,HRV4T_Recovery_Points
+2017-04-01 09:56:21 +0000,43.92,1364.75,84.05,67.54,40.48,0.0418,0.0339,8.37
+2017-04-02 09:27:24 +0000,43.42,1348,59.46,56.38,32.56,0.0655,0.0331,8.09
+2017-04-03 07:37:03 +0000,41.38,1502.73,76.92,72.04,60.53,0.0476,0.0516,8.47
+
+this was generated by HRV4Training App with unsupported columns and empty lines removed using a spreasheet.
+
+a) Header Line
+First Line of a valid file has to contain header information. This has to be a comma-separated 
+list of the measures provided in the data lines. You do not need to provide all possible measures,
+but at least "timestamp_measure" and "rMSSD".
+
+As mandatory field you need time/date of the measures:
+- "timestamp_measure" - ISO8601 formatted Date/Time String
+
+The mandatory measure is:
+- "rMSSD" - Square root of the mean of the squares of differences between adjacent NN intervals
+
+The optional measures are:
+- "HR" - Average HR
+- "AVNN" - Average of all NN interval
+- "SDNN" - Standard deviation of all NN intervals
+- "pNN50" - Percentage of differences between adjacent NN intervals that are greater than 50 ms
+- "LF" - Power at Low Frequencies
+- "HF" - Power at High Frequencies
+- "HRV4T_Recovery_Points" - A log transform of rMSSD
+
+Data formats:
+- "date"	is a ISO8601 formated date/time 
+- all other measures are float/double in format <xxxxxxx.yyy> 
+
+There are very strict format checks when importing. Only if the whole
+file is correct the data is imported. Any error (even in a single entry)
+will block the complete import.
+
+The following error will stop the import.
+- Unknown measures in header
+- Number of measures in header is different to number in an item
+- Item measure in wrong format
+- "timestamp_measure" or "rMSSD" is missing
+
+

doc/user/rest-api.txt

@@ -31,3 +31,8 @@ http://localhost:12021              Default base URL
                                     before=yyyy/mm/dd
                                     series=xxx where xxx is one of watts,hr,cad,speed,nm,vam.xPower,NP
                                     Returns an aggregate of the best mean maximal values over the date range
+
+/<athlete>/measures                 List supported measures groups (Body/Hrv for now) 
+/<athlete>/measures/<group>         Fetch Measures from <group> for a Date Range
+                                    since=yyyy/mm/dd
+                                    before=yyyy/mm/dd