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

Expression/ObjectIdentifier: changed return type of renameDocumentObject and renameDocument,

Browse Source 
to be able to signal that a rename actually took place.
This commit is contained in:
Eivind Kvedalen
2015-12-19 00:50:10 +01:00
committed by wmayer
parent 58727037ef
commit ca0c9de886
4 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/App/ObjectIdentifier.cpp
View File

@@ -316,21 +316,30 @@ std::string ObjectIdentifier::toEscapedString() const
* @param newName New name of document object
*/
void ObjectIdentifier::renameDocumentObject(const std::string &oldName, const std::string &newName)
bool ObjectIdentifier::renameDocumentObject(const std::string &oldName, const std::string &newName)
{
if (documentObjectNameSet && documentObjectName == oldName) {
if (oldName == newName)
return false;
if (documentObjectNameSet && documentObjectName == oldName) {
if (ExpressionParser::isTokenAnIndentifier(newName))
documentObjectName = newName;
else
documentObjectName = ObjectIdentifier::String(newName, true);
resolve();
return true;
}
else if (propertyIndex == 1 && documentObjectName == oldName) {
if (ExpressionParser::isTokenAnIndentifier(newName))
components[0].name = newName;
else
components[0].name = ObjectIdentifier::String(newName, true);
resolve();
return true;
}
resolve();
return false;
}
/**
@@ -339,13 +348,18 @@ void ObjectIdentifier::renameDocumentObject(const std::string &oldName, const st
* @param newName New name of document
*/
void ObjectIdentifier::renameDocument(const std::string &oldName, const std::string &newName)
bool ObjectIdentifier::renameDocument(const std::string &oldName, const std::string &newName)
{
if (oldName == newName)
return false;
if (documentName == oldName) {
documentName = newName;
resolve();
return true;
}
resolve();
return false;
}
/**