SIMAN removal

[modules/gui.git] / src / Qtx / QtxTable.cxx

diff --git a/src/Qtx/QtxTable.cxx b/src/Qtx/QtxTable.cxx
index 1f7c0be558ff993ee1af7d6127c0624467f3df1f..cf46666574ee1fa7a71056ee69b3cd3534a04e53 100644 (file)
--- a/src/Qtx/QtxTable.cxx
+++ b/src/Qtx/QtxTable.cxx
@@ -1,24 +1,28 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
+// Copyright (C) 2007-2015  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
+//
 // 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 
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// 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 
+// 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
 //
+
 // File:      QtxTable.cxx
 // Author:    Sergey TELKOV
-
+//
 #include "QtxTable.h"
 
 #ifndef QT_NO_TABLE
@@ -151,7 +155,7 @@ bool QtxTable::eventFilter( QObject* o, QEvent* e )
 
   if ( o == myHeaderEditor && e->type() == QEvent::KeyPress && isHeaderEditing() )
   {
-         QKeyEvent* ke = (QKeyEvent*)e;
+          QKeyEvent* ke = (QKeyEvent*)e;
     if ( ke->key() == Key_Escape )
     {
       endHeaderEdit( false );
@@ -170,8 +174,8 @@ bool QtxTable::eventFilter( QObject* o, QEvent* e )
   if ( o == myHeaderEditor && e->type() == QEvent::FocusOut &&
        isHeaderEditing() && ((QFocusEvent*)e)->reason() != QFocusEvent::Popup )
   {
-               endHeaderEdit();
-               return true;
+                endHeaderEdit();
+                return true;
   }
 
   if ( e->type() == QEvent::Wheel && isHeaderEditing() )
@@ -260,12 +264,12 @@ void QtxTable::endHeaderEdit( const bool accept )
   if ( !isHeaderEditing() )
     return;
 
-  QString oldTxt = myEditedHeader ? myEditedHeader->label( myEditedSection ) : QString::null;
+  QString oldTxt = myEditedHeader ? myEditedHeader->label( myEditedSection ) : QString();
 
   if ( accept && myEditedHeader )
     setHeaderContentFromEditor( myEditedHeader, myEditedSection, myHeaderEditor );
 
-  QString newTxt = myEditedHeader ? myEditedHeader->label( myEditedSection ) : QString::null;
+  QString newTxt = myEditedHeader ? myEditedHeader->label( myEditedSection ) : QString();
 
   int sec = myEditedSection;
   QHeader* hdr = myEditedHeader;