Skip to content

Commit

Permalink
+ Fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Dec 30, 2013
1 parent 365099a commit 020181a
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 34 deletions.
12 changes: 6 additions & 6 deletions src/App/Document.cpp
View file
Expand Up @@ -776,10 +776,10 @@ void Document::writeObjects(const std::vector<App::DocumentObject*>& obj,
Base::Writer &writer) const
{
// writing the features types
writer.incInd(); // indention for 'Objects count'
writer.incInd(); // indentation for 'Objects count'
writer.Stream() << writer.ind() << "<Objects Count=\"" << obj.size() <<"\">" << endl;

writer.incInd(); // indention for 'Object type'
writer.incInd(); // indentation for 'Object type'
std::vector<DocumentObject*>::const_iterator it;
for (it = obj.begin(); it != obj.end(); ++it) {
writer.Stream() << writer.ind() << "<Object "
Expand All @@ -788,22 +788,22 @@ void Document::writeObjects(const std::vector<App::DocumentObject*>& obj,
<< "/>" << endl;
}

writer.decInd(); // indention for 'Object type'
writer.decInd(); // indentation for 'Object type'
writer.Stream() << writer.ind() << "</Objects>" << endl;

// writing the features itself
writer.Stream() << writer.ind() << "<ObjectData Count=\"" << obj.size() <<"\">" << endl;

writer.incInd(); // indention for 'Object name'
writer.incInd(); // indentation for 'Object name'
for (it = obj.begin(); it != obj.end(); ++it) {
writer.Stream() << writer.ind() << "<Object name=\"" << (*it)->getNameInDocument() << "\">" << endl;
(*it)->Save(writer);
writer.Stream() << writer.ind() << "</Object>" << endl;
}

writer.decInd(); // indention for 'Object name'
writer.decInd(); // indentation for 'Object name'
writer.Stream() << writer.ind() << "</ObjectData>" << endl;
writer.decInd(); // indention for 'Objects count'
writer.decInd(); // indentation for 'Objects count'
}

std::vector<App::DocumentObject*>
Expand Down
12 changes: 6 additions & 6 deletions src/App/DynamicProperty.cpp
View file
Expand Up @@ -307,12 +307,12 @@ void DynamicProperty::Save (Base::Writer &writer) const
std::map<std::string,Property*> Map;
getPropertyMap(Map);

writer.incInd(); // indention for 'Properties Count'
writer.incInd(); // indentation for 'Properties Count'
writer.Stream() << writer.ind() << "<Properties Count=\"" << Map.size() << "\">" << std::endl;
std::map<std::string,Property*>::iterator it;
for (it = Map.begin(); it != Map.end(); ++it)
{
writer.incInd(); // indention for 'Property name'
writer.incInd(); // indentation for 'Property name'
// check whether a static or dynamic property
std::map<std::string,PropData>::const_iterator pt = props.find(it->first);
if (pt == props.end()) {
Expand All @@ -328,7 +328,7 @@ void DynamicProperty::Save (Base::Writer &writer) const
<< "\" hide=\"" << pt->second.hidden << "\">" << std::endl;
}

writer.incInd(); // indention for the actual property
writer.incInd(); // indentation for the actual property
try {
// We must make sure to handle all exceptions accordingly so that
// the project file doesn't get invalidated. In the error case this
Expand All @@ -352,12 +352,12 @@ void DynamicProperty::Save (Base::Writer &writer) const
Base::Console().Error("DynamicProperty::Save: Unknown C++ exception thrown. Try to continue...\n");
}
#endif
writer.decInd(); // indention for the actual property
writer.decInd(); // indentation for the actual property
writer.Stream() << writer.ind() << "</Property>" << std::endl;
writer.decInd(); // indention for 'Property name'
writer.decInd(); // indentation for 'Property name'
}
writer.Stream() << writer.ind() << "</Properties>" << std::endl;
writer.decInd(); // indention for 'Properties Count'
writer.decInd(); // indentation for 'Properties Count'
}

void DynamicProperty::Restore(Base::XMLReader &reader)
Expand Down
12 changes: 6 additions & 6 deletions src/App/PropertyContainer.cpp
View file
Expand Up @@ -178,18 +178,18 @@ void PropertyContainer::Save (Base::Writer &writer) const
<std::pair<std::string,Property*> >(this), Prop_Transient));
size_t size = Map.size() - ct;

writer.incInd(); // indention for 'Properties Count'
writer.incInd(); // indentation for 'Properties Count'
writer.Stream() << writer.ind() << "<Properties Count=\"" << size << "\">" << endl;
std::map<std::string,Property*>::iterator it;
for (it = Map.begin(); it != Map.end(); ++it)
{
// Don't write transient properties
if (!(getPropertyType(it->second) & Prop_Transient))
{
writer.incInd(); // indention for 'Property name'
writer.incInd(); // indentation for 'Property name'
writer.Stream() << writer.ind() << "<Property name=\"" << it->first << "\" type=\""
<< it->second->getTypeId().getName() << "\">" << endl;;
writer.incInd(); // indention for the actual property
writer.incInd(); // indentation for the actual property
try {
// We must make sure to handle all exceptions accordingly so that
// the project file doesn't get invalidated. In the error case this
Expand All @@ -210,13 +210,13 @@ void PropertyContainer::Save (Base::Writer &writer) const
Base::Console().Error("PropertyContainer::Save: Unknown C++ exception thrown. Try to continue...\n");
}
#endif
writer.decInd(); // indention for the actual property
writer.decInd(); // indentation for the actual property
writer.Stream() << writer.ind() << "</Property>" << endl;
writer.decInd(); // indention for 'Property name'
writer.decInd(); // indentation for 'Property name'
}
}
writer.Stream() << writer.ind() << "</Properties>" << endl;
writer.decInd(); // indention for 'Properties Count'
writer.decInd(); // indentation for 'Properties Count'
}

void PropertyContainer::Restore(Base::XMLReader &reader)
Expand Down
2 changes: 1 addition & 1 deletion src/Base/Persistence.h
View file
Expand Up @@ -59,7 +59,7 @@ class BaseExport Persistence : public BaseClass
* "\" valueZ=\"" << _cVec.z <<"\"/>" << endl;
* }
* \endcode
* The writer.ind() expression writes the indention, just for pretty printing of the XML.
* The writer.ind() expression writes the indentation, just for pretty printing of the XML.
* As you see, the writing of the XML document is not done with a DOM implementation because
* of performance reasons. Therefore the programmer has to take care that a valid XML document
* is written. This means closing tags and writing UTF-8.
Expand Down
6 changes: 3 additions & 3 deletions src/Base/Writer.h
View file
Expand Up @@ -82,11 +82,11 @@ class BaseExport Writer

/** @name pretty formating for XML */
//@{
/// get the current indention
/// get the current indentation
const char* ind(void) const {return indBuf;}
/// increase indention by one tab
/// increase indentation by one tab
void incInd(void);
/// decrease indention by one tab
/// decrease indentation by one tab
void decInd(void);
//@}

Expand Down
24 changes: 12 additions & 12 deletions src/Gui/Document.cpp
View file
Expand Up @@ -760,13 +760,13 @@ void Document::SaveDocFile (Base::Writer &writer) const
std::map<const App::DocumentObject*,ViewProviderDocumentObject*>::const_iterator it;

// writing the view provider names itself
writer.incInd(); // indention for 'ViewProviderData Count'
writer.incInd(); // indentation for 'ViewProviderData Count'
writer.Stream() << writer.ind() << "<ViewProviderData Count=\""
<< d->_ViewProviderMap.size() <<"\">" << std::endl;

bool xml = writer.isForceXML();
//writer.setForceXML(true);
writer.incInd(); // indention for 'ViewProvider name'
writer.incInd(); // indentation for 'ViewProvider name'
for(it = d->_ViewProviderMap.begin(); it != d->_ViewProviderMap.end(); ++it) {
const App::DocumentObject* doc = it->first;
ViewProvider* obj = it->second;
Expand All @@ -779,9 +779,9 @@ void Document::SaveDocFile (Base::Writer &writer) const
}
writer.setForceXML(xml);

writer.decInd(); // indention for 'ViewProvider name'
writer.decInd(); // indentation for 'ViewProvider name'
writer.Stream() << writer.ind() << "</ViewProviderData>" << std::endl;
writer.decInd(); // indention for 'ViewProviderData Count'
writer.decInd(); // indentation for 'ViewProviderData Count'

// set camera settings
QString viewPos;
Expand All @@ -797,10 +797,10 @@ void Document::SaveDocFile (Base::Writer &writer) const
}
}

writer.incInd(); // indention for camera settings
writer.incInd(); // indentation for camera settings
writer.Stream() << writer.ind() << "<Camera settings=\""
<< (const char*)viewPos.toAscii() <<"\"/>" << std::endl;
writer.decInd(); // indention for camera settings
writer.decInd(); // indentation for camera settings
writer.Stream() << "</Document>" << std::endl;
}

Expand All @@ -819,13 +819,13 @@ void Document::exportObjects(const std::vector<App::DocumentObject*>& obj, Base:
}

// writing the view provider names itself
writer.incInd(); // indention for 'ViewProviderData Count'
writer.incInd(); // indentation for 'ViewProviderData Count'
writer.Stream() << writer.ind() << "<ViewProviderData Count=\""
<< views.size() <<"\">" << std::endl;

bool xml = writer.isForceXML();
//writer.setForceXML(true);
writer.incInd(); // indention for 'ViewProvider name'
writer.incInd(); // indentation for 'ViewProvider name'
std::map<const App::DocumentObject*,ViewProvider*>::const_iterator jt;
for (jt = views.begin(); jt != views.end(); ++jt) {
const App::DocumentObject* doc = jt->first;
Expand All @@ -839,12 +839,12 @@ void Document::exportObjects(const std::vector<App::DocumentObject*>& obj, Base:
}
writer.setForceXML(xml);

writer.decInd(); // indention for 'ViewProvider name'
writer.decInd(); // indentation for 'ViewProvider name'
writer.Stream() << writer.ind() << "</ViewProviderData>" << std::endl;
writer.decInd(); // indention for 'ViewProviderData Count'
writer.incInd(); // indention for camera settings
writer.decInd(); // indentation for 'ViewProviderData Count'
writer.incInd(); // indentation for camera settings
writer.Stream() << writer.ind() << "<Camera settings=\"\"/>" << std::endl;
writer.decInd(); // indention for camera settings
writer.decInd(); // indentation for camera settings
writer.Stream() << "</Document>" << std::endl;
}

Expand Down

0 comments on commit 020181a

Please sign in to comment.