summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/clickablelabel.cpp6
-rw-r--r--core/pim/datebook/datebookday.cpp8
-rw-r--r--core/pim/datebook/datebookweek.cpp2
-rw-r--r--core/pim/datebook/datebookweeklst.cpp12
-rw-r--r--core/pim/datebook/timepicker.cpp4
5 files changed, 16 insertions, 16 deletions
diff --git a/core/pim/datebook/clickablelabel.cpp b/core/pim/datebook/clickablelabel.cpp
index 1dd0d15..128bebb 100644
--- a/core/pim/datebook/clickablelabel.cpp
+++ b/core/pim/datebook/clickablelabel.cpp
@@ -1,18 +1,18 @@
#include "clickablelabel.h"
#include <stdio.h>
-ClickableLabel::ClickableLabel(QWidget* parent = 0,
- const char* name = 0,
- WFlags fl = 0) :
+ClickableLabel::ClickableLabel(QWidget* parent,
+ const char* name,
+ WFlags fl) :
QLabel(parent,name,fl)
{
textInverted=false;
isToggle=false;
isDown=false;
showState(false);
setFrameShadow(Sunken);
}
void ClickableLabel::setToggleButton(bool t) {
isToggle=t;
}
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index d5daab2..67a88e9 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -476,28 +476,28 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
text += "<br><b>" + tr("End") + "</b>: ";
if ( e.endDate() != ev.date() ) {
// multi-day event. Show end date
text += TimeString::longDateString( e.endDate() );
} else {
// Show end time.
text += TimeString::timeString( ev.end(), whichClock, FALSE );
}
text += "<br><br>" + strNote;
setBackgroundMode( PaletteBase );
- QTime s = ev.start();
- QTime e = ev.end();
- int y = s.hour()*60+s.minute();
- int h = e.hour()*60+e.minute()-y;
+ QTime start = ev.start();
+ QTime end = ev.end();
+ int y = start.hour()*60+start.minute();
+ int h = end.hour()*60+end.minute()-y;
int rh = dateBook->dayView()->rowHeight(0);
y = y*rh/60;
h = h*rh/60;
if ( h < 3 )
h = 3;
geom.setY( y );
geom.setHeight( h );
}
DateBookDayWidget::~DateBookDayWidget()
{
}
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index e9fcc39..6532ba4 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -603,25 +603,25 @@ QDate DateBookWeek::weekDate() const
// http://personal.ecu.edu/mccartyr/ISOwdALG.txt
// the week number is return, and the year number is returned in year
// for Instance 2001/12/31 is actually the first week in 2002.
// There is a more mathematical definition, but I will implement it when
// we are pass our deadline.
// For Weeks that start on Sunday... (ahh... home rolled)
// okay, if Jan 1 is on Friday or Saturday,
// it will go to the pervious
// week...
bool calcWeek( const QDate &d, int &week, int &year,
- bool startOnMonday = false )
+ bool startOnMonday )
{
int weekNumber;
int yearNumber;
// remove a pesky warning, (Optimizations on g++)
weekNumber = -1;
int jan1WeekDay = QDate(d.year(), 1, 1).dayOfWeek();
int dayOfWeek = d.dayOfWeek();
if ( !d.isValid() )
return false;
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 7083bc5..85c745a 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -83,27 +83,27 @@ void DateBookWeekLstHeader::setDate(int y, int m, int d) {
QDate new_date(y,m,d);
setDate(new_date);
}
void DateBookWeekLstHeader::nextWeek() {
setDate(date.addDays(7));
}
void DateBookWeekLstHeader::prevWeek() {
setDate(date.addDays(-7));
}
DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM,
- QWidget* parent = 0,
- const char* name = 0,
- WFlags fl = 0 )
+ QWidget* parent,
+ const char* name,
+ WFlags fl )
: DateBookWeekLstDayHdrBase(parent, name, fl) {
date=d;
static const char *wdays="MTWTFSS";
char day=wdays[d.dayOfWeek()-1];
label->setText( QString(QChar(day)) + " " +
QString::number(d.day()) );
add->setText("+");
if (d == QDate::currentDate()) {
@@ -131,27 +131,27 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM,
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,"");
}
DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
- QWidget* parent = 0,
- const char* name = 0,
- WFlags fl = 0) :
+ QWidget* parent,
+ const char* name,
+ WFlags fl) :
ClickableLabel(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, "__|__");
} else {
strcpy(s, " |---");
}
} else {
sprintf(s,"%.2d:%.2d",ev.start().hour(),ev.start().minute());
diff --git a/core/pim/datebook/timepicker.cpp b/core/pim/datebook/timepicker.cpp
index 9097e1b..43e05ad 100644
--- a/core/pim/datebook/timepicker.cpp
+++ b/core/pim/datebook/timepicker.cpp
@@ -1,23 +1,23 @@
#include "timepicker.h"
#include <qbuttongroup.h>
#include <qtoolbutton.h>
#include <qlayout.h>
#include "clickablelabel.h"
#include <qstring.h>
#include <stdio.h>
-TimePicker::TimePicker(QWidget* parent = 0, const char* name = 0,
- WFlags fl = 0) :
+TimePicker::TimePicker(QWidget* parent, const char* name,
+ WFlags fl) :
QWidget(parent,name,fl)
{
QVBoxLayout *vbox=new QVBoxLayout(this);
ClickableLabel *r;
QString s;
// Hour Row
QWidget *row=new QWidget(this);
QHBoxLayout *l=new QHBoxLayout(row);
vbox->addWidget(row);