From: Simo Puonti <Simo.Puonti@ixonos.com>
Date: Wed, 27 May 2009 07:37:46 +0000 (+0300)
Subject: Merge branch 'master_merge' into dev_puontsi
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=04e62b2c2bf80b887318399b81604fe5db315a5d;hp=558cbaf123017b357d84109ab11d6c481c347410;p=qtmeetings

Merge branch 'master_merge' into dev_puontsi

Conflicts:
	src/Domain/Configuration/Configuration.cpp
	src/Domain/Configuration/DateTimeSettings.cpp
---

diff --git a/QtMeetings.pro b/QtMeetings.pro
index 5aa48d3..d956225 100644
--- a/QtMeetings.pro
+++ b/QtMeetings.pro
@@ -14,6 +14,8 @@ INCLUDEPATH += src/Domain/ \
     src/UserInterface/Utils/ \
     src/UserInterface/Views/
 HEADERS += src/IO/DeviceControl/OperationModeToggler.h \
+    src/Domain/Configuration/DateTimeSettings.h \
+    src/IO/DeviceControl/OperationModeToggler.h \
     src/UserInterface/Utils/ProgressBar.h \
     src/Domain/Room.h \
     src/Domain/Meeting.h \
@@ -47,6 +49,8 @@ HEADERS += src/IO/DeviceControl/OperationModeToggler.h \
     src/UserInterface/Views/SettingsView.h \
     src/UserInterface/WindowManager.h
 SOURCES += src/IO/DeviceControl/OperationModeToggler.cpp \
+    src/Domain/Configuration/DateTimeSettings.cpp \
+    src/IO/DeviceControl/OperationModeToggler.cpp \
     src/UserInterface/Utils/ProgressBar.cpp \
     src/Domain/Room.cpp \
     src/Domain/Meeting.cpp \
diff --git a/src/Domain/Configuration/DateTimeSettings.cpp b/src/Domain/Configuration/DateTimeSettings.cpp
index 6cf5f1c..b885e6b 100644
--- a/src/Domain/Configuration/DateTimeSettings.cpp
+++ b/src/Domain/Configuration/DateTimeSettings.cpp
@@ -116,5 +116,5 @@ QString DateTimeSettings::dayOfWeek()
 
 	qDebug() << "DateTimeSettings::dayOfWeek: " +this->iDayOfWeek;
 
-	return (this->iDayOfWeek);
+	return(this->iDayOfWeek);
 }