kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 2 Packages Projects 9 Releases 2 Wiki Activity

App: use empty

Browse Source
This commit is contained in:
berniev
2022-08-06 02:41:59 +10:00
committed by wwmayer
parent 125d2962c7
commit 22dcf5866f
16 changed files with 127 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/App/ObjectIdentifier.cpp
View File

@@ -122,11 +122,11 @@ ObjectIdentifier::ObjectIdentifier(const App::PropertyContainer * _owner,
FC_THROWM(Base::RuntimeError,"Property must be owned by a document object.");
owner = const_cast<DocumentObject*>(docObj);
if (property.size() > 0) {
if (!property.empty()) {
setDocumentObjectName(docObj);
}
}
if (property.size() > 0) {
if (!property.empty()) {
addComponent(SimpleComponent(property));
if(index!=INT_MAX)
addComponent(ArrayComponent(index));
@@ -331,7 +331,7 @@ bool ObjectIdentifier::verify(const App::Property &prop, bool silent) const {
const std::string &ObjectIdentifier::toString() const
{
if(_cache.size() || !owner)
if(!_cache.empty() || !owner)
return _cache;
std::ostringstream s;
@@ -348,21 +348,21 @@ const std::string &ObjectIdentifier::toString() const
result.propertyIndex==0))
{
s << '.';
}else if (documentNameSet && documentName.getString().size()) {
if(documentObjectNameSet && documentObjectName.getString().size())
}else if (documentNameSet && !documentName.getString().empty()) {
if(documentObjectNameSet && !documentObjectName.getString().empty())
s << documentName.toString() << "#"
<< documentObjectName.toString() << '.';
else if(result.resolvedDocumentObjectName.getString().size())
else if(!result.resolvedDocumentObjectName.getString().empty())
s << documentName.toString() << "#"
<< result.resolvedDocumentObjectName.toString() << '.';
} else if (documentObjectNameSet && documentObjectName.getString().size()) {
} else if (documentObjectNameSet && !documentObjectName.getString().empty()) {
s << documentObjectName.toString() << '.';
} else if (result.propertyIndex > 0) {
components[0].toString(s);
s << '.';
}
if(subObjectName.getString().size())
if(!subObjectName.getString().empty())
s << subObjectName.toString() << '.';
s << components[result.propertyIndex].getName();
@@ -398,21 +398,21 @@ std::string ObjectIdentifier::toPersistentString() const {
if(documentObjectName.isRealString())
s << '@';
s << '.';
} else if (documentNameSet && documentName.getString().size()) {
if(documentObjectNameSet && documentObjectName.getString().size())
} else if (documentNameSet && !documentName.getString().empty()) {
if(documentObjectNameSet && !documentObjectName.getString().empty())
s << documentName.toString() << "#"
<< documentObjectName.toString() << '.';
else if(result.resolvedDocumentObjectName.getString().size())
else if(!result.resolvedDocumentObjectName.getString().empty())
s << documentName.toString() << "#"
<< result.resolvedDocumentObjectName.toString() << '.';
} else if (documentObjectNameSet && documentObjectName.getString().size()) {
} else if (documentObjectNameSet && !documentObjectName.getString().empty()) {
s << documentObjectName.toString() << '.';
} else if (result.propertyIndex > 0) {
components[0].toString(s);
s << '.';
}
if(subObjectName.getString().size()) {
if(!subObjectName.getString().empty()) {
const char *subname = subObjectName.getString().c_str();
std::string exportName;
s << String(PropertyLinkBase::exportSubName(exportName,
@@ -426,7 +426,7 @@ std::string ObjectIdentifier::toPersistentString() const {
std::size_t ObjectIdentifier::hash() const
{
if(_hash && _cache.size())
if(_hash && !_cache.empty())
return _hash;
const_cast<ObjectIdentifier*>(this)->_hash = boost::hash_value(toString());
return _hash;
@@ -484,10 +484,10 @@ bool ObjectIdentifier::updateLabelReference(
ResolveResults result(*this);
if(subObjectName.getString().size() && result.resolvedDocumentObject) {
if(!subObjectName.getString().empty() && result.resolvedDocumentObject) {
std::string sub = PropertyLinkBase::updateLabelReference(
result.resolvedDocumentObject, subObjectName.getString().c_str(), obj,ref,newLabel);
if(sub.size()) {
if(!sub.empty()) {
subObjectName = String(sub,true);
_cache.clear();
return true;
@@ -497,7 +497,7 @@ bool ObjectIdentifier::updateLabelReference(
if(result.resolvedDocument != obj->getDocument())
return false;
if(documentObjectName.getString().size()) {
if(!documentObjectName.getString().empty()) {
if(documentObjectName.isForceIdentifier())
return false;
@@ -899,7 +899,7 @@ void ObjectIdentifier::resolve(ResolveResults &results) const
bool docAmbiguous = false;
/* Document name specified? */
if (documentName.getString().size() > 0) {
if (!documentName.getString().empty()) {
results.resolvedDocument = getDocument(documentName,&docAmbiguous);
results.resolvedDocumentName = documentName;
}
@@ -914,7 +914,7 @@ void ObjectIdentifier::resolve(ResolveResults &results) const
// Assume document name and object name from owner if not found
if (!results.resolvedDocument) {
if (documentName.getString().size() > 0) {
if (!documentName.getString().empty()) {
if(docAmbiguous)
results.flags.set(ResolveAmbiguous);
return;
@@ -928,14 +928,14 @@ void ObjectIdentifier::resolve(ResolveResults &results) const
results.resolvedDocumentName = String(results.resolvedDocument->getName(), false, true);
/* Document object name specified? */
if (documentObjectName.getString().size() > 0) {
if (!documentObjectName.getString().empty()) {
results.resolvedDocumentObjectName = documentObjectName;
results.resolvedDocumentObject = getDocumentObject(
results.resolvedDocument, documentObjectName, results.flags);
if (!results.resolvedDocumentObject)
return;
if (components.size() > 0) {
if (!components.empty()) {
results.propertyName = components[0].name.getString();
results.propertyIndex = 0;
results.getProperty(*this);
@@ -1012,7 +1012,7 @@ void ObjectIdentifier::resolve(ResolveResults &results) const
Document * ObjectIdentifier::getDocument(String name, bool *ambiguous) const
{
if (name.getString().size() == 0)
if (name.getString().empty())
name = getDocumentName();
App::Document * docById = nullptr;
@@ -1098,12 +1098,12 @@ void ObjectIdentifier::getDepLabels(std::vector<std::string> &labels) const {
void ObjectIdentifier::getDepLabels(
const ResolveResults &result, std::vector<std::string> &labels) const
{
if(documentObjectName.getString().size()) {
if(!documentObjectName.getString().empty()) {
if(documentObjectName.isRealString())
labels.push_back(documentObjectName.getString());
} else if(result.propertyIndex == 1)
labels.push_back(components[0].name.getString());
if(subObjectName.getString().size())
if(!subObjectName.getString().empty())
PropertyLinkBase::getLabelReferences(labels,subObjectName.getString().c_str());
}
@@ -1130,7 +1130,7 @@ void ObjectIdentifier::getDep(Dependencies &deps, bool needProps, std::vector<st
}
if(!result.resolvedProperty) {
if(result.propertyName.size())
if(!result.propertyName.empty())
deps[result.resolvedDocumentObject].insert(result.propertyName);
return;
}
@@ -1163,7 +1163,7 @@ std::vector<std::string> ObjectIdentifier::getStringList() const
if (documentObjectNameSet)
l.push_back(documentObjectName.toString());
}
if(subObjectName.getString().size()) {
if(!subObjectName.getString().empty()) {
l.back() += subObjectName.toString();
}
std::vector<Component>::const_iterator i = components.begin();
@@ -1266,7 +1266,7 @@ Property *ObjectIdentifier::getProperty(int *ptype) const
Property *ObjectIdentifier::resolveProperty(const App::DocumentObject *obj,
const char *propertyName, App::DocumentObject *&sobj, int &ptype) const
{
if(obj && subObjectName.getString().size()) {
if(obj && !subObjectName.getString().empty()) {
sobj = obj->getSubObject(subObjectName);
obj = sobj;
}
@@ -1295,7 +1295,7 @@ Property *ObjectIdentifier::resolveProperty(const App::DocumentObject *obj,
else {
ptype = it->second;
if(ptype != PseudoShape &&
subObjectName.getString().size() &&
!subObjectName.getString().empty() &&
!boost::ends_with(subObjectName.getString(),"."))
{
return nullptr;
@@ -1358,7 +1358,7 @@ void ObjectIdentifier::setDocumentName(ObjectIdentifier::String &&name, bool for
force = false;
documentNameSet = force;
_cache.clear();
if(name.getString().size() && _DocumentMap) {
if(!name.getString().empty() && _DocumentMap) {
if(name.isRealString()) {
auto iter = _DocumentMap->find(name.toString());
if(iter!=_DocumentMap->end()) {
@@ -1481,7 +1481,7 @@ std::string ObjectIdentifier::String::toString(bool toPython) const
void ObjectIdentifier::String::checkImport(const App::DocumentObject *owner,
const App::DocumentObject *obj, String *objName)
{
if(owner && owner->getDocument() && str.size() &&
if(owner && owner->getDocument() && !str.empty() &&
ExpressionParser::ExpressionImporter::reader()) {
auto reader = ExpressionParser::ExpressionImporter::reader();
if (obj || objName) {
@@ -1524,7 +1524,7 @@ Py::Object ObjectIdentifier::access(const ResolveResults &result,
Py::Object *value, Dependencies *deps) const
{
if(!result.resolvedDocumentObject || !result.resolvedProperty ||
(subObjectName.getString().size() && !result.resolvedSubObject))
(!subObjectName.getString().empty() && !result.resolvedSubObject))
{
FC_THROWM(Base::RuntimeError, result.resolveErrorString()
<< " in '" << toString() << "'");
@@ -1685,7 +1685,7 @@ Py::Object ObjectIdentifier::access(const ResolveResults &result,
auto &propset = (*deps)[obj];
// inserting a blank name in the propset indicates the dependency is
// on all properties of the corresponding object.
if (propset.size() != 1 || propset.begin()->size()) {
if (propset.size() != 1 || !propset.begin()->->empty()) {
if (!propName) {
propset.clear();
propset.insert("");
@@ -1831,9 +1831,9 @@ void ObjectIdentifier::setValue(const App::any &value) const
}
const std::string &ObjectIdentifier::getSubObjectName(bool newStyle) const {
if(newStyle && shadowSub.first.size())
if(newStyle && !shadowSub.first.empty())
return shadowSub.first;
if(shadowSub.second.size())
if(!shadowSub.second.empty())
return shadowSub.second;
return subObjectName.getString();
}
@@ -1927,7 +1927,7 @@ bool ObjectIdentifier::isTouched() const {
void ObjectIdentifier::resolveAmbiguity() {
if(!owner || !owner->getNameInDocument() || isLocalProperty() ||
(documentObjectNameSet && documentObjectName.getString().size() &&
(documentObjectNameSet && !documentObjectName.getString().empty() &&
(documentObjectName.isRealString() || documentObjectName.isForceIdentifier())))
{
return;
@@ -1993,12 +1993,12 @@ std::string ObjectIdentifier::ResolveResults::resolveErrorString() const
else
ss << "Document object '" << resolvedDocumentObjectName.toString()
<< "' not found";
} else if (subObjectName.getString().size() && !resolvedSubObject) {
} else if (!subObjectName.getString().empty() && !resolvedSubObject) {
ss << "Sub-object '" << resolvedDocumentObjectName.getString()
<< '.' << subObjectName.toString() << "' not found";
} else if (!resolvedProperty) {
if(propertyType != PseudoShape &&
subObjectName.getString().size() &&
!subObjectName.getString().empty() &&
!boost::ends_with(subObjectName.getString(),"."))
{
ss << "Non geometry subname reference must end with '.'";