Used single quotes for single character in string::find algorithm, more efficient
This commit is contained in:
@@ -111,7 +111,7 @@ std::string Extension::name() const {
|
||||
throw Base::RuntimeError("Extension::name: Extension type not set");
|
||||
|
||||
std::string temp(m_extensionType.getName());
|
||||
std::string::size_type pos = temp.find_last_of(":");
|
||||
std::string::size_type pos = temp.find_last_of(':');
|
||||
|
||||
if(pos != std::string::npos)
|
||||
return temp.substr(pos+1);
|
||||
|
||||
@@ -792,7 +792,7 @@ int getSWIGVersionFromModule(const std::string& module)
|
||||
Py::String file(mod.getAttr("__file__"));
|
||||
std::string filename = (std::string)file;
|
||||
// file can have the extension .py or .pyc
|
||||
filename = filename.substr(0, filename.rfind("."));
|
||||
filename = filename.substr(0, filename.rfind('.'));
|
||||
filename += ".py";
|
||||
boost::regex rx("^# Version ([1-9])\\.([0-9])\\.([0-9]+)");
|
||||
boost::cmatch what;
|
||||
|
||||
@@ -317,7 +317,7 @@ void FileWriter::writeFiles(void)
|
||||
if (shouldWrite(entry.FileName, entry.Object)) {
|
||||
std::string filePath = entry.FileName;
|
||||
std::string::size_type pos = 0;
|
||||
while ((pos = filePath.find("/", pos)) != std::string::npos) {
|
||||
while ((pos = filePath.find('/', pos)) != std::string::npos) {
|
||||
std::string dirName = DirName + "/" + filePath.substr(0, pos);
|
||||
pos++;
|
||||
Base::FileInfo fi(dirName);
|
||||
|
||||
@@ -375,7 +375,7 @@ void RecoveryWriter::writeFiles(void)
|
||||
if (shouldWrite(entry.FileName, entry.Object)) {
|
||||
std::string filePath = entry.FileName;
|
||||
std::string::size_type pos = 0;
|
||||
while ((pos = filePath.find("/", pos)) != std::string::npos) {
|
||||
while ((pos = filePath.find('/', pos)) != std::string::npos) {
|
||||
std::string dirName = DirName + "/" + filePath.substr(0, pos);
|
||||
pos++;
|
||||
Base::FileInfo fi(dirName);
|
||||
|
||||
@@ -893,7 +893,7 @@ void Model::updateStates()
|
||||
std::size_t Model::columnFromMask(const ColumnMask &maskIn)
|
||||
{
|
||||
std::string maskString = maskIn.to_string();
|
||||
return maskString.size() - maskString.find("1") - 1;
|
||||
return maskString.size() - maskString.find('1') - 1;
|
||||
}
|
||||
|
||||
RectItem* Model::getRectFromPosition(const QPointF& position)
|
||||
|
||||
@@ -1023,7 +1023,7 @@ void FemMesh::readNastran(const std::string &Filename)
|
||||
{
|
||||
std::getline(inputfile,line1);
|
||||
if (line1.size() == 0) continue;
|
||||
if (!nastran_free_format && line1.find(",")!= std::string::npos)
|
||||
if (!nastran_free_format && line1.find(',')!= std::string::npos)
|
||||
nastran_free_format = true;
|
||||
if (!nastran_free_format && line1.find("GRID*")!= std::string::npos ) //We found a Grid line
|
||||
{
|
||||
|
||||
@@ -1624,7 +1624,7 @@ bool MeshInput::LoadNastran (std::istream &rstrIn)
|
||||
if (line.find("GRID*") == 0) {
|
||||
assert(0);
|
||||
}
|
||||
else if (line.find("*") == 0) {
|
||||
else if (line.find('*') == 0) {
|
||||
assert(0);
|
||||
}
|
||||
// insert the read-in vertex into a map to preserve the order
|
||||
|
||||
@@ -261,7 +261,7 @@ void Toolpath::setFromGCode(const std::string instr)
|
||||
}
|
||||
mode = "comment";
|
||||
last = found;
|
||||
found = str.find_first_of(")", found+1);
|
||||
found = str.find_first_of(')', found+1);
|
||||
} else if (str[found] == ')') {
|
||||
// end of comment
|
||||
std::string gcodestr = str.substr(last, found-last+1);
|
||||
|
||||
@@ -343,7 +343,7 @@ bool PATLineSpec::findPatternStart(std::ifstream& inFile, std::string& parmName
|
||||
(line.empty()) ) { //is cr/lf empty?
|
||||
continue;
|
||||
} else if (nameTag == "*") {
|
||||
commaPos = line.find(",",1);
|
||||
commaPos = line.find(',',1);
|
||||
if (commaPos != std::string::npos) {
|
||||
patternName = line.substr(1,commaPos-1);
|
||||
} else {
|
||||
@@ -396,7 +396,7 @@ std::vector<std::string> PATLineSpec::getPatternList(std::string& parmFile)
|
||||
std::string nameTag = line.substr(0,1); //dupl code here
|
||||
unsigned long int commaPos;
|
||||
if (nameTag == "*") { //found a pattern
|
||||
commaPos = line.find(",",1);
|
||||
commaPos = line.find(',',1);
|
||||
std::string patternName;
|
||||
if (commaPos != std::string::npos) {
|
||||
patternName = line.substr(1,commaPos-1);
|
||||
|
||||
@@ -148,7 +148,7 @@ std::string LineGroup::getRecordFromFile(std::string parmFile, std::string group
|
||||
(line.empty()) ) { //is cr/lf empty?
|
||||
continue;
|
||||
} else if (nameTag == "*") {
|
||||
commaPos = line.find(",",1);
|
||||
commaPos = line.find(',',1);
|
||||
if (commaPos != std::string::npos) {
|
||||
foundName = line.substr(1,commaPos-1);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user