Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/collada/ExtraHandler.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/collada/ExtraHandler.h')
-rw-r--r--source/blender/collada/ExtraHandler.h72
1 files changed, 35 insertions, 37 deletions
diff --git a/source/blender/collada/ExtraHandler.h b/source/blender/collada/ExtraHandler.h
index fef1d5c9b7f..8203b364953 100644
--- a/source/blender/collada/ExtraHandler.h
+++ b/source/blender/collada/ExtraHandler.h
@@ -21,7 +21,7 @@
#include <string>
#include <map>
#include <vector>
-#include <algorithm> // sort()
+#include <algorithm> // sort()
#include "COLLADASaxFWLIExtraDataCallbackHandler.h"
#include "COLLADASaxFWLFilePartLoader.h"
@@ -33,47 +33,45 @@
/** \brief Handler class for \<extra\> data, through which different
* profiles can be handled
*/
-class ExtraHandler : public COLLADASaxFWL::IExtraDataCallbackHandler
-{
-public:
- /** Constructor. */
- ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp);
+class ExtraHandler : public COLLADASaxFWL::IExtraDataCallbackHandler {
+ public:
+ /** Constructor. */
+ ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp);
- /** Destructor. */
- virtual ~ExtraHandler();
+ /** Destructor. */
+ virtual ~ExtraHandler();
- /** Handle the beginning of an element. */
- bool elementBegin( const char* elementName, const char** attributes);
+ /** Handle the beginning of an element. */
+ bool elementBegin(const char *elementName, const char **attributes);
- /** Handle the end of an element. */
- bool elementEnd(const char* elementName );
+ /** Handle the end of an element. */
+ bool elementEnd(const char *elementName);
- /** Receive the data in text format. */
- bool textData(const char* text, size_t textLength);
+ /** Receive the data in text format. */
+ bool textData(const char *text, size_t textLength);
- /** Method to ask, if the current callback handler want to read the data of the given extra element. */
- bool parseElement (
- const char* profileName,
- const unsigned long& elementHash,
- const COLLADAFW::UniqueId& uniqueId,
- COLLADAFW::Object* object);
+ /** Method to ask, if the current callback handler want to read the data of the given extra element. */
+ bool parseElement(const char *profileName,
+ const unsigned long &elementHash,
+ const COLLADAFW::UniqueId &uniqueId,
+ COLLADAFW::Object *object);
- /** For backwards compatibility with older OpenCollada, new version added object parameter */
- bool parseElement (
- const char* profileName,
- const unsigned long& elementHash,
- const COLLADAFW::UniqueId& uniqueId);
-private:
- /** Disable default copy constructor. */
- ExtraHandler(const ExtraHandler& pre);
- /** Disable default assignment operator. */
- const ExtraHandler& operator= ( const ExtraHandler& pre );
+ /** For backwards compatibility with older OpenCollada, new version added object parameter */
+ bool parseElement(const char *profileName,
+ const unsigned long &elementHash,
+ const COLLADAFW::UniqueId &uniqueId);
- /** Handle to DocumentImporter for interface to extra element data saving. */
- DocumentImporter* dimp;
- AnimationImporter* aimp;
- /** Holds Id of element for which <extra> XML elements are handled. */
- COLLADAFW::UniqueId currentUid;
- ExtraTags* currentExtraTags;
- std::string currentElement;
+ private:
+ /** Disable default copy constructor. */
+ ExtraHandler(const ExtraHandler &pre);
+ /** Disable default assignment operator. */
+ const ExtraHandler &operator=(const ExtraHandler &pre);
+
+ /** Handle to DocumentImporter for interface to extra element data saving. */
+ DocumentImporter *dimp;
+ AnimationImporter *aimp;
+ /** Holds Id of element for which <extra> XML elements are handled. */
+ COLLADAFW::UniqueId currentUid;
+ ExtraTags *currentExtraTags;
+ std::string currentElement;
};