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

2 files changed, 13 insertions, 13 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
@@ -136,9 +136,9 @@ void DateBookWeekLstDayHdr::newEvent() {
     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,
@@ -199,12 +199,12 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 	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() ) {
@@ -238,11 +238,11 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 	     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);
@@ -250,11 +250,11 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 	     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,
@@ -340,11 +340,11 @@ void DateBookWeekLst::getEvents() {
 	     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();
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index 24f6c83..ea88f20 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -49,9 +49,9 @@ public slots:
     void newEvent(); 
 signals:
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
-		  const QString &str);
+		  const QString &str, const QString &location);
 private:
     QDate date;
 };
 
@@ -81,9 +81,9 @@ public:
 signals:
     void editEvent(const Event &e);
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
-		  const QString &str);
+		  const QString &str, const QString &location);
 private:
     bool onMonday;
 protected slots:
     void keyPressEvent(QKeyEvent *);
@@ -100,9 +100,9 @@ public:
 signals:
     void editEvent(const Event &e);
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
-		  const QString &str);
+		  const QString &str, const QString &location);
 };
 
 class DateBookWeekLst : public QWidget 
 {
@@ -128,9 +128,9 @@ protected slots:
 
 signals:
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop, 
-		  const QString &str);
+		  const QString &str, const QString &location);
     void editEvent(const Event &e);
 
 private:
     DateBookDB *db;