diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-01-13 14:22:33 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-01-13 14:22:33 +0900 |
| commit | 1902ab6d923d2e3e475e5559ff409b68b3c66f67 (patch) | |
| tree | ce2a8c237a2d265b65b0d2a5d060d246fce60340 /jobs | |
| parent | f80065013935a0b32acafd4d96dda271441436fe (diff) | |
| parent | f8f7fb7a00e5100881e347f18e96a5b1a8f56227 (diff) | |
| download | libquotient-1902ab6d923d2e3e475e5559ff409b68b3c66f67.tar.gz libquotient-1902ab6d923d2e3e475e5559ff409b68b3c66f67.zip | |
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/basejob.cpp | 4 | ||||
| -rw-r--r-- | jobs/basejob.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index 6f80bfd7..7fc56287 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -401,12 +401,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 5e2734b1..e9e108c6 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -46,7 +46,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). */ @@ -116,8 +116,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; |