DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

mingw compiler

Browse Source
This commit is contained in:
Aditya Kulkarni
2018-11-01 15:32:34 -07:00
parent 3a5c858457
commit 297dae7f5e
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -5,8 +5,8 @@ matrix:
compiler: clang compiler: clang
addons: addons:
apt: apt:
sources: ['llvm-toolchain-trusty-5.0'] sources: ['llvm-toolchain-precise-3.7']
packages: ['clang-5.0'] packages: ['clang-3.7']
env: env:
- MATRIX_EVAL="CC=clang CXX=clang++" - MATRIX_EVAL="CC=clang CXX=clang++"
@@ -29,6 +29,6 @@ before_install:
script: script:
- qmake -v - qmake -v
- clang++ -v - clang++ -v
- g++-8 -v - g++ -v
- qmake zec-qt-wallet.pro CONFIG+=release -spec linux-clang - qmake zec-qt-wallet.pro CONFIG+=release -spec linux-clang
- make $MATRIX_EVAL - make $MATRIX_EVAL

13
src/connection.cpp
View File

@@ -47,13 +47,10 @@ ConnectionLoader::~ConnectionLoader() {
void ConnectionLoader::loadConnection() { void ConnectionLoader::loadConnection() {
// Priority 1: Try to connect to detect zcash.conf and connect to it. // Priority 1: Try to connect to detect zcash.conf and connect to it.
bool isZcashConfPresent = false;
auto config = autoDetectZcashConf(); auto config = autoDetectZcashConf();
// If not autodetected, go and read the UI Settings // If not autodetected, go and read the UI Settings
if (config.get() != nullptr) { if (config.get() == nullptr) {
isZcashConfPresent = true;
} else {
config = loadFromSettings(); config = loadFromSettings();
if (config.get() == nullptr) { if (config.get() == nullptr) {
@@ -118,13 +115,13 @@ void ConnectionLoader::refreshZcashdState(Connection* connection) {
% "If you are connecting to a remote/non-standard node " % "If you are connecting to a remote/non-standard node "
% "please set the host/port and user/password in the File->Settings menu"; % "please set the host/port and user/password in the File->Settings menu";
showError(explanation); this->showError(explanation);
} else if (err == QNetworkReply::NetworkError::AuthenticationRequiredError) { } else if (err == QNetworkReply::NetworkError::AuthenticationRequiredError) {
auto explanation = QString() auto explanation = QString()
% "Authentication failed. The username / password you specified was " % "Authentication failed. The username / password you specified was "
% "not accepted by zcashd. Try changing it in the File->Settings menu"; % "not accepted by zcashd. Try changing it in the File->Settings menu";
showError(explanation); this->showError(explanation);
} else if (err == QNetworkReply::NetworkError::InternalServerError && !res.is_discarded()) { } else if (err == QNetworkReply::NetworkError::InternalServerError && !res.is_discarded()) {
// The server is loading, so just poll until it succeeds // The server is loading, so just poll until it succeeds
QString status = QString::fromStdString(res["error"]["message"]); QString status = QString::fromStdString(res["error"]["message"]);
@@ -292,9 +289,9 @@ void Connection::doRPC(const json& payload, const std::function<void(json)>& cb,
void Connection::doRPCWithDefaultErrorHandling(const json& payload, const std::function<void(json)>& cb) { void Connection::doRPCWithDefaultErrorHandling(const json& payload, const std::function<void(json)>& cb) {
doRPC(payload, cb, [=] (auto reply, auto parsed) { doRPC(payload, cb, [=] (auto reply, auto parsed) {
if (!parsed.is_discarded() && !parsed["error"]["message"].is_null()) { if (!parsed.is_discarded() && !parsed["error"]["message"].is_null()) {
showTxError(QString::fromStdString(parsed["error"]["message"])); this->showTxError(QString::fromStdString(parsed["error"]["message"]));
} else { } else {
showTxError(reply->errorString()); this->showTxError(reply->errorString());
} }
}); });
} }