Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#18963 Minimize compiler warnings
[modules/kernel.git]
/
src
/
SALOMEDSImpl
/
SALOMEDSImpl_IParameters.cxx
diff --git
a/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.cxx
b/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.cxx
index d8fda48b8576ab7968913617cb0b76eed2fe4bc8..b8fe3f7735e2f2aaecce98e5b541a9a808f24879 100644
(file)
--- a/
src/SALOMEDSImpl/SALOMEDSImpl_IParameters.cxx
+++ b/
src/SALOMEDSImpl/SALOMEDSImpl_IParameters.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-40,8
+40,6
@@
SALOMEDSImpl_IParameters::SALOMEDSImpl_IParameters(SALOMEDSImpl_AttributeParamet
{
if(!ap) return;
_ap = ap;
{
if(!ap) return;
_ap = ap;
- SALOMEDSImpl_SObject so = _ap->GetSObject();
- _study = so.GetStudy();
}
SALOMEDSImpl_IParameters::~SALOMEDSImpl_IParameters()
}
SALOMEDSImpl_IParameters::~SALOMEDSImpl_IParameters()
@@
-64,7
+62,7
@@
int SALOMEDSImpl_IParameters::append(const std::string& listName, const std::str
v = _ap->GetStrArray(listName);
v.push_back(value);
_ap->SetStrArray(listName, v);
v = _ap->GetStrArray(listName);
v.push_back(value);
_ap->SetStrArray(listName, v);
- return (
v.size()-1);
+ return (
int)(v.size()-1); //!< TODO: conversion from size_t to int
}
int SALOMEDSImpl_IParameters::nbValues(const std::string& listName)
}
int SALOMEDSImpl_IParameters::nbValues(const std::string& listName)
@@
-72,7
+70,7
@@
int SALOMEDSImpl_IParameters::nbValues(const std::string& listName)
if(!_ap) return -1;
if(!_ap->IsSet(listName, PT_STRARRAY)) return 0;
std::vector<std::string> v = _ap->GetStrArray(listName);
if(!_ap) return -1;
if(!_ap->IsSet(listName, PT_STRARRAY)) return 0;
std::vector<std::string> v = _ap->GetStrArray(listName);
- return
v.size();
+ return
(int)v.size(); //!< TODO: conversion from size_t to int
}
std::vector<std::string> SALOMEDSImpl_IParameters::getValues(const std::string& listName)
}
std::vector<std::string> SALOMEDSImpl_IParameters::getValues(const std::string& listName)
@@
-89,7
+87,7
@@
std::string SALOMEDSImpl_IParameters::getValue(const std::string& listName, int
if(!_ap) return "";
if(!_ap->IsSet(listName, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(listName);
if(!_ap) return "";
if(!_ap->IsSet(listName, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(listName);
- if(index >= v.size()) return "";
+ if(index >=
(int)
v.size()) return "";
return v[index];
}
return v[index];
}
@@
-120,8
+118,8
@@
std::string SALOMEDSImpl_IParameters::getParameter(const std::string& entry, con
if(!_ap) return "";
if(!_ap->IsSet(entry, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(entry);
if(!_ap) return "";
if(!_ap->IsSet(entry, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(entry);
-
in
t length = v.size();
- for(int i = 0; i<length; i+=1) {
+
size_
t length = v.size();
+ for(int i = 0; i<
(int)
length; i+=1) {
if(v[i] == parameterName) return v[i+1];
}
return "";
if(v[i] == parameterName) return v[i+1];
}
return "";
@@
-148,8
+146,8
@@
std::string SALOMEDSImpl_IParameters::getIdParameter(const std::string& entry)
if(!_ap) return "";
if(!_ap->IsSet(entry, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(entry);
if(!_ap) return "";
if(!_ap->IsSet(entry, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(entry);
-
in
t length = v.size();
- for(int i = 0; i<length; i+=1) {
+
size_
t length = v.size();
+ for(int i = 0; i<
(int)
length; i+=1) {
if(v[i] == _PT_ID_) return v[i+1];
}
return "";
if(v[i] == _PT_ID_) return v[i+1];
}
return "";
@@
-161,8
+159,8
@@
std::vector<std::string> SALOMEDSImpl_IParameters::getAllParameterNames(const st
if(!_ap) return v;
if(!_ap->IsSet(entry, PT_STRARRAY)) return v;
v = _ap->GetStrArray(entry);
if(!_ap) return v;
if(!_ap->IsSet(entry, PT_STRARRAY)) return v;
v = _ap->GetStrArray(entry);
-
in
t length = v.size();
- for(int i = 0; i<length; i+=2) {
+
size_
t length = v.size();
+ for(int i = 0; i<
(int)
length; i+=2) {
names.push_back(v[i]);
}
return names;
names.push_back(v[i]);
}
return names;
@@
-174,8
+172,8
@@
std::vector<std::string> SALOMEDSImpl_IParameters::getAllParameterValues(const s
if(!_ap) return v;
if(!_ap->IsSet(entry, PT_STRARRAY)) return v;
v = _ap->GetStrArray(entry);
if(!_ap) return v;
if(!_ap->IsSet(entry, PT_STRARRAY)) return v;
v = _ap->GetStrArray(entry);
-
in
t length = v.size();
- for(int i = 1; i<length; i+=2) {
+
size_
t length = v.size();
+ for(int i = 1; i<
(int)
length; i+=2) {
values.push_back(v[i]);
}
return values;
values.push_back(v[i]);
}
return values;
@@
-185,7
+183,7
@@
int SALOMEDSImpl_IParameters::getNbParameters(const std::string& entry)
{
if(!_ap) return -1;
if(!_ap->IsSet(entry, PT_STRARRAY)) return -1;
{
if(!_ap) return -1;
if(!_ap->IsSet(entry, PT_STRARRAY)) return -1;
- return
_ap->GetStrArray(entry).size()/2;
+ return
int(_ap->GetStrArray(entry).size()/2); //!< TODO: conversion from size_t to int
}
std::vector<std::string> SALOMEDSImpl_IParameters::getEntries()
}
std::vector<std::string> SALOMEDSImpl_IParameters::getEntries()
@@
-222,14
+220,13
@@
std::vector<std::string> SALOMEDSImpl_IParameters::getProperties()
std::string SALOMEDSImpl_IParameters::decodeEntry(const std::string& entry)
{
std::string SALOMEDSImpl_IParameters::decodeEntry(const std::string& entry)
{
- if(!_study) return entry;
- int pos = entry.rfind("_");
- if(pos < 0 || pos >= entry.size()) return entry;
+ size_t pos = entry.rfind("_");
+ if(pos >= entry.size()) return entry;
std::string compName(entry, 0, pos), compID, tail(entry, pos+1, entry.length()-1);
if(_compNames.find(compName) == _compNames.end()) {
std::string compName(entry, 0, pos), compID, tail(entry, pos+1, entry.length()-1);
if(_compNames.find(compName) == _compNames.end()) {
- SALOMEDSImpl_SObject so =
_study
->FindComponent(compName);
+ SALOMEDSImpl_SObject so =
SALOMEDSImpl_Study::GetStudyImpl( _ap->GetSObject().GetLabel() )
->FindComponent(compName);
if(!so) return entry;
compID = so.GetID();
_compNames[compName] = compID;
if(!so) return entry;
compID = so.GetID();
_compNames[compName] = compID;
@@
-299,7
+296,7
@@
std::string SALOMEDSImpl_IParameters::getStudyScript(SALOMEDSImpl_Study* study,
std::vector<std::string> v = ip.getProperties();
if(v.size() > 0) {
dump += "#Set up visual properties:\n";
std::vector<std::string> v = ip.getProperties();
if(v.size() > 0) {
dump += "#Set up visual properties:\n";
- for(int i = 0; i<
v.size(); i++) {
+ for(int i = 0; i<
(int)v.size(); i++) {//TODO: mismatch signed/unsigned
std::string prp = ip.getProperty(v[i]);
dump += "ipar.setProperty(\""+v[i]+"\", \""+prp+"\")\n";
}
std::string prp = ip.getProperty(v[i]);
dump += "ipar.setProperty(\""+v[i]+"\", \""+prp+"\")\n";
}
@@
-308,11
+305,11
@@
std::string SALOMEDSImpl_IParameters::getStudyScript(SALOMEDSImpl_Study* study,
v = ip.getLists();
if(v.size() > 0) {
dump += "#Set up lists:\n";
v = ip.getLists();
if(v.size() > 0) {
dump += "#Set up lists:\n";
- for(int i = 0; i<
v.size(); i++) {
+ for(int i = 0; i<
(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> lst = ip.getValues(v[i]);
dump += "# fill list "+v[i]+"\n";
std::vector<std::string> lst = ip.getValues(v[i]);
dump += "# fill list "+v[i]+"\n";
- for(int j = 0; j <
lst.size(); j++) {
- if (lst[j].find('\"') ==
-1
)
+ for(int j = 0; j <
(int)lst.size(); j++) { //TODO: mismatch signed/unsigned
+ if (lst[j].find('\"') ==
std::string::npos
)
dump += "ipar.append(\""+v[i]+"\", \""+lst[j]+"\")\n";
else
dump += "ipar.append(\""+v[i]+"\", \"\"\""+lst[j]+"\"\"\")\n";
dump += "ipar.append(\""+v[i]+"\", \""+lst[j]+"\")\n";
else
dump += "ipar.append(\""+v[i]+"\", \"\"\""+lst[j]+"\"\"\")\n";
@@
-344,12
+341,12
@@
std::string SALOMEDSImpl_IParameters::getDefaultScript(SALOMEDSImpl_Study* study
dump += shift +"import iparameters\n";
dump += shift +"import iparameters\n";
- dump += shift + "ipar = iparameters.IParameters(
the
Study.GetModuleParameters(\""+anID+"\", \""+moduleName+"\", 1))\n\n";
+ dump += shift + "ipar = iparameters.IParameters(
salome.my
Study.GetModuleParameters(\""+anID+"\", \""+moduleName+"\", 1))\n\n";
std::vector<std::string> v = ip.getProperties();
if(v.size() > 0) {
dump += shift +"#Set up visual properties:\n";
std::vector<std::string> v = ip.getProperties();
if(v.size() > 0) {
dump += shift +"#Set up visual properties:\n";
- for(int i = 0; i<
v.size(); i++) {
+ for(int i = 0; i<
(int)v.size(); i++) { //TODO: mismtach signed/unsigned
std::string prp = ip.getProperty(v[i]);
dump += shift +"ipar.setProperty(\""+v[i]+"\", \""+prp+"\")\n";
}
std::string prp = ip.getProperty(v[i]);
dump += shift +"ipar.setProperty(\""+v[i]+"\", \""+prp+"\")\n";
}
@@
-358,10
+355,10
@@
std::string SALOMEDSImpl_IParameters::getDefaultScript(SALOMEDSImpl_Study* study
v = ip.getLists();
if(v.size() > 0) {
dump += shift +"#Set up lists:\n";
v = ip.getLists();
if(v.size() > 0) {
dump += shift +"#Set up lists:\n";
- for(int i = 0; i<
v.size(); i++) {
+ for(int i = 0; i<
(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> lst = ip.getValues(v[i]);
dump += shift +"# fill list "+v[i]+"\n";
std::vector<std::string> lst = ip.getValues(v[i]);
dump += shift +"# fill list "+v[i]+"\n";
- for(int j = 0; j <
lst.size(); j++)
+ for(int j = 0; j <
(int)lst.size(); j++) //TODO: mismatch signed/unsigned
dump += shift +"ipar.append(\""+v[i]+"\", \""+lst[j]+"\")\n";
}
}
dump += shift +"ipar.append(\""+v[i]+"\", \""+lst[j]+"\")\n";
}
}
@@
-369,7
+366,7
@@
std::string SALOMEDSImpl_IParameters::getDefaultScript(SALOMEDSImpl_Study* study
v = ip.getEntries();
if(v.size() > 0) {
dump += shift + "#Set up entries:\n";
v = ip.getEntries();
if(v.size() > 0) {
dump += shift + "#Set up entries:\n";
- for(int i = 0; i<
v.size(); i++) {
+ for(int i = 0; i<
(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> names = ip.getAllParameterNames(v[i]);
std::vector<std::string> values = ip.getAllParameterValues(v[i]);
std::string decodedEntry = ip.decodeEntry(v[i]);
std::vector<std::string> names = ip.getAllParameterNames(v[i]);
std::vector<std::string> values = ip.getAllParameterValues(v[i]);
std::string decodedEntry = ip.decodeEntry(v[i]);
@@
-385,11
+382,11
@@
std::string SALOMEDSImpl_IParameters::getDefaultScript(SALOMEDSImpl_Study* study
if(!onlyId) {
dump += shift + "# set up entry " + v[i] +" ("+so_name+")" + " parameters" + "\n";
if(hasId) {
if(!onlyId) {
dump += shift + "# set up entry " + v[i] +" ("+so_name+")" + " parameters" + "\n";
if(hasId) {
- int idIndex =
std::distance(names.begin(), it);
+ int idIndex =
(int)std::distance(names.begin(), it); //!< TODO: conversion from __int64 to int
dump += shift + "objId = " + values[idIndex] + "\n";
}
dump += shift + "objId = " + values[idIndex] + "\n";
}
- for(int j = 0; j <
names.size() && j < values.size(); j++) {
+ for(int j = 0; j <
(int)names.size() && j < (int)values.size(); j++) { //TODO: mismtach siged/unsigned
if(names[j] == _PT_ID_) continue;
if(hasId)
dump += shift + "ipar.setParameter(" + "objId" + ", \"" + names[j] + "\", \"" + values[j] + "\")\n";
if(names[j] == _PT_ID_) continue;
if(hasId)
dump += shift + "ipar.setParameter(" + "objId" + ", \"" + names[j] + "\", \"" + values[j] + "\")\n";