Merged and got it partly working

[qtmeetings] / src / BusinessLogic / Engine.h

diff --git a/src/BusinessLogic/Engine.h b/src/BusinessLogic/Engine.h
index c457fae..90f6342 100644 (file)
--- a/src/BusinessLogic/Engine.h
+++ b/src/BusinessLogic/Engine.h
@@ -41,8 +41,6 @@ public:
 
 signals:
 
-       void meetingDetailsFetched( Meeting *aDetailedMeeting );        
-
 private slots:
        //! Slot. Closes the application.
        /*!
@@ -89,29 +87,17 @@ private slots:
         * room storage and calling the roomStatusInfoNeeded() separately on each of them.
         */
        void checkStatusOfAllRooms();
-       //! Slot. Fetches meeting details from the server.
-       /*!
-        * Slot. Fetches meeting details from the server.
-        * \param aMeeting The meeting.
-        */
-       void fetchMeetingDetails( Meeting *aMeeting );
-       //! Slot for receiving the status of the entered password
-       /*!
-        * Slot. Receives the status of the entered password and makes the DeviceManager to change the
-        * operation mode if the password is correct.
-        * \param aPasswordStatus The status of the password.
-        */
-       void passwordEntered( PasswordDialog::PasswordStatus aPasswordStatus );
-       //! Slot for receiving the cancel event of the progress bar.
+       //! Slot for receiving the failure event of operation mode changing.
        /*!
-        * Slot. Receives the cancel event of the progress bar.
+        * Slot. Receives the failure event of operation mode changing.
         */
-       void progressBarCancelled();
+       void changeModeFailed();
        //! Slot for receiving the cancel event of the progress bar.
        /*!
         *  Receives the cancel event of the progress bar when meeting details requested.
         */
-       void fetchMeetingDetailsCancelled();
+       void fetchMeetingDetails( Meeting *aMeeting );
+       void cancelFetchMeetingDetails();
        
        void handleViewEvent();
        void previousViewRestored();
@@ -133,6 +119,8 @@ private slots:
        
        void stopIdleTimeCounter();
        void startIdleTimeCounter();
+
+       void changeDeviceMode( bool aChange );
        
 private:
        // Make the UIManager as friendly class so it can connect to private slots.
@@ -156,14 +144,6 @@ private:
         * \return Index of the meeting if found; otherwise, -1.
         */
        int indexOfMeetingAfter( Room *aRoom, QDateTime aAfter );
-       //! Indicates if the QList contains the Meeting or not.
-       /*!
-        * Indicates if the QList contains the Meeting or not.
-        * \param aList List of meetings.
-        * \param aMeeting The meeting which is seeked in the list for.
-        * \return True if contains; otherwise, false.
-        */
-       static bool isMeetingInList( const QList<Meeting*> &aList, const Meeting *aMeeting );
        //! Slot. Fetches meetings from the server.
        /*!
         * Slot. Fetches meetings from the server, exact parameters are specified in the parameter list.
@@ -204,6 +184,8 @@ private:
         * packages are connected here.
         */
        void connectSignals();
+       
+       bool isMeetingInList(const QList<Meeting*> &aList, const Meeting *aMeeting);
 
 private:
        static QTime endOfTheDay;