From: asv Date: Fri, 5 Aug 2005 11:04:55 +0000 (+0000) Subject: modifications that make sources compilable without support of STL by Qt. X-Git-Tag: T_3_0_2a1~18 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e41d2c731363e31c5be11a07ae574e6c946d7d5e;p=modules%2Fvisu.git modifications that make sources compilable without support of STL by Qt. --- diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 5b874110..403a4612 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -316,11 +316,11 @@ OnExportTableToFile() if (isTOR) { _PTR(AttributeTableOfReal) aTabAttr (anAttr); if (!aTabAttr) return; - aTitle = aTabAttr->GetTitle(); + aTitle = aTabAttr->GetTitle().c_str(); } else { _PTR(AttributeTableOfInteger) aTabAttr (anAttr); if (!aTabAttr) return; - aTitle = aTabAttr->GetTitle(); + aTitle = aTabAttr->GetTitle().c_str(); } aTitle.simplifyWhiteSpace(); aTitle = aTitle.replace(QRegExp(" "), "_"); diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx index 353944e5..eed32a53 100644 --- a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx +++ b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx @@ -320,7 +320,7 @@ void VisuGUI_EditContainerDlg::initFromPrsObject (VISU::Container_i* theContaine CurveStruct aEntry; aEntry.TableName = getSObjectName(aTableSO); aEntry.CurveName = getSObjectName(aSObject); - aEntry.CurveEntry = aSObject->GetID(); + aEntry.CurveEntry = aSObject->GetID().c_str(); aStudyCurves.append(aEntry); } } @@ -346,7 +346,7 @@ void VisuGUI_EditContainerDlg::storeToPrsObject (VISU::Container_i* theContainer _PTR(Study) aStudy = VISU::GetCStudy(VISU::GetAppStudy(myVisuGUI)); QListViewItem* anItem = myContainerLst->firstChild(); while (anItem) { - _PTR(SObject) aCurveSO = aStudy->FindObjectID(anItem->text(2)); + _PTR(SObject) aCurveSO = aStudy->FindObjectID(anItem->text(2).latin1()); if (aCurveSO) { CORBA::Object_var aObject = VISU::ClientSObjectToObject(aCurveSO); if (!CORBA::is_nil(aObject)) { @@ -365,7 +365,7 @@ QString VisuGUI_EditContainerDlg::getSObjectName (_PTR(SObject) theSObject) _PTR(GenericAttribute) anAttr; if (theSObject->FindAttribute(anAttr, "AttributeName")) { _PTR(AttributeName) aName (anAttr); - return QString(aName->Value()); + return QString(aName->Value().c_str()); } return QString(""); }