Got the new stuff working, last commit before final pull push

[qtmeetings] / src / BusinessLogic / Engine.cpp

diff --git a/src/BusinessLogic/Engine.cpp b/src/BusinessLogic/Engine.cpp
index 07563eb..218f9c5 100644 (file)
--- a/src/BusinessLogic/Engine.cpp
+++ b/src/BusinessLogic/Engine.cpp
@@ -95,26 +95,6 @@ void Engine::closeApplication()
        QTimer::singleShot( 1000, QApplication::instance(), SLOT( quit() ));
 }
 
-<<<<<<< HEAD:src/BusinessLogic/Engine.cpp
-=======
-void Engine::observedEventDetected()
-{
-       qDebug() << "Engine::observedEventDetected()";
-       if ( !iIdleTimeCounter->isActive() )
-       {
-               iWindowManager->weeklyView()->showCurrentWeek();
-       }
-       iWindowManager->showWeeklyView();
-       // prepare to restart idle counter
-       if (iIdleTimeCounter->isActive() )
-       {
-               iIdleTimeCounter->stop();
-       }
-       // (re)start idle counter
-       iIdleTimeCounter->start();
-}
-
->>>>>>> 60b7802da53961d1998e276858bbc5e404b98a05:src/BusinessLogic/Engine.cpp
 Room* Engine::defaultRoom()
 {
        qDebug() << "Engine::defaultRoom()";