Merge remote branch 'origin/V7_dev' into V8_0_0_BR

[modules/gui.git] / src / QDS / QDS_TextEdit.h

diff --git a/src/QDS/QDS_TextEdit.h b/src/QDS/QDS_TextEdit.h
index 7f792c2a9faaa326f9bf0e62921a714ed842b0f8..298e06f8640cae8e3de2849534c5db02341e1a0d 100644 (file)
--- a/src/QDS/QDS_TextEdit.h
+++ b/src/QDS/QDS_TextEdit.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
@@ -6,7 +6,7 @@
 // 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.
+// 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
@@ -35,6 +35,8 @@ public:
   QDS_TextEdit( const QString&, QWidget* = 0, const int = All, const QString& = QString() );
   virtual ~QDS_TextEdit();
 
+  virtual QString                 getString() const;
+
 signals:
   void                            returnPressed();
 
@@ -45,7 +47,6 @@ protected:
   QTextEdit*                      textEdit() const;
   virtual QWidget*                createControl( QWidget* );
 
-  virtual QString                 getString() const;
   virtual void                    setString( const QString& );
 };