From: vsr <vsr@opencascade.com>
Date: Fri, 12 Feb 2016 11:20:23 +0000 (+0300)
Subject: Update from V7_dev
X-Git-Tag: V8_0_0rc2^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV8_0_0_BR;p=modules%2Fhexablock.git

Update from V7_dev
---

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
index ce168b5..f7f508b 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
@@ -21,7 +21,7 @@
 
 #include <cassert>
 
-
+#include <QDir>
 #include <QInputDialog>
 #include <QIcon>
 #include <QStackedWidget>
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
index e0c6e37..13f9617 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
@@ -45,6 +45,7 @@
 #include "HEXABLOCKGUI_OCCSelector.h"
 #include "hexa_base.hxx"
 
+class QDir;
 
 // #include CORBA_CLIENT_HEADER(HEXABLOCK_Gen)  // Abu Juin 2013
 
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
index 2b2e984..9ec2dd2 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
@@ -25,8 +25,8 @@
 
 #include "Hex.hxx"
 #include <iostream>
-#include <QtGui>
 #include <QFlags>
+#include <QKeyEvent>
 #include <QStyledItemDelegate>
 
 #include <SalomeApp_Application.h>
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.cxx
index 36629d1..7a62602 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.cxx
@@ -55,11 +55,11 @@ bool HEXABLOCKGUI_Resource::booleanValue(const QString& name, const bool def) co
   return _resource->booleanValue(RESOURCE_HEXABLOCK, name, def);
 }
 
-QFont HEXABLOCKGUI_Resource::fontValue(const QString& name, const QFont def) const {
+QFont HEXABLOCKGUI_Resource::fontValue(const QString& name, const QFont& def) const {
   return _resource->fontValue(RESOURCE_HEXABLOCK, name, def);
 }
 
-QColor HEXABLOCKGUI_Resource::colorValue(const QString& name, const QColor def) const {
+QColor HEXABLOCKGUI_Resource::colorValue(const QString& name, const QColor& def) const {
   return _resource->colorValue(RESOURCE_HEXABLOCK, name, def);
 }
 
@@ -74,7 +74,7 @@ QColor HEXABLOCKGUI_Resource::colorValue(const QString& name, const int h, const
   return colorValue(name, col);
 }
 
-QString HEXABLOCKGUI_Resource::stringValue(const QString& name, const QString def) const {
+QString HEXABLOCKGUI_Resource::stringValue(const QString& name, const QString& def) const {
   return _resource->stringValue(RESOURCE_HEXABLOCK, name, def);
 }
 
@@ -93,15 +93,15 @@ void HEXABLOCKGUI_Resource::setValue( const QString& name, const bool val ) {
     _resource->setValue(RESOURCE_HEXABLOCK, name, val);
 }
 
-void HEXABLOCKGUI_Resource::setValue( const QString& name, const QFont val ) {
+void HEXABLOCKGUI_Resource::setValue( const QString& name, const QFont& val ) {
     _resource->setValue(RESOURCE_HEXABLOCK, name, val);
 }
 
-void HEXABLOCKGUI_Resource::setValue( const QString& name, const QColor val ) {
+void HEXABLOCKGUI_Resource::setValue( const QString& name, const QColor& val ) {
     _resource->setValue(RESOURCE_HEXABLOCK, name, val);
 }
 
-void HEXABLOCKGUI_Resource::setValue( const QString& name, const QString val ) {
+void HEXABLOCKGUI_Resource::setValue( const QString& name, const QString& val ) {
     _resource->setValue(RESOURCE_HEXABLOCK, name, val);
 }
 
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
index 5f790da..79f8e33 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
@@ -20,15 +20,15 @@
 #ifndef _HEXABLOCKGUI_RESOURCE_HXX_
 #define _HEXABLOCKGUI_RESOURCE_HXX_
 
-#include "HEXABLOCKGUI_Export.hxx"
+#include <QColor>
+#include <QFont>
+#include <QString>
 
-#include <QtGui>
+#include "HEXABLOCKGUI_Export.hxx"
 
 class HEXABLOCKGUI;
 class SUIT_ResourceMgr;
 
-
-
 class HEXABLOCK_EXPORT HEXABLOCKGUI_Resource 
 {
   public:
@@ -38,25 +38,24 @@ class HEXABLOCK_EXPORT HEXABLOCKGUI_Resource
     virtual void preferencesChanged();
 
   protected:
-    int     integerValue( const QString& name, const int    def = 0          ) const;
-    double  doubleValue ( const QString& name, const double def = 0          ) const;
-    bool    booleanValue( const QString& name, const bool   def = false      ) const;
-    QFont   fontValue   ( const QString& name, const QFont  def = QFont()    ) const;
-    QColor  colorValue  ( const QString& name, const QColor def = QColor()   ) const;
-    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c       ) const;
-    QColor  colorValue  ( const QString& name, const int h, const int s, const int v) const;
-    QString stringValue ( const QString& name, const QString def = QString() ) const;
-
-    void setValue( const QString& name, const int     val );
-    void setValue( const QString& name, const double  val );
-    void setValue( const QString& name, const bool    val );
-    void setValue( const QString& name, const QFont   val );
-    void setValue( const QString& name, const QColor  val );
-    void setValue( const QString& name, const QString val );
+    int     integerValue( const QString& name, const int     def = 0          ) const;
+    double  doubleValue ( const QString& name, const double  def = 0          ) const;
+    bool    booleanValue( const QString& name, const bool    def = false      ) const;
+    QFont   fontValue   ( const QString& name, const QFont&  def = QFont()    ) const;
+    QColor  colorValue  ( const QString& name, const QColor& def = QColor()   ) const;
+    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c        ) const;
+    QColor  colorValue  ( const QString& name, const int h, const int s, const int v ) const;
+    QString stringValue ( const QString& name, const QString& def = QString() ) const;
+
+    void setValue( const QString& name, const int      val );
+    void setValue( const QString& name, const double   val );
+    void setValue( const QString& name, const bool     val );
+    void setValue( const QString& name, const QFont&   val );
+    void setValue( const QString& name, const QColor&  val );
+    void setValue( const QString& name, const QString& val );
 
   protected:
     SUIT_ResourceMgr* _resource;
-
 };
 
 
diff --git a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
index aefa4ff..0ab5dc2 100644
--- a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
+++ b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
@@ -34,6 +34,7 @@
 #include <QRadioButton>
 #include <QMenu>
 #include <QTimer>
+#include <QVector3D>
 
 #include <gp_Pnt.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.cxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.cxx
index 8304b3d..6b3e774 100644
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.cxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.cxx
@@ -19,7 +19,7 @@
     02110-1301, USA.
 */
 
-#include <QtCore/QObject>
+#include <QObject>
 #include "klinkitemselectionmodel.hxx"
 // #include "klinkitemselectionmodel_p.hxx"
 
diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
index f41e1ef..e0d4ba8 100644
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
@@ -24,14 +24,9 @@
 
 #include "HEXABLOCKGUI_Export.hxx"
 
-#include <QtCore/QObject>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QAbstractProxyModel>
-#else
-#include <QtCore/QItemSelectionModel>
-#include <QtCore/QAbstractProxyModel>
-#endif
+#include <QObject>
+#include <QItemSelectionModel>
+#include <QAbstractProxyModel>
 
 #include <iostream>
 
diff --git a/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx b/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
index 28bc187..09e5429 100644
--- a/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
+++ b/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
@@ -21,15 +21,10 @@
 
 #include "kmodelindexproxymapper.hxx"
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QWeakPointer>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#include <QtGui/QAbstractProxyModel>
-#include <QtGui/QItemSelectionModel>
-#else 
-#include <QtCore/QAbstractProxyModel>
-#include <QtCore/QItemSelectionModel>
-#endif
+#include <QAbstractItemModel>
+#include <QWeakPointer>
+#include <QAbstractProxyModel>
+#include <QItemSelectionModel>
 
 // #include "kdebug.h"