- 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,12 +1,12 @@
 #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);
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
@@ -482,16 +482,16 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
 	// 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 );
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
@@ -609,13 +609,13 @@ QDate DateBookWeek::weekDate() const
 // 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;
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
@@ -89,15 +89,15 @@ void DateBookWeekLstHeader::nextWeek() {
 }
 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];
@@ -137,15 +137,15 @@ void DateBookWeekLstDayHdr::newEvent() {
     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
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
@@ -4,14 +4,14 @@
 #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;