[Kstars-devel] KDE/kdeedu/libkdeedu/extdate

[Jason Harris]

SVN commit 472623 by harris:

Fix compilation in libkdeedu/extdate, thanks to whomever reported this a 
while ago, and sorry I took so long.

CCMAIL: kstars-devel at kde.org


 M  +5 -3      extdatetimeedit.cpp  
 M  +4 -4      extdatetimeedit.h  


--- trunk/KDE/kdeedu/libkdeedu/extdate/extdatetimeedit.cpp #472622:472623
@@ -51,7 +51,8 @@
 }
 
 ExtDateEdit::ExtDateEdit( int jd, QWidget *parent ) {
-	ExtDateEdit( ExtDate(jd), parent );
+	ExtDate ed(jd);
+	ExtDateEdit( ed, parent );
 }
 
 ExtDateEdit::~ExtDateEdit() {
@@ -205,8 +206,9 @@
 	hlay->addWidget( m_TimeEdit );
 }
 
-ExtDateTimeEdit::ExtDateTimeEdit( const ExtDate &d, const QTime &t, QWidget *parent ) {
-	ExtDateTimeEdit( ExtDateTime( d, t ), parent );
+ExtDateTimeEdit::ExtDateTimeEdit( const ExtDate &date, const QTime &time, QWidget *parent ) {
+	ExtDateTime dt( date, time );
+	ExtDateTimeEdit( dt, parent );
 }
 
 ExtDateTimeEdit::~ExtDateTimeEdit() {
--- trunk/KDE/kdeedu/libkdeedu/extdate/extdatetimeedit.h #472622:472623
@@ -65,7 +65,7 @@
 	*@p d the date to display (default is current system time)
 	*@p parent pointer to the parent widget (default: 0)
 	*/
-		ExtDateEdit( const ExtDate &d = ExtDate::currentDate(), QWidget *parent = 0 );
+		ExtDateEdit( const ExtDate &date = ExtDate::currentDate(), QWidget *parent = 0 );
 /**
 	*@short Constructor.  Creates an ExtDateEdit displaying the 
 	*given date.
@@ -117,7 +117,7 @@
 	*@p d reference to the new ExtDate
 	*@see date()
 	*/
-		void setDate( const ExtDate &d ) { m_Date = d; setValue( m_Date.jd() ); }
+		void setDate( const ExtDate &date ) { m_Date = date; setValue( m_Date.jd() ); }
 
 /**
 	*@return the currently-active Date field (Day=0; Month=1; Year=2)
@@ -248,7 +248,7 @@
 	*@p t reference to a QTime which is to be displayed in the time box
 	*@p p pointer to the parent widget (default: 0)
 	*/
-		ExtDateTimeEdit( const ExtDate &d, const QTime &t, QWidget *p=0 );
+		ExtDateTimeEdit( const ExtDate &date, const QTime &time, QWidget *p=0 );
 
 /**
 	*@short Default Destructor. Empty.
@@ -267,7 +267,7 @@
 	*@p d reference to the new ExtDate
 	*@see date()
 	*/
-		void setDate( const ExtDate &d ) { m_DateEdit->setDate( d ); }
+		void setDate( const ExtDate &date ) { m_DateEdit->setDate( date ); }
 
 /**
 	*@return the internal QTime value