Fix compilation in libkdeedu/extdate, thanks to whomever reported this a

while ago, and sorry I took so long.

CCMAIL: kstars-devel@kde.org

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=472623

diff --git a/extdate/extdatetimeedit.cpp b/extdate/extdatetimeedit.cpp
index 5fc4f289927a51cda23c9eedca2e40b9fda9d8b7..51e2dacabbfd278d5dfaeaf9dfcb564ae242252a 100644 (file)
--- a/extdate/extdatetimeedit.cpp
+++ b/extdate/extdatetimeedit.cpp
@@ -51,7 +51,8 @@ ExtDateEdit::ExtDateEdit( const ExtDate &d, QWidget *parent )
 }
 
 ExtDateEdit::ExtDateEdit( int jd, QWidget *parent ) {
-       ExtDateEdit( ExtDate(jd), parent );
+       ExtDate ed(jd);
+       ExtDateEdit( ed, parent );
 }
 
 ExtDateEdit::~ExtDateEdit() {
@@ -205,8 +206,9 @@ ExtDateTimeEdit::ExtDateTimeEdit( const ExtDateTime &dt, QWidget *parent )
        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() {

diff --git a/extdate/extdatetimeedit.h b/extdate/extdatetimeedit.h
index d30d9f126b59292cdadc489f20e212142c73d21a..20a3da434e7c35992eddf9a863587fd7ba63e43e 100644 (file)
--- a/extdate/extdatetimeedit.h
+++ b/extdate/extdatetimeedit.h
@@ -65,7 +65,7 @@ class ExtDateEdit : public QSpinBox {
        *@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 @@ class ExtDateEdit : public QSpinBox {
        *@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 @@ QWidget *p=0 );
        *@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 @@ QWidget *p=0 );
        *@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