From 802c7ac9060c9a36da1ebebd73c06d70400a9213 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Mon, 25 Oct 2021 16:29:57 +0200 Subject: [PATCH] make AbstractNetworkJob::errorString virtual: it is already overriden in practice AbstractNetworkJob::errorString is already overriden but the overrided code is probably never called while the intention looked like the opposite fix that by making the method virtual in base class Signed-off-by: Matthieu Gallien --- src/libsync/abstractnetworkjob.h | 2 +- src/libsync/propagateupload.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsync/abstractnetworkjob.h b/src/libsync/abstractnetworkjob.h index 63391e672..04dadb49e 100644 --- a/src/libsync/abstractnetworkjob.h +++ b/src/libsync/abstractnetworkjob.h @@ -77,7 +77,7 @@ public: bool timedOut() const { return _timedout; } /** Returns an error message, if any. */ - QString errorString() const; + virtual QString errorString() const; /** Like errorString, but also checking the reply body for information. * diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 1a547a3b6..b53cc6520 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -131,7 +131,7 @@ public: return _device; } - QString errorString() + QString errorString() const override { return _errorString.isEmpty() ? AbstractNetworkJob::errorString() : _errorString; } -- 2.30.2