Confilcts solved

[qtmeetings] / src / UserInterface / Views / RoomStatusIndicatorWidget.h

diff --git a/src/UserInterface/Views/RoomStatusIndicatorWidget.h b/src/UserInterface/Views/RoomStatusIndicatorWidget.h
index b13ff65..67d40dc 100644 (file)
--- a/src/UserInterface/Views/RoomStatusIndicatorWidget.h
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.h
@@ -59,12 +59,6 @@ public slots:
         * \param aUntil The new time until the specified status is valid.\r
         */\r
        void statusChanged( const Room::Status aStatus, const QTime aUntil );\r
-       //! Changed the current room.\r
-       /*!\r
-        * This slot is used to inform that current room is changed and it changes\r
-        * the room name label.\r
-        */\r
-       void currentRoomChanged( Room *aRoom );\r
        \r
        void viewResized(const QSize &newSize, const QSize &oldSize) { }\r
 \r