From 020181a96c6eb829b3f74273ddda7fc0e142f9d2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 30 Dec 2013 12:57:08 +0100 Subject: [PATCH] + Fix typo --- src/App/Document.cpp | 12 ++++++------ src/App/DynamicProperty.cpp | 12 ++++++------ src/App/PropertyContainer.cpp | 12 ++++++------ src/Base/Persistence.h | 2 +- src/Base/Writer.h | 6 +++--- src/Gui/Document.cpp | 24 ++++++++++++------------ 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/App/Document.cpp b/src/App/Document.cpp index c7c559ab2..b1c42135b 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -776,10 +776,10 @@ void Document::writeObjects(const std::vector& 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() << "" << endl; - writer.incInd(); // indention for 'Object type' + writer.incInd(); // indentation for 'Object type' std::vector::const_iterator it; for (it = obj.begin(); it != obj.end(); ++it) { writer.Stream() << writer.ind() << "& obj, << "/>" << endl; } - writer.decInd(); // indention for 'Object type' + writer.decInd(); // indentation for 'Object type' writer.Stream() << writer.ind() << "" << endl; // writing the features itself writer.Stream() << writer.ind() << "" << 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() << "getNameInDocument() << "\">" << endl; (*it)->Save(writer); writer.Stream() << writer.ind() << "" << endl; } - writer.decInd(); // indention for 'Object name' + writer.decInd(); // indentation for 'Object name' writer.Stream() << writer.ind() << "" << endl; - writer.decInd(); // indention for 'Objects count' + writer.decInd(); // indentation for 'Objects count' } std::vector diff --git a/src/App/DynamicProperty.cpp b/src/App/DynamicProperty.cpp index 82881f674..02f00c42d 100644 --- a/src/App/DynamicProperty.cpp +++ b/src/App/DynamicProperty.cpp @@ -307,12 +307,12 @@ void DynamicProperty::Save (Base::Writer &writer) const std::map Map; getPropertyMap(Map); - writer.incInd(); // indention for 'Properties Count' + writer.incInd(); // indentation for 'Properties Count' writer.Stream() << writer.ind() << "" << std::endl; std::map::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::const_iterator pt = props.find(it->first); if (pt == props.end()) { @@ -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 @@ -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() << "" << std::endl; - writer.decInd(); // indention for 'Property name' + writer.decInd(); // indentation for 'Property name' } writer.Stream() << writer.ind() << "" << std::endl; - writer.decInd(); // indention for 'Properties Count' + writer.decInd(); // indentation for 'Properties Count' } void DynamicProperty::Restore(Base::XMLReader &reader) diff --git a/src/App/PropertyContainer.cpp b/src/App/PropertyContainer.cpp index bc89e5a9b..ca917e740 100644 --- a/src/App/PropertyContainer.cpp +++ b/src/App/PropertyContainer.cpp @@ -178,7 +178,7 @@ void PropertyContainer::Save (Base::Writer &writer) const >(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() << "" << endl; std::map::iterator it; for (it = Map.begin(); it != Map.end(); ++it) @@ -186,10 +186,10 @@ void PropertyContainer::Save (Base::Writer &writer) const // 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() << "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 @@ -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() << "" << endl; - writer.decInd(); // indention for 'Property name' + writer.decInd(); // indentation for 'Property name' } } writer.Stream() << writer.ind() << "" << endl; - writer.decInd(); // indention for 'Properties Count' + writer.decInd(); // indentation for 'Properties Count' } void PropertyContainer::Restore(Base::XMLReader &reader) diff --git a/src/Base/Persistence.h b/src/Base/Persistence.h index dfa857b09..f3901153b 100644 --- a/src/Base/Persistence.h +++ b/src/Base/Persistence.h @@ -59,7 +59,7 @@ public: * "\" 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. diff --git a/src/Base/Writer.h b/src/Base/Writer.h index f1eb7c3ed..111f6d377 100644 --- a/src/Base/Writer.h +++ b/src/Base/Writer.h @@ -82,11 +82,11 @@ public: /** @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); //@} diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 19f6f71df..ccbc5e3f7 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -760,13 +760,13 @@ void Document::SaveDocFile (Base::Writer &writer) const std::map::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() << "_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; @@ -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() << "" << std::endl; - writer.decInd(); // indention for 'ViewProviderData Count' + writer.decInd(); // indentation for 'ViewProviderData Count' // set camera settings QString viewPos; @@ -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() << "" << std::endl; - writer.decInd(); // indention for camera settings + writer.decInd(); // indentation for camera settings writer.Stream() << "" << std::endl; } @@ -819,13 +819,13 @@ void Document::exportObjects(const std::vector& obj, Base: } // writing the view provider names itself - writer.incInd(); // indention for 'ViewProviderData Count' + writer.incInd(); // indentation for 'ViewProviderData Count' writer.Stream() << writer.ind() << "" << std::endl; bool xml = writer.isForceXML(); //writer.setForceXML(true); - writer.incInd(); // indention for 'ViewProvider name' + writer.incInd(); // indentation for 'ViewProvider name' std::map::const_iterator jt; for (jt = views.begin(); jt != views.end(); ++jt) { const App::DocumentObject* doc = jt->first; @@ -839,12 +839,12 @@ void Document::exportObjects(const std::vector& obj, Base: } writer.setForceXML(xml); - writer.decInd(); // indention for 'ViewProvider name' + writer.decInd(); // indentation for 'ViewProvider name' writer.Stream() << writer.ind() << "" << 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() << "" << std::endl; - writer.decInd(); // indention for camera settings + writer.decInd(); // indentation for camera settings writer.Stream() << "" << std::endl; }