no message

diff --git a/src/QDS/QDS_ComboBox.cxx b/src/QDS/QDS_ComboBox.cxx
index 478f7187b7d7e6da50b7a42cb99889d61376c7ae..bded8fd27004bc7d51cd1e12162e9fb2ca46c504 100644 (file)
--- a/src/QDS/QDS_ComboBox.cxx
+++ b/src/QDS/QDS_ComboBox.cxx
@@ -276,7 +276,12 @@ void QDS_ComboBox::reset()
   int id = -1;
   QString aDefValue = defaultValue();
   if ( !aDefValue.isEmpty() )
-    id = aDefValue.toInt();
+  {
+    bool ok = false;
+    id = aDefValue.toInt( &ok );
+    if ( !ok )
+      id = -1;
+  }
 
   if ( id == -1 )
     id = getId( 0 );
@@ -345,7 +350,7 @@ void QDS_ComboBox::setString( const QString& txt )
   else if ( txt.isEmpty() )
   {
     if ( !cb->editable() )
-      cb->setCurrentText( txt );
+      cb->setCleared( true );
     else
       cb->lineEdit()->setText( txt );
   }
@@ -551,7 +556,7 @@ void QDS_ComboBox::updateComboBox()
     cb->updateGeometry();
 
     if ( isClear )
-      cb->setCurrentText( "" );
+      cb->setCleared( true );
     else
     {
       if ( getIndex( curId ) != -1 )

diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index 54fb1a383976d102278e9ef58a72fdce9c0652a9..f6054509b3e1f3ea19f7b7d9fd79b2bb555eaf51 100644 (file)
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -93,7 +93,7 @@ bool QDS_Datum::Wrapper::eventFilter( QObject* o, QEvent* e )
     QApplication::sendEvent( this, e );
 
   return false;
-  }
+}
 
 void QDS_Datum::Wrapper::setSizePolicy( QSizePolicy sp )
 {