Address comments

qgis · Nov 22, 2019 · 2c61eb3 · 2c61eb3
1 parent 17a700b
commit 2c61eb3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp b/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
@@ -220,7 +220,7 @@ void QgsDateTimeEditWrapper::updateValues( const QVariant &value, const QVariant
       break;
     case QVariant::Date:
       dateTime.setDate( value.toDate() );
-      dateTime.setTime( QTime::currentTime() );
+      dateTime.setTime( QTime( 0, 0, 0 ) );
       break;
     case QVariant::Time:
       dateTime.setDate( QDate::currentDate() );

diff --git a/tests/src/gui/testqgsdatetimeedit.cpp b/tests/src/gui/testqgsdatetimeedit.cpp
@@ -121,26 +121,26 @@ void TestQgsDateTimeEdit::nullValues()
 void TestQgsDateTimeEdit::focus()
 {
   QgsApplication::setNullRepresentation( QString( "nope" ) );
-  QWidget *w = new QWidget(); //required for focus events
-  QApplication::setActiveWindow( w );
+  QWidget w; //required for focus events
+  QApplication::setActiveWindow( &w );
 
   QVariantMap cfg;
   cfg.insert( QStringLiteral( "AllowNull" ), true );
 
   widget1->setConfig( cfg );
-  QgsDateTimeEdit *dateedit1 = qobject_cast<QgsDateTimeEdit *>( widget1->createWidget( w ) );
+  QgsDateTimeEdit *dateedit1 = qobject_cast<QgsDateTimeEdit *>( widget1->createWidget( &w ) );
   QVERIFY( dateedit1 );
   widget1->initWidget( dateedit1 );
   widget1->setValue( QVariant::Date );
 
   widget2->setConfig( cfg );
-  QgsDateTimeEdit *dateedit2 = qobject_cast<QgsDateTimeEdit *>( widget2->createWidget( w ) );
+  QgsDateTimeEdit *dateedit2 = qobject_cast<QgsDateTimeEdit *>( widget2->createWidget( &w ) );
   QVERIFY( dateedit2 );
   widget2->initWidget( dateedit2 );
   widget2->setValue( QVariant::Date );
 
   widget3->setConfig( cfg );
-  QgsDateTimeEdit *dateedit3 = qobject_cast<QgsDateTimeEdit *>( widget3->createWidget( w ) );
+  QgsDateTimeEdit *dateedit3 = qobject_cast<QgsDateTimeEdit *>( widget3->createWidget( &w ) );
   QVERIFY( dateedit3 );
   widget3->initWidget( dateedit3 );
   widget3->setValue( QVariant::Date );
@@ -238,22 +238,22 @@ void TestQgsDateTimeEdit::focus()
 void TestQgsDateTimeEdit::testDateTime()
 {
   QgsApplication::setNullRepresentation( QString( "nope" ) );
-  QWidget *w = new QWidget(); //required for focus events
-  QApplication::setActiveWindow( w );
+  QWidget w;
+  QApplication::setActiveWindow( &w );
 
   QVariantMap cfg;
   cfg.insert( QStringLiteral( "AllowNull" ), true );
 
   widget4->setConfig( cfg );
-  QgsDateTimeEdit *dateedit4 = qobject_cast<QgsDateTimeEdit *>( widget4->createWidget( w ) );
+  QgsDateTimeEdit *dateedit4 = qobject_cast<QgsDateTimeEdit *>( widget4->createWidget( &w ) );
   QVERIFY( dateedit4 );
   widget4->initWidget( dateedit4 );
   widget4->setValue( QTime( 23, 10, 57 ) );
   QTime value { widget4->value().toTime() };
   QCOMPARE( value, QTime( 23, 10, 57 ) );
 
   widget5->setConfig( cfg );
-  QgsDateTimeEdit *dateedit5 = qobject_cast<QgsDateTimeEdit *>( widget5->createWidget( w ) );
+  QgsDateTimeEdit *dateedit5 = qobject_cast<QgsDateTimeEdit *>( widget5->createWidget( &w ) );
   QVERIFY( dateedit5 );
   widget5->initWidget( dateedit5 );
   widget5->setValue( QDate( 1966, 11, 25 ) );