Bugfix: Duplicating events introduced a bug making it impossible to add events Week List view. This fixes it.

1 files changed, 9 insertions, 9 deletions

diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index e8e12ba..5334a16 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -128,25 +128,25 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /*onM*/,
     connect (add, SIGNAL(clicked()), this, SLOT(newEvent()));
 }
 
 void DateBookWeekLstDayHdr::showDay() {
     emit showDate(date.year(), date.month(), date.day());
 }
 void DateBookWeekLstDayHdr::newEvent() {
     QDateTime start, stop;
     start=stop=date;
     start.setTime(QTime(10,0));
     stop.setTime(QTime(12,0));
 
-    emit addEvent(start,stop,"");
+    emit addEvent(start,stop,"",0);
 }
 DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
 					   QWidget* parent,
 					   const char* name,
 					   WFlags fl) :
     OClickableLabel(parent,name,fl),
     event(ev)
 {
     char s[10];
 	if ( ev.startDate() != ev.date() ) { // multiday event (not first day)
 		if ( ev.endDate() == ev.date() ) { // last day
 			strcpy(s, "__|__");
@@ -191,28 +191,28 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 	for (int d=0; d<7; d++) dayOrder[d]=d;
 	dayOrder[0]=7;
     }
 
     for (int i=0; i<7; i++) {
 	// Header
 	DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i),
 							     onMonday,this);
 	connect(hdr, SIGNAL(showDate(int,int,int)),
 		this, SIGNAL(showDate(int,int,int)));
 	connect(hdr, SIGNAL(addEvent(const QDateTime &,
 				     const QDateTime &,
-				     const QString &)),
+				     const QString &, const QString &)),
 		this, SIGNAL(addEvent(const QDateTime &,
 				      const QDateTime &,
-				      const QString &)));
+				      const QString &, const QString &)));
 	layout->addWidget(hdr);
 
 	// Events
 	while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
 		if(!((*it).end().hour()==(*it).start().hour() && (*it).end().minute()==(*it).start().minute())) {	// Skip effective events with no duration. (i.e ending at 00:00)
 			DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,this);
 			layout->addWidget(l);
 			connect (l, SIGNAL(editEvent(const Event &)),
 							this, SIGNAL(editEvent(const Event &)));
 		}
 		it++;
 	}
@@ -230,39 +230,39 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 					       const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
     QHBoxLayout *layout = new QHBoxLayout( this );
 
     DateBookWeekLstView *w=new DateBookWeekLstView(ev1,d,onM,this);
     layout->addWidget(w);
     connect (w, SIGNAL(editEvent(const Event &)),
 	     this, SIGNAL(editEvent(const Event &)));
     connect (w, SIGNAL(showDate(int,int,int)),
 	     this, SIGNAL(showDate(int,int,int)));
     connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &,
-				const QString &)),
+				const QString &,const QString &)),
 	     this, SIGNAL(addEvent(const QDateTime &, const QDateTime &,
-				   const QString &)));
+				   const QString &, const QString &)));
 
 
     w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);
     layout->addWidget(w);
     connect (w, SIGNAL(editEvent(const Event &)),
 	     this, SIGNAL(editEvent(const Event &)));
     connect (w, SIGNAL(showDate(int,int,int)),
 	     this, SIGNAL(showDate(int,int,int)));
     connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &,
-				const QString &)),
+				const QString &, const QString &)),
 	     this, SIGNAL(addEvent(const QDateTime &, const QDateTime &,
-				   const QString &)));
+				   const QString &, const QString &)));
 }
 
 DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
 				  QWidget *parent,
 				  const char *name )
     : QWidget( parent, name ),
       db( newDB ),
       startTime( 0 ),
       ampm( ap ),
       onMonday(onM)
 {
     setFocusPolicy(StrongFocus);
@@ -332,27 +332,27 @@ void DateBookWeekLst::getEvents() {
 	QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
 
 	view=new DateBookWeekLstDblView(el,el2,start,onMonday,scroll);
     } else {
 	view=new DateBookWeekLstView(el,start,onMonday,scroll);
     }
 
     connect (view, SIGNAL(editEvent(const Event &)),
 	     this, SIGNAL(editEvent(const Event &)));
     connect (view, SIGNAL(showDate(int,int,int)),
 	     this, SIGNAL(showDate(int,int,int)));
     connect (view, SIGNAL(addEvent(const QDateTime &, const QDateTime &,
-				   const QString &)),
+				   const QString &, const QString &)),
 	     this, SIGNAL(addEvent(const QDateTime &, const QDateTime &,
-				   const QString &)));
+				   const QString &, const QString &)));
 
     scroll->addChild(view);
     view->show();
     scroll->updateScrollBars();
 }
 
 void DateBookWeekLst::dateChanged(int y, int w) {
     year=y;
     _week=w;
     getEvents();
 }