From: Sergey BELASH <belash.sergey@opencascade.com>
Date: Mon, 14 Apr 2014 12:05:31 +0000 (+0400)
Subject: Compilation problems with "qintptr" resiolved (again).
X-Git-Tag: V_0.1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2af9e14a16dd6e7a43f7f17df2e54256f14ba1b7;p=modules%2Fshaper.git

Compilation problems with "qintptr" resiolved (again).
---

diff --git a/src/XGUI/XGUI_Main.cpp b/src/XGUI/XGUI_Main.cpp
index 26f8d58fd..35210da8f 100644
--- a/src/XGUI/XGUI_Main.cpp
+++ b/src/XGUI/XGUI_Main.cpp
@@ -1,6 +1,7 @@
 #include "XGUI_Workshop.h"
 #include <QApplication>
 #include <QTranslator>
+#include <QDebug>
 
 #ifndef WIN32
 
@@ -13,7 +14,7 @@
   \return Pointer to X display.
   \sa getVisual()
 */
-void* getDisplay()
+Display* getDisplay()
 {
   static Display* pDisplay = NULL;
   if ( !pDisplay )
@@ -62,6 +63,7 @@ Qt::HANDLE getVisual()
     return res;
   }
 
+
   qDebug() << "Picked visual 0x" << hex << XVisualIDFromVisual( visualInfo->visual );
   res = (Qt::HANDLE)( visualInfo->visual );
  
diff --git a/src/XGUI/XGUI_PartDataModel.cpp b/src/XGUI/XGUI_PartDataModel.cpp
index 40f4671db..127c3478f 100644
--- a/src/XGUI/XGUI_PartDataModel.cpp
+++ b/src/XGUI/XGUI_PartDataModel.cpp
@@ -146,18 +146,18 @@ QModelIndex XGUI_TopDataModel::findParent(const std::shared_ptr<ModelAPI_Feature
   QString aGroup(theFeature->getGroup().c_str());
 
   if (theFeature->getGroup().compare(PARAMETERS_GROUP) == 0)
-    return createIndex(0, 0, (quintptr) ParamsFolder);
+    return createIndex(0, 0, (qint32) ParamsFolder);
   if (theFeature->getGroup().compare(CONSTRUCTIONS_GROUP) == 0)
-    return createIndex(1, 0, (quintptr) ConstructFolder);
+    return createIndex(1, 0, (qint32) ConstructFolder);
   return QModelIndex();
 }
 
 QModelIndex XGUI_TopDataModel::findGroup(const std::string& theGroup) const
 {
   if (theGroup.compare(PARAMETERS_GROUP) == 0)
-    return createIndex(0, 0, (quintptr) ParamsFolder);
+    return createIndex(0, 0, (qint32) ParamsFolder);
   if (theGroup.compare(CONSTRUCTIONS_GROUP) == 0)
-    return createIndex(1, 0, (quintptr) ConstructFolder);
+    return createIndex(1, 0, (qint32) ConstructFolder);
   return QModelIndex();
 }
 
@@ -332,17 +332,17 @@ QModelIndex XGUI_PartDataModel::findParent(const std::shared_ptr<ModelAPI_Featur
   QString aGroup(theFeature->getGroup().c_str());
 
   if (theFeature->getGroup().compare(PARAMETERS_GROUP) == 0)
-    return createIndex(0, 0, (quintptr) ParamsFolder);
+    return createIndex(0, 0, (qint32) ParamsFolder);
   if (theFeature->getGroup().compare(CONSTRUCTIONS_GROUP) == 0)
-    return createIndex(1, 0, (quintptr) ConstructFolder);
+    return createIndex(1, 0, (qint32) ConstructFolder);
   return QModelIndex();
 }
 
 QModelIndex XGUI_PartDataModel::findGroup(const std::string& theGroup) const
 {
   if (theGroup.compare(PARAMETERS_GROUP) == 0)
-    return createIndex(0, 0, (quintptr) ParamsFolder);
+    return createIndex(0, 0, (qint32) ParamsFolder);
   if (theGroup.compare(CONSTRUCTIONS_GROUP) == 0)
-    return createIndex(1, 0, (quintptr) ConstructFolder);
+    return createIndex(1, 0, (qint32) ConstructFolder);
   return QModelIndex();
 }