flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Qt 5.9 fixme comment, formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-02-20 17:11:17 +01:00
parent 669e8b0320
commit 92f67c7eca
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackcore/application.cpp
View File

@@ -1135,8 +1135,7 @@ namespace BlackCore
return CStatusMessage(this).warning("%1 not found. Cannot init crash handler!") << handler; return CStatusMessage(this).warning("%1 not found. Cannot init crash handler!") << handler;
} }
CUrl serverUrl; const CUrl serverUrl = this->getGlobalSetup().getCrashReportServerUrl();
serverUrl = getGlobalSetup().getCrashReportServerUrl();
std::map<std::string, std::string> annotations; std::map<std::string, std::string> annotations;
// Caliper (mini-breakpad-server) annotations // Caliper (mini-breakpad-server) annotations
@@ -1191,8 +1190,8 @@ namespace BlackCore
connect(reply, &QNetworkReply::finished, callback.object(), [ = ] connect(reply, &QNetworkReply::finished, callback.object(), [ = ]
{ {
// Called when finished! // Called when finished!
// QNetworkRequest::FollowRedirectsAttribute would allow auto redirect // QNetworkRequest::FollowRedirectsAttribute would allow auto redirect, but we use our approach as it gives us better control
// but we use our approach as it gives us better control // \fixme: Check again on Qt 5.9: Added redirects policy to QNetworkAccessManager (ManulRedirectsPolicy, NoLessSafeRedirectsPolicy, SameOriginRedirectsPolicy, UserVerifiedRedirectsPolicy)
const bool isRedirect = CNetworkUtils::isHttpStatusRedirect(reply); const bool isRedirect = CNetworkUtils::isHttpStatusRedirect(reply);
if (isRedirect && maxRedirects > 0) if (isRedirect && maxRedirects > 0)
{ {

2
src/blackgui/components/colorselector.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2013 /* Copyright (C) 2015
* swift project Community / Contributors * swift project Community / Contributors
* *
* This file is part of swift Project. It is subject to the license terms in the LICENSE file found in the top-level * This file is part of swift Project. It is subject to the license terms in the LICENSE file found in the top-level