Confilcts solved

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

diff --git a/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
index 302c931..dbc2b07 100644 (file)
--- a/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
@@ -15,7 +15,6 @@ QTime RoomStatusIndicatorWidget::endOfTheDay = QTime( 23, 59, 0, 0 );
 RoomStatusIndicatorWidget::RoomStatusIndicatorWidget( Room *aDefaultRoom, Room::Status aStatus, QTime aUntil, QString aTimeFormat, QWidget *aParent ) :\r
                ViewBase( ViewBase::ObservedView, aParent ), iTimeFormat( aTimeFormat )\r
 {\r
-       \r
        QFont importantTextFont;\r
        //importantTextFont.setBold( true );\r
        importantTextFont.setPointSize( 20 );\r
@@ -123,7 +122,7 @@ void RoomStatusIndicatorWidget::statusChanged( const Room::Status aStatus, const
                iUntilTextLabel->setText( tr( "until %1" ).arg( aUntil.toString( iTimeFormat ) ) );\r
        }\r
        setPalette( createPalette( aStatus ) );\r
-}\r
+}
 \r
 void RoomStatusIndicatorWidget::currentRoomChanged( Room *aRoom )\r
 {\r