summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookweeklst.cpp18
-rw-r--r--core/pim/datebook/datebookweeklst.h8
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
@@ -134,13 +134,13 @@ void DateBookWeekLstDayHdr::showDay() {
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),
@@ -197,16 +197,16 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
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);
@@ -236,27 +236,27 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
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 ),
@@ -338,15 +338,15 @@ void DateBookWeekLst::getEvents() {
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();
}
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
@@ -47,13 +47,13 @@ public:
public slots:
void showDay();
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;
};
class DateBookWeekLstEvent: public OClickableLabel
{
@@ -79,13 +79,13 @@ public:
WFlags fl = 0 );
~DateBookWeekLstView();
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 *);
};
@@ -98,13 +98,13 @@ public:
QWidget* parent = 0, const char* name = 0,
WFlags fl = 0 );
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
{
Q_OBJECT
@@ -126,13 +126,13 @@ protected slots:
void keyPressEvent(QKeyEvent *);
void setDbl(bool on);
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;
int startTime;
bool ampm;