diff --git a/harbour/contrib/hbqt/qtgui/qth/QDateEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QDateEdit.qth
index c802a84c80..c5dd3e15c9 100644
--- a/harbour/contrib/hbqt/qtgui/qth/QDateEdit.qth
+++ b/harbour/contrib/hbqt/qtgui/qth/QDateEdit.qth
@@ -30,11 +30,11 @@ HB_FUNC( QT_QDATEEDIT )
    {
       __HB_RETPTRGC__( new QDateEdit( hbqt_par_QWidget( 1 ) ) );
    }
-   if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QDATE" ) )
+   else if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QDATE" ) )
    {
       __HB_RETPTRGC__( new QDateEdit( *hbqt_par_QDate( 1 ) ) );
    }
-   if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QDATE" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
+   else if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QDATE" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
    {
       __HB_RETPTRGC__( new QDateEdit( *hbqt_par_QDate( 1 ), hbqt_par_QWidget( 2 ) ) );
    }
diff --git a/harbour/contrib/hbqt/qtgui/qth/QDateTimeEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QDateTimeEdit.qth
index e6897f055f..8f74a20f22 100644
--- a/harbour/contrib/hbqt/qtgui/qth/QDateTimeEdit.qth
+++ b/harbour/contrib/hbqt/qtgui/qth/QDateTimeEdit.qth
@@ -32,27 +32,27 @@ HB_FUNC( QT_QDATETIMEEDIT )
    {
       __HB_RETPTRGC__( new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) );
    }
-   if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QDATE" ) )
+   else if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QDATE" ) )
    {
       __HB_RETPTRGC__( new QDateTimeEdit( *hbqt_par_QDate( 1 ) ) );
    }
-   if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QDATE" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
+   else if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QDATE" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
    {
       __HB_RETPTRGC__( new QDateTimeEdit( *hbqt_par_QDate( 1 ), hbqt_par_QWidget( 2 ) ) );
    }
-   if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QTIME" ) )
+   else if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QTIME" ) )
    {
       __HB_RETPTRGC__( new QDateTimeEdit( *hbqt_par_QTime( 1 ) ) );
    }
-   if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QTIME" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
+   else if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QTIME" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
    {
       __HB_RETPTRGC__( new QDateTimeEdit( *hbqt_par_QTime( 1 ), hbqt_par_QWidget( 2 ) ) );
    }
-   if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QDATETIME" ) )
+   else if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QDATETIME" ) )
    {
       __HB_RETPTRGC__( new QDateTimeEdit( *hbqt_par_QDateTime( 1 ) ) );
    }
-   if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QDATETIME" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
+   else if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QDATETIME" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
    {
       __HB_RETPTRGC__( new QDateTimeEdit( *hbqt_par_QDateTime( 1 ), hbqt_par_QWidget( 2 ) ) );
    }
diff --git a/harbour/contrib/hbqt/qtgui/qth/QTimeEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QTimeEdit.qth
index 48ce10404b..19d4b053d3 100644
--- a/harbour/contrib/hbqt/qtgui/qth/QTimeEdit.qth
+++ b/harbour/contrib/hbqt/qtgui/qth/QTimeEdit.qth
@@ -30,11 +30,11 @@ HB_FUNC( QT_QTIMEEDIT )
    {
       __HB_RETPTRGC__( new QTimeEdit( hbqt_par_QWidget( 1 ) ) );
    }
-   if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QTIME" ) )
+   else if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QTIME" ) )
    {
       __HB_RETPTRGC__( new QTimeEdit( *hbqt_par_QTime( 1 ) ) );
    }
-   if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QTIME" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
+   else if( hb_pcount() == 2 && hbqt_par_isDerivedFrom( 1, "QTIME" ) && hbqt_par_isDerivedFrom( 2, "QWIDGET" ) )
    {
       __HB_RETPTRGC__( new QTimeEdit( *hbqt_par_QTime( 1 ), hbqt_par_QWidget( 2 ) ) );
    }