Join modifications from branch OCC_debug_for_3_2_0b1

[modules/gui.git] / src / Qtx / QtxColorScale.h

diff --git a/src/Qtx/QtxColorScale.h b/src/Qtx/QtxColorScale.h
index 21f838dbc9cadd5375580bcfd53f69cd706748f6..164ea91be81ead39b970e6d24b788506cb78b623 100755 (executable)
--- a/src/Qtx/QtxColorScale.h
+++ b/src/Qtx/QtxColorScale.h
@@ -1,3 +1,21 @@
+// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
+// 
+// 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.salome-platform.org/
+//
 // File:      QtxColorScale.h
 // Author:    Sergey TELKOV
 
@@ -20,6 +38,10 @@ class QSimpleRichText;
 #pragma warning( disable:4251 )
 #endif
 
+/*!
+  \class QtxColorScale
+  Color Scale widget.
+*/
 class QTX_EXPORT QtxColorScale : public QFrame
 {
          Q_OBJECT
@@ -134,7 +156,9 @@ private:
          QSize                 calculateSize( const bool, const int,
                                                                                                     const bool, const bool, const bool ) const;
 
-         friend class Dock;
+#if QT_VER == 3
+         friend class QtxColorScale::Dock;
+#endif
 
 private:
          double                myMin;