Merge from V6_main_20120808 08Aug12

[modules/gui.git] / src / QDS / QDS_SpinBoxDbl.cxx

diff --git a/src/QDS/QDS_SpinBoxDbl.cxx b/src/QDS/QDS_SpinBoxDbl.cxx
index bc8def56a995dbfcd21045ef1289da285869acbc..5f642a53ca83417132471bc36bce56f3bdfa69c2 100644 (file)
--- a/src/QDS/QDS_SpinBoxDbl.cxx
+++ b/src/QDS/QDS_SpinBoxDbl.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "QDS_SpinBoxDbl.h"
 
 #include <QtxDoubleSpinBox.h>
@@ -69,9 +70,9 @@ QString QDS_SpinBoxDbl::getString() const
   QtxDoubleSpinBox* sb = spinBox();
   if ( sb && !sb->isCleared() )
   {
-    bool hasFocus = sb->hasFocus();
+    /*bool hasFocus = sb->hasFocus();
     if ( hasFocus )
-      sb->clearFocus();
+      sb->clearFocus();*/
     
     res = sb->text();
     if ( !sb->suffix().isEmpty() )
@@ -79,8 +80,8 @@ QString QDS_SpinBoxDbl::getString() const
     if ( !sb->prefix().isEmpty() )
       res.remove( res.indexOf( sb->prefix() ), sb->prefix().length() );
     
-    if ( hasFocus )
-      sb->setFocus();
+    /*if ( hasFocus )
+      sb->setFocus();*/
   }
 
   return res;