Fixed errors caused by auto merge that did not work correctly

[qtmeetings] / src / BusinessLogic / Engine.h

diff --git a/src/BusinessLogic/Engine.h b/src/BusinessLogic/Engine.h
index 90f6342..50e5135 100644 (file)
--- a/src/BusinessLogic/Engine.h
+++ b/src/BusinessLogic/Engine.h
@@ -41,6 +41,8 @@ public:
 
 signals:
 
+       void roomStatusChanged( Room::Status aStatus, QTime aUntil );
+
 private slots:
        //! Slot. Closes the application.
        /*!
@@ -67,12 +69,6 @@ private slots:
         * \param aAddInfo Possible addition info.
         */
        void errorHandler( int aCode, const QString &aAddInfo = "" );
-       //! Slot. Fetches meetings from the server.
-       /*!
-        * Slot. Fetches meetings from the server. Parameters are hard coded: the meetings of the default
-        * room from current and +/- 2 weeks are fetched.
-        */
-       void fetchMeetings();
        //! Slot. Saves fetched meetings to the current instance's local storage.
        /*!
         * Slot. Saves fetched meetings to the current instance's local storage. Meetings are soted in a
@@ -120,7 +116,9 @@ private slots:
        void stopIdleTimeCounter();
        void startIdleTimeCounter();
 
-       void changeDeviceMode( bool aChange );
+       void changeDeviceMode();
+       
+       void currentRoomChanged( Room *aRoom );
        
 private:
        // Make the UIManager as friendly class so it can connect to private slots.
@@ -202,6 +200,8 @@ private:
        QTimer *iAutoRefresh;
 
        QList<Meeting*> iMeetings;
+       
+       Room *iCurrentRoom;
 };
 
 #endif /*ENGINE_H_*/