nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1486 from Joern-R/Test

Browse Source 
Fix Upload - VeloHero.de / Trainingstagebuch.org for QT 5 based builds
This commit is contained in:
Mark Liversedge
2015-08-05 21:43:49 +01:00
parent bbfdbef63e 483e27090d
commit 91716bf57d
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/TrainingstagebuchUploader.cpp
View File

@@ -140,7 +140,7 @@ TrainingstagebuchUploader::requestSettings()
QString password = appsettings->cvalue(context->athlete->cyclist, GC_TTBPASS).toString();
#if QT_VERSION > 0x050000
QUrlQuery urlquery( TTB_URL + "/settings/list" );
QUrlQuery urlquery;
#else
QUrl urlquery( TTB_URL + "/settings/list" );
#endif
@@ -149,12 +149,13 @@ TrainingstagebuchUploader::requestSettings()
urlquery.addQueryItem( "pass", password );
#if QT_VERSION > 0x050000
QUrl url;
url.setQuery(urlquery);
QUrl url (TTB_URL + "/settings/list");
url.setQuery(urlquery.query());
QNetworkRequest request = QNetworkRequest(url);
#else
QNetworkRequest request = QNetworkRequest(urlquery);
#endif
request.setRawHeader( "Accept-Encoding", "identity" );
request.setRawHeader( "Accept", "application/xml" );
request.setRawHeader( "Accept-Charset", "utf-8" );
@@ -175,7 +176,7 @@ TrainingstagebuchUploader::requestSession()
QString password = appsettings->cvalue(context->athlete->cyclist, GC_TTBPASS).toString();
#if QT_VERSION > 0x050000
QUrlQuery urlquery( TTB_URL + "/login/sso" );
QUrlQuery urlquery;
#else
QUrl urlquery( TTB_URL + "/login/sso" );
#endif
@@ -184,8 +185,8 @@ TrainingstagebuchUploader::requestSession()
urlquery.addQueryItem( "pass", password );
#if QT_VERSION > 0x050000
QUrl url;
url.setQuery(urlquery);
QUrl url (TTB_URL + "/login/sso");
url.setQuery(urlquery.query());
QNetworkRequest request = QNetworkRequest(url);
#else
QNetworkRequest request = QNetworkRequest(urlquery);
@@ -237,7 +238,7 @@ TrainingstagebuchUploader::requestUpload()
QHttpPart filePart;
filePart.setHeader(QNetworkRequest::ContentTypeHeader,
QVariant("application/occtet-stream"));
QVariant("application/octet-stream"));
filePart.setHeader(QNetworkRequest::ContentDispositionHeader,
QVariant("form-data; name=\"file\"; filename=\"gc-upload-ttb.pwx\""));
uploadFile->open(QIODevice::ReadOnly);
@@ -250,16 +251,17 @@ TrainingstagebuchUploader::requestUpload()
currentRequest = reqUpload;
#if QT_VERSION > 0x050000
QUrlQuery urlquery( TTB_URL + "/file/upload" );
QUrlQuery urlquery;
#else
QUrl urlquery( TTB_URL + "/file/upload" );
#endif
urlquery.addQueryItem( "view", "xml" );
urlquery.addQueryItem( "sso", sessionId );
#if QT_VERSION > 0x050000
QUrl url;
url.setQuery(urlquery);
QUrl url (TTB_URL + "/file/upload");
url.setQuery(urlquery.query());
QNetworkRequest request = QNetworkRequest(url);
#else
QNetworkRequest request = QNetworkRequest(urlquery);

14
src/VeloHeroUploader.cpp
View File

@@ -139,7 +139,7 @@ VeloHeroUploader::requestSession()
QString password = appsettings->cvalue(context->athlete->cyclist, GC_VELOHEROPASS).toString();
#if QT_VERSION > 0x050000
QUrlQuery urlquery( VELOHERO_URL + "/sso" );
QUrlQuery urlquery;
#else
QUrl urlquery( VELOHERO_URL + "/sso" );
#endif
@@ -148,8 +148,8 @@ VeloHeroUploader::requestSession()
urlquery.addQueryItem( "pass", password );
#if QT_VERSION > 0x050000
QUrl url;
url.setQuery(urlquery);
QUrl url (VELOHERO_URL + "/sso");
url.setQuery(urlquery.query());
QNetworkRequest request = QNetworkRequest(url);
#else
QNetworkRequest request = QNetworkRequest(urlquery);
@@ -199,7 +199,7 @@ VeloHeroUploader::requestUpload()
QHttpPart filePart;
filePart.setHeader(QNetworkRequest::ContentTypeHeader,
QVariant("application/occtet-stream"));
QVariant("application/octet-stream"));
filePart.setHeader(QNetworkRequest::ContentDispositionHeader,
QVariant("form-data; name=\"file\"; filename=\"gc-upload-velohero.pwx\""));
uploadFile->open(QIODevice::ReadOnly);
@@ -212,7 +212,7 @@ VeloHeroUploader::requestUpload()
currentRequest = reqUpload;
#if QT_VERSION > 0x050000
QUrlQuery urlquery( VELOHERO_URL + "/upload/file" );
QUrlQuery urlquery;
#else
QUrl urlquery( VELOHERO_URL + "/upload/file" );
#endif
@@ -220,8 +220,8 @@ VeloHeroUploader::requestUpload()
urlquery.addQueryItem( "sso", sessionId );
#if QT_VERSION > 0x050000
QUrl url;
url.setQuery(urlquery);
QUrl url (VELOHERO_URL + "/upload/file");
url.setQuery(urlquery.query());
QNetworkRequest request = QNetworkRequest(url);
#else
QNetworkRequest request = QNetworkRequest(urlquery);