Use shared pointer for the modals

6 files changed, 11 insertions, 11 deletions

diff --git a/include/ChatPage.h b/include/ChatPage.h

index 8332225b..f64d9589 100644
--- a/include/ChatPage.h
+++ b/include/ChatPage.h
@@ -110,8 +110,8 @@ private:
         // Keeps track of the users currently typing on each room.
         QMap<QString, QList<QString>> typingUsers_;
 
-        QuickSwitcher *quickSwitcher_     = nullptr;
-        OverlayModal *quickSwitcherModal_ = nullptr;
+        QSharedPointer<QuickSwitcher> quickSwitcher_;
+        QSharedPointer<OverlayModal> quickSwitcherModal_;
 
         // Matrix Client API provider.
         QSharedPointer<MatrixClient> client_;
diff --git a/include/EmojiPickButton.h b/include/EmojiPickButton.h

index 041e25a6..d4226165 100644
--- a/include/EmojiPickButton.h
+++ b/include/EmojiPickButton.h
@@ -43,5 +43,5 @@ private:
         // Horizontal distance from panel's bottom right corner.
         int horizontal_distance_ = 70;
 
-        EmojiPanel *panel_;
+        QSharedPointer<EmojiPanel> panel_;
 };
diff --git a/include/MainWindow.h b/include/MainWindow.h

index 85cd5a70..a7a2b2e6 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -83,8 +83,8 @@ private:
         ChatPage *chat_page_;
 
         // Used to hide undefined states between page transitions.
-        OverlayModal *progress_modal_;
-        LoadingIndicator *spinner_;
+        QSharedPointer<OverlayModal> progressModal_;
+        QSharedPointer<LoadingIndicator> spinner_;
 
         // Matrix Client API provider.
         QSharedPointer<MatrixClient> client_;
diff --git a/include/RoomList.h b/include/RoomList.h

index c2f4255d..d7b201f1 100644
--- a/include/RoomList.h
+++ b/include/RoomList.h
@@ -76,8 +76,8 @@ private:
         OverlayModal *joinRoomModal_;
         JoinRoomDialog *joinRoomDialog_;
 
-        OverlayModal *leaveRoomModal;
-        LeaveRoomDialog *leaveRoomDialog_;
+        QSharedPointer<OverlayModal> leaveRoomModal_;
+        QSharedPointer<LeaveRoomDialog> leaveRoomDialog_;
 
         QMap<QString, QSharedPointer<RoomInfoListItem>> rooms_;
 
diff --git a/include/TopRoomBar.h b/include/TopRoomBar.h

index 5d8b394e..2c7af218 100644
--- a/include/TopRoomBar.h
+++ b/include/TopRoomBar.h
@@ -77,8 +77,8 @@ private:
 
         FlatButton *settingsBtn_;
 
-        OverlayModal *leaveRoomModal;
-        LeaveRoomDialog *leaveRoomDialog_;
+        QSharedPointer<OverlayModal> leaveRoomModal_;
+        QSharedPointer<LeaveRoomDialog> leaveRoomDialog_;
 
         Avatar *avatar_;
 
diff --git a/include/UserInfoWidget.h b/include/UserInfoWidget.h

index 25dc2265..b2c7b876 100644
--- a/include/UserInfoWidget.h
+++ b/include/UserInfoWidget.h
@@ -68,8 +68,8 @@ private:
 
         QImage avatar_image_;
 
-        OverlayModal *logoutModal_;
-        LogoutDialog *logoutDialog_;
+        QSharedPointer<OverlayModal> logoutModal_;
+        QSharedPointer<LogoutDialog> logoutDialog_;
 
         int logoutButtonSize_;
 };