From f8f7fb7a00e5100881e347f18e96a5b1a8f56227 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 12 Jan 2018 21:41:12 +0900 Subject: BaseJob::maxRetries: Align the type with that of JobTimeoutConfig Fixes some signedness warnings --- jobs/basejob.cpp | 4 ++-- jobs/basejob.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'jobs') diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index 9df3e430..c92c2944 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -319,12 +319,12 @@ BaseJob::duration_t BaseJob::millisToRetry() const return d->retryTimer.isActive() ? d->retryTimer.remainingTime() : 0; } -size_t BaseJob::maxRetries() const +int BaseJob::maxRetries() const { return d->maxRetries; } -void BaseJob::setMaxRetries(size_t newMaxRetries) +void BaseJob::setMaxRetries(int newMaxRetries) { d->maxRetries = newMaxRetries; } diff --git a/jobs/basejob.h b/jobs/basejob.h index 2f75c095..5fcbbc97 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -45,7 +45,7 @@ namespace QMatrixClient class BaseJob: public QObject { Q_OBJECT - Q_PROPERTY(size_t maxRetries READ maxRetries WRITE setMaxRetries) + Q_PROPERTY(int maxRetries READ maxRetries WRITE setMaxRetries) public: /* Just in case, the values are compatible with KJob * (which BaseJob used to inherit from). */ @@ -137,8 +137,8 @@ namespace QMatrixClient int error() const; virtual QString errorString() const; - size_t maxRetries() const; - void setMaxRetries(size_t newMaxRetries); + int maxRetries() const; + void setMaxRetries(int newMaxRetries); Q_INVOKABLE duration_t getCurrentTimeout() const; Q_INVOKABLE duration_t getNextRetryInterval() const; -- cgit v1.2.3