- no default args in method impls

- resolved parameter shadowing problem

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,9 +1,9 @@
 #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;
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
@@ -485,10 +485,10 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
     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;
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
@@ -612,7 +612,7 @@ QDate DateBookWeek::weekDate() const
 // week...
 
 bool calcWeek( const QDate &d, int &week, int &year,
-	       bool startOnMonday = false )
+	       bool startOnMonday )
 {
     int weekNumber;
     int yearNumber;
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
@@ -92,9 +92,9 @@ void DateBookWeekLstHeader::prevWeek() {
 }
 
 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;
@@ -140,9 +140,9 @@ void DateBookWeekLstDayHdr::newEvent() {
     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)
 {
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
@@ -7,8 +7,8 @@
 #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);