Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / ModuleBase / ModuleBase_Tools.h

diff --git a/src/ModuleBase/ModuleBase_Tools.h b/src/ModuleBase/ModuleBase_Tools.h
index 3f9ca02191d0d3d9facbe797ece0bbe608b30b38..c6ad57e8c5ae1676005dc1802882681e1c961802 100644 (file)
--- a/src/ModuleBase/ModuleBase_Tools.h
+++ b/src/ModuleBase/ModuleBase_Tools.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModuleBase_Tools.h
 // Created:     11 July 2014
 // Author:      Vitaly Smetannikov
@@ -25,19 +27,18 @@ MODULEBASE_EXPORT void zeroMargins(QLayout* theLayout);
 
 
 /**
+ * \ingroup GUI
  * Methods to modify a resource pixmap
  */
+
 //! Create composite pixmap. 
 //! Pixmap \a theAdditionalIcon is drawn over pixmap \a dest with coordinates
 //! specified relatively to the upper left corner of \a theIcon.
 
 //! \param theAdditionalIcon resource text of the additional pixmap
-//! \param theXShift horizontal shift
-//! \param theYShift vertical shift
 //! \param theIcon resource text of the background pixmap
 //! \return resulting pixmap
-MODULEBASE_EXPORT QPixmap composite(const QString& theAdditionalIcon, const int theXShift,
-                                    const int theYShift, const QString& theIcon);
+MODULEBASE_EXPORT QPixmap composite(const QString& theAdditionalIcon, const QString& theIcon);
 
 //! Generates the pixmap lighter than the resources pixmap. 
 //! Pixmap \a theIcon is lighted according to the given value.