diff --git a/src/App/ElementMap.cpp b/src/App/ElementMap.cpp index 6e7c99ab58..9f8a98fdd9 100644 --- a/src/App/ElementMap.cpp +++ b/src/App/ElementMap.cpp @@ -1,3 +1,8 @@ +#include "PreCompiled.h" +#ifndef _PreComp_ +# include +# include +#endif #include "ElementMap.h" #include "ElementNamingUtils.h" @@ -5,12 +10,8 @@ #include "App/Application.h" #include "Base/Console.h" -// #include -#include -#include - -#include -#include +# include +# include FC_LOG_LEVEL_INIT("ElementMap", true, 2); diff --git a/src/App/ElementMap.h b/src/App/ElementMap.h index ffe4eda642..ff17a1bccb 100644 --- a/src/App/ElementMap.h +++ b/src/App/ElementMap.h @@ -56,8 +56,8 @@ typedef std::shared_ptr ElementMapPtr; class AppExport ElementMap: public std::enable_shared_from_this //TODO can remove shared_from_this? { public: - /** Default constructor: hooks internal functions to \c signalSaveDocument and - * \c signalStartRestoreDocument. This is related to the save and restore process + /** Default constructor: hooks internal functions to \c signalSaveDocument and + * \c signalStartRestoreDocument. This is related to the save and restore process * of the map. */ ElementMap(); @@ -65,7 +65,7 @@ public: /** Ensures that naming is properly assigned. It then marks as "used" all the StringID * that are used to make up this particular map and are stored in the hasher passed * as a parameter. Finally do this recursively for all childEelementMaps as well. - * + * * @param hasher where all the StringID needed to build the map are stored. */ // FIXME this should be made part of \c save, to achieve symmetry with the restore method @@ -73,12 +73,12 @@ public: /** Serialize this map. Calls \c collectChildMaps to get \c childMapSet and * \c postfixMap, then calls the other (private) save function with those parameters. - * @param s: serialized stream + * @param s: serialized stream */ void save(std::ostream& s) const; /** Deserialize and restore this map. This function restores \c childMaps and - * \c postfixes from the stream, then calls the other (private) restore function with those + * \c postfixes from the stream, then calls the other (private) restore function with those * parameters. * @param hasher: where all the StringIDs are stored * @param s: stream to deserialize @@ -183,7 +183,7 @@ public: private: /** Serialize this map - * @param s: serialized stream + * @param s: serialized stream * @param childMapSet: where all child element maps are stored * @param postfixMap. where all postfixes are stored */ @@ -205,7 +205,7 @@ private: * @param idx: the indexed name that \c name will be bound to * @param sids: where StringIDs that make up the name are stored * @param overwrite: if true, all the names associated with \c idx will be discarded - * @param existing: out variable: if not overwriting, and \c name is already + * @param existing: out variable: if not overwriting, and \c name is already * associated with another indexedName, set \c existing to that indexedname * @return the name just added, or an empty name if it wasn't added. */ @@ -213,7 +213,7 @@ private: bool overwrite, IndexedName* existing); /** Utility function that adds \c postfix to \c postfixMap, and to \c postfixes - * if it was not present in the map. + * if it was not present in the map. */ static void addPostfix(const QByteArray& postfix, std::map& postfixMap, std::vector& postfixes); diff --git a/src/App/ElementNamingUtils.cpp b/src/App/ElementNamingUtils.cpp index c9e42a6e52..b972dde726 100644 --- a/src/App/ElementNamingUtils.cpp +++ b/src/App/ElementNamingUtils.cpp @@ -1,5 +1,6 @@ -#include "ElementNamingUtils.h" +#include "PreCompiled.h" +#include "ElementNamingUtils.h" #include diff --git a/src/App/ElementNamingUtils.h b/src/App/ElementNamingUtils.h index 25b86972e9..a2055e9b4c 100644 --- a/src/App/ElementNamingUtils.h +++ b/src/App/ElementNamingUtils.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef ELEMENT_NAMING_UTILS_H +#define ELEMENT_NAMING_UTILS_H #include #include "FCGlobal.h" @@ -48,7 +49,7 @@ AppExport bool hasMissingElement(const char *subname); */ AppExport const char *isMappedElement(const char *name); -/// Strip out the trailing element name if there is mapped element name preceeds it. +/// Strip out the trailing element name if there is mapped element name precedes it. AppExport std::string newElementName(const char *name); /// Strip out the mapped element name if there is one. @@ -63,4 +64,6 @@ AppExport const char *findElementName(const char *subname); AppExport const char *hasMappedElementName(const char *subname); -}// namespace Data \ No newline at end of file +}// namespace Data + +#endif // ELEMENT_NAMING_UTILS_H diff --git a/src/App/MappedName.cpp b/src/App/MappedName.cpp index 1f9779ef45..d861679131 100644 --- a/src/App/MappedName.cpp +++ b/src/App/MappedName.cpp @@ -72,7 +72,7 @@ int MappedName::findTagInElementName(long* tag, int* len, const char* postfix, // pos if(pos < 0) { - pos = this->rfind(POSTFIX_DECIMAL_TAG); + pos = this->rfind(POSTFIX_DECIMAL_TAG); if (pos < 0) return -1; hex = false; @@ -107,7 +107,7 @@ int MappedName::findTagInElementName(long* tag, int* len, const char* postfix, // // #94;:G0;XTR;:H19:8,F;:H1a,F;BND:-1:0;:H1b:10,F // | | ^^ ^^ - // | | | | + // | | | | // ---len = 0x10--- tag len iss >> std::hex;