diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/application/AppConfig.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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/freestyle/intern/application/AppConfig.h')
-rw-r--r-- | source/blender/freestyle/intern/application/AppConfig.h | 90 |
1 files changed, 57 insertions, 33 deletions
diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h index c9eeca457eb..cc2a3962ecd 100644 --- a/source/blender/freestyle/intern/application/AppConfig.h +++ b/source/blender/freestyle/intern/application/AppConfig.h @@ -27,7 +27,7 @@ #include "../system/Precision.h" #ifdef WITH_CXX_GUARDEDALLOC -#include "MEM_guardedalloc.h" +# include "MEM_guardedalloc.h" #endif using namespace std; @@ -37,38 +37,62 @@ namespace Freestyle { namespace Config { class Path { -protected: - static Path *_pInstance; - string _ProjectDir; - string _ModelsPath; - string _PatternsPath; - string _BrushesPath; - string _PythonPath; - string _EnvMapDir; - string _MapsDir; - string _HomeDir; - -public: - Path(); - virtual ~Path(); - static Path *getInstance(); - - void setRootDir(const string& iRootDir); - void setHomeDir(const string& iHomeDir); - - const string& getProjectDir() const {return _ProjectDir;} - const string& getModelsPath() const {return _ModelsPath;} - const string& getPatternsPath() const {return _PatternsPath;} - const string& getBrushesPath() const {return _BrushesPath;} - const string& getPythonPath() const {return _PythonPath;} - const string& getEnvMapDir() const {return _EnvMapDir;} - const string& getMapsDir() const {return _MapsDir;} - const string& getHomeDir() const {return _HomeDir;} - - static string getEnvVar(const string& iEnvVarName); + protected: + static Path *_pInstance; + string _ProjectDir; + string _ModelsPath; + string _PatternsPath; + string _BrushesPath; + string _PythonPath; + string _EnvMapDir; + string _MapsDir; + string _HomeDir; + + public: + Path(); + virtual ~Path(); + static Path *getInstance(); + + void setRootDir(const string &iRootDir); + void setHomeDir(const string &iHomeDir); + + const string &getProjectDir() const + { + return _ProjectDir; + } + const string &getModelsPath() const + { + return _ModelsPath; + } + const string &getPatternsPath() const + { + return _PatternsPath; + } + const string &getBrushesPath() const + { + return _BrushesPath; + } + const string &getPythonPath() const + { + return _PythonPath; + } + const string &getEnvMapDir() const + { + return _EnvMapDir; + } + const string &getMapsDir() const + { + return _MapsDir; + } + const string &getHomeDir() const + { + return _HomeDir; + } + + static string getEnvVar(const string &iEnvVarName); #ifdef WITH_CXX_GUARDEDALLOC - MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Config:Path") + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Config:Path") #endif }; @@ -100,8 +124,8 @@ static const string OPTIONS_QGLVIEWER_FILE("qglviewer.xml"); static const real DEFAULT_SPHERE_RADIUS = 1.0; static const real DEFAULT_DKR_EPSILON = 0.0; -} // End of namepace Config +} // namespace Config } /* namespace Freestyle */ -#endif // __APP_CONFIG_H__ +#endif // __APP_CONFIG_H__ |