1 files changed, 8 insertions, 8 deletions

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp
index 6389822..5182df1 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp
@@ -2,29 +2,29 @@
 #include "datebookweeklstview.h"

 

 #include <qlayout.h>

 

 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,

                            QValueList<EffectiveEvent> &ev2,

-                           QDate &d, bool onM,

+                           QDate &d, bool onM, bool showAmPm,

                            QWidget* parent,

                            const char* name, WFlags fl)

-    : QWidget( parent, name, fl )

+    : QWidget( parent, name, fl ), ampm( showAmPm )

 {

     m_MainLayout = new QHBoxLayout( this );

 

     leftView = 0;

     rightView = 0;

     setEvents(ev1,ev2,d,onM);

 }

 

 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,

-                           QDate &d, bool onM,

+                           QDate &d, bool onM, bool showAmPm,

                            QWidget* parent,

                            const char* name, WFlags fl)

-    : QWidget( parent, name, fl )

+    : QWidget( parent, name, fl ), ampm( showAmPm )

 {

     m_MainLayout = new QHBoxLayout( this );

 

     leftView = 0;

     rightView = 0;

     setEvents(ev1,d,onM);

@@ -32,13 +32,13 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 

 /* setting the variant with both views */

 void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueList<EffectiveEvent> &ev2,QDate &d, bool onM)

 {

     setUpdatesEnabled(false);

     if (!leftView) {

-        leftView=new DateBookWeekLstView(ev1,d,onM,this);

+        leftView=new DateBookWeekLstView(ev1, d, onM, ampm, this);

         m_MainLayout->addWidget(leftView);

         connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

         connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

         connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

         connect (leftView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

         connect (leftView, SIGNAL(redraw()), this, SIGNAL(redraw()));

@@ -49,13 +49,13 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
     } else {

         leftView->hide();

         leftView->setEvents(ev1,d,onM);

     }

 

     if (!rightView) {

-        rightView=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);

+        rightView=new DateBookWeekLstView(ev2, d.addDays(7), onM, ampm, this);

         m_MainLayout->addWidget(rightView);

         connect (rightView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

         connect (rightView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

         connect (rightView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

         connect (rightView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

         connect (rightView, SIGNAL(redraw()), this, SIGNAL(redraw()));

@@ -72,13 +72,13 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
     setUpdatesEnabled(true);

 }

 

 void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM)

 {

     if (!leftView) {

-        leftView=new DateBookWeekLstView(ev1,d,onM,this);

+        leftView=new DateBookWeekLstView(ev1, d, onM, ampm, this);

         m_MainLayout->addWidget(leftView);

         connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

         connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

         connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

         connect (leftView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

         connect (leftView, SIGNAL(redraw()), this, SIGNAL(redraw()));

@@ -96,13 +96,13 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d,
     }

 }

 

 void DateBookWeekLstDblView::setRightEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM)

 {

     if (!rightView) {

-        rightView=new DateBookWeekLstView(ev1,d,onM,this);

+        rightView=new DateBookWeekLstView(ev1, d, onM, ampm, this);

         m_MainLayout->addWidget(rightView);

         connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

         connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

         connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

         connect (leftView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

         connect (leftView, SIGNAL(redraw()), this, SIGNAL(redraw()));