Merge branch 'master' into kitsune-content-repo-create-room

4 files changed, 8 insertions, 8 deletions

diff --git a/events/event.h b/events/event.h
index 319c3443..6ed5ba49 100644
--- a/events/event.h
+++ b/events/event.h
@@ -290,7 +290,7 @@ namespace QMatrixClient
             QScopedPointer<ContentT> _prev;
     };
 }  // namespace QMatrixClient
-Q_DECLARE_OPAQUE_POINTER(QMatrixClient::Event*)
 Q_DECLARE_METATYPE(QMatrixClient::Event*)
-Q_DECLARE_OPAQUE_POINTER(QMatrixClient::RoomEvent*)
 Q_DECLARE_METATYPE(QMatrixClient::RoomEvent*)
+Q_DECLARE_METATYPE(const QMatrixClient::Event*)
+Q_DECLARE_METATYPE(const QMatrixClient::RoomEvent*)
diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp
index dddff800..f508026f 100644
--- a/jobs/basejob.cpp
+++ b/jobs/basejob.cpp
@@ -392,12 +392,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 1fe3a24d..42f5ecc2 100644
--- a/jobs/basejob.h
+++ b/jobs/basejob.h
@@ -44,7 +44,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). */
@@ -139,8 +139,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;
diff --git a/room.cpp b/room.cpp
index b647a506..28107228 100644
--- a/room.cpp
+++ b/room.cpp
@@ -510,7 +510,7 @@ void Room::Private::addMember(User *u)
     {
         insertMemberIntoMap(u);
         connect(u, &User::nameChanged, q,
-                bind(&Private::renameMember, this, _1, _2));
+                std::bind(&Private::renameMember, this, u, _2));
         emit q->userAdded(u);
     }
 }