From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Mon, 25 Oct 2021 14:29:57 +0000 (+0200)
Subject: make AbstractNetworkJob::errorString virtual: it is already overriden
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~18^2~88^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=802c7ac9060c9a36da1ebebd73c06d70400a9213;p=nextcloud-desktop.git

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 <matthieu.gallien@nextcloud.com>
---

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;
     }