From e6a7ca28ce03ff1277430816dc5a41d503f93555 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Wed, 6 Dec 2017 09:10:50 +0900
Subject: Connection: undeprecate joinRoom()

This is for the same reason as Connection::getThumbnail() - it's the only non-template (hence, supported by QML and Qt queued signal connections) way to invoke joining a room.
---
 connection.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'connection.h')

diff --git a/connection.h b/connection.h
index c67328a6..ecebb2e7 100644
--- a/connection.h
+++ b/connection.h
@@ -182,6 +182,8 @@ namespace QMatrixClient
                                             int requestedWidth,
                                             int requestedHeight) const;
 
+            virtual JoinRoomJob* joinRoom(const QString& roomAlias);
+
             // Old API that will be abolished any time soon. DO NOT USE.
 
             /** @deprecated Use callApi<PostMessageJob>() or Room::postMessage() instead */
@@ -190,8 +192,6 @@ namespace QMatrixClient
             /** @deprecated Use callApi<PostReceiptJob>() or Room::postReceipt() instead */
             virtual PostReceiptJob* postReceipt(Room* room,
                                                 RoomEvent* event) const;
-            /** @deprecated Use callApi<JoinRoomJob>() instead */
-            virtual JoinRoomJob* joinRoom(const QString& roomAlias);
             /** @deprecated Use callApi<LeaveRoomJob>() or Room::leaveRoom() instead */
             virtual void leaveRoom( Room* room );
             /** @deprecated User callApi<RoomMessagesJob>() or Room::getPreviousContent() instead */
-- 
cgit v1.2.3