PR: merge from branch BR_UnitTests tag mergeto_trunk_17oct05

[modules/kernel.git] / src / SALOMEGUI / QAD_Tools.cxx

diff --git a/src/SALOMEGUI/QAD_Tools.cxx b/src/SALOMEGUI/QAD_Tools.cxx
index dac82d7f732364e9d908a9db19defc7f7d056d23..dfa23e5c7a5849d342bab46d56c6807d8082e717 100644 (file)
--- a/src/SALOMEGUI/QAD_Tools.cxx
+++ b/src/SALOMEGUI/QAD_Tools.cxx
@@ -1,14 +1,31 @@
-using namespace std;
-//  File      : QAD_Tools.cxx
-//  Created   : UI team, 22.09.00
-//  Descr     : Helpful functions for QAD
-//  Author    : UI team
-//  Project   : SALOME
-//  Module    : SALOMEGUI
-//  Copyright : Open CASCADE
+//  SALOME SALOMEGUI : implementation of desktop and GUI kernel
+//
+//  Copyright (C) 2003  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 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 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : QAD_Tools.cxx
+//  Author : UI team
+//  Module : SALOME
 //  $Header$
 
-
 /*!
   \class QAD_Tools QAD_Tools.h
   \brief Helpful functions for QAD.
@@ -26,6 +43,7 @@ using namespace std;
 #include <string.h>
 #include <ctype.h>
 #include <qstringlist.h>
+using namespace std;
 
 static char* tempName()
 {
@@ -258,7 +276,7 @@ TCollection_AsciiString QAD_Tools::toAsciiString( const QString& qString)
 QFont QAD_Tools::stringToFont( const QString& fontDescription )
 {
   QFont font;
-  if ( !font.fromString( fontDescription ) )
+  if ( fontDescription.stripWhiteSpace().isEmpty() || !font.fromString( fontDescription ) )
     font = QFont( "Courier", 11 );
   return font;
 }