Merged and got it partly working

[qtmeetings] / src / UserInterface / Views / WeeklyViewWidget.cpp

diff --git a/src/UserInterface/Views/WeeklyViewWidget.cpp b/src/UserInterface/Views/WeeklyViewWidget.cpp
index 854f841..673d91e 100644 (file)
--- a/src/UserInterface/Views/WeeklyViewWidget.cpp
+++ b/src/UserInterface/Views/WeeklyViewWidget.cpp
@@ -114,7 +114,6 @@ WeeklyViewWidget::WeeklyViewWidget( QDateTime aCurrentDateTime, Configuration *a
 //     connect( iRoomsCombo, SIGNAL( currentRoomChanged( Room * ) ), this, SIGNAL( observedEventDetected() ) );\r
 //     connect( iRoomsCombo, SIGNAL( currentIndexChanged( int ) ), this, SIGNAL( observedEventDetected() ) );\r
        // TODO: connect RoomCombo signals to change meetings data.\r
-       connect( iRoomsCombo, SIGNAL( currentRoomChanged( Room * ) ), iSchedule, SLOT( clear() ) );\r
        connect( iRoomsCombo, SIGNAL( currentRoomChanged( Room * ) ), this, SIGNAL( currentRoomChanged( Room * ) ) );\r
        connect( iRoomsCombo, SIGNAL( currentRoomChanged( Room * ) ), iSchedule, SLOT( refresh() ) );\r
 }\r
@@ -168,11 +167,6 @@ WeeklyViewWidget::~WeeklyViewWidget()
        }\r
 }\r
 \r
-Meeting* WeeklyViewWidget::currentMeeting()\r
-{\r
-       return iSchedule->currentMeeting();\r
-}\r
-\r
 Room* WeeklyViewWidget::currentRoom()\r
 {\r
        return iRoomsCombo->currentRoom();\r
@@ -189,24 +183,15 @@ void WeeklyViewWidget::setCurrentDateTime( QDateTime aCurrentDateTime )
        iSchedule->setCurrentDateTime( aCurrentDateTime );\r
 }\r
 \r
-void WeeklyViewWidget::insertMeeting( Meeting *aMeeting )\r
-{\r
-       iSchedule->insertMeeting( aMeeting );\r
-}\r
-\r
-void WeeklyViewWidget::deleteMeeting( Meeting *aMeeting )\r
-{\r
-       iSchedule->removeMeeting( aMeeting );\r
-}\r
-\r
-void WeeklyViewWidget::updateMeeting( Meeting *aMeeting )\r
+QDate WeeklyViewWidget::beginnigOfShownWeek()\r
 {\r
-       iSchedule->updateMeeting( aMeeting );\r
+       return iSchedule->beginningOfShownWeek();\r
 }\r
 \r
-QDate WeeklyViewWidget::beginnigOfShownWeek()\r
+void WeeklyViewWidget::refreshMeetings( const QList<Meeting*> &aMeetings )\r
 {\r
-       return iSchedule->beginningOfShownWeek();\r
+       qDebug() << "WeeklyViewWidget::refreshMeetings()";\r
+       iSchedule->refreshMeetings( aMeetings );\r
 }\r
 \r
 void WeeklyViewWidget::showCurrentWeek()\r