Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
	QtMeetings.pro
	src/main.cpp

diff --cc QtMeetings.pro
index 75a7e9a,27eec83..f223557
--- 1/QtMeetings.pro
--- 2/QtMeetings.pro
+++ b/QtMeetings.pro
@@@ -85,9 -81,7 +81,7 @@@ RESOURCES += resources/BusinessLogic.qr
  CONFIG += link_pkgconfig
  PKGCONFIG += libalarm
  
 -# DEFINES += QT_NO_DEBUG_OUTPUT
 +//DEFINES += DEBUG_OUTPUT_TO_FILE
- 
  executable.files = qtmeetings
  executable.path = /usr/bin/
  executable.hint = executable

diff --cc src/main.cpp
index a7dc0e2,feaca6e..0f67404
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -1,41 -1,41 +1,41 @@@
 -#include <iostream>\r
 -#include <fstream> \r
 -#include <QApplication>\r
 -#include <QTime>\r
 -#include "Engine.h"\r
 -\r
 -using namespace std;\r
 -\r
 -ofstream logfile;\r
 -\r
 -void DebugOutputHandler( QtMsgType type, const char *msg ) {\r
 -    switch( type ) {\r
 -        case QtDebugMsg:\r
 -            logfile << QTime::currentTime().toString().toAscii().data() << " Debug: " << msg << "\n";\r
 -            logfile.flush();\r
 -            break;\r
 -        case QtCriticalMsg:\r
 -            logfile << QTime::currentTime().toString().toAscii().data() << " Critical: " << msg << "\n";\r
 -            logfile.flush();\r
 -            break;\r
 -        case QtWarningMsg:\r
 -            logfile << QTime::currentTime().toString().toAscii().data() << " Warning: " << msg << "\n";\r
 -            logfile.flush();\r
 -            break;\r
 -        case QtFatalMsg:\r
 -            logfile << QTime::currentTime().toString().toAscii().data() <<  " Fatal: " << msg << "\n";\r
 -            logfile.flush();\r
 -    }\r
 -}\r
 -\r
 -int main( int argc, char *argv[] )\r
 -{\r
 -      #ifndef QT_NO_DEBUG_OUTPUT\r
 -      logfile.open( "/usr/var/qtmeetings.log", ios::app );\r
 -      qInstallMsgHandler( DebugOutputHandler );\r
 -      #endif\r
 -      \r
 -      QApplication app( argc, argv );\r
 -      Engine *engine = new Engine;\r
 -      return app.exec();\r
 -}\r
 +#include <iostream>
 +#include <fstream> 
 +#include <QApplication>
 +#include <QTime>
- #include "WindowManager.h"
++#include "Engine.h"
 +
 +using namespace std;
 +
 +ofstream logfile;
 +
 +void DebugOutputHandler( QtMsgType type, const char *msg ) {
 +    switch( type ) {
 +        case QtDebugMsg:
 +            logfile << QTime::currentTime().toString().toAscii().data() << " Debug: " << msg << "\n";
 +            logfile.flush();
 +            break;
 +        case QtCriticalMsg:
 +            logfile << QTime::currentTime().toString().toAscii().data() << " Critical: " << msg << "\n";
 +            logfile.flush();
 +            break;
 +        case QtWarningMsg:
 +            logfile << QTime::currentTime().toString().toAscii().data() << " Warning: " << msg << "\n";
 +            logfile.flush();
 +            break;
 +        case QtFatalMsg:
 +            logfile << QTime::currentTime().toString().toAscii().data() <<  " Fatal: " << msg << "\n";
 +            logfile.flush();
 +    }
 +}
 +
 +int main( int argc, char *argv[] )
 +{
 +      #ifdef DEBUG_OUTPUT_TO_FILE
-       logfile.open( "/tmp/qtmeetings.log", ios::app );
++      logfile.open( "/usr/var/qtmeetings.log", ios::app );
 +      qInstallMsgHandler( DebugOutputHandler );
 +      #endif
 +      
 +      QApplication app( argc, argv );
-       WindowManager *windowManager = new WindowManager;
++      Engine *engine = new Engine;
 +      return app.exec();
 +}