diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/CPack/cmCPackNSISGenerator.h | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/CPack/cmCPackNSISGenerator.h')
-rw-r--r-- | Source/CPack/cmCPackNSISGenerator.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index ab8ece4..fa52902 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -28,7 +28,9 @@ public: cmCPackTypeMacro(cmCPackNSISGenerator, cmCPackGenerator); static cmCPackGenerator* CreateGenerator64() - { return new cmCPackNSISGenerator(true); } + { + return new cmCPackNSISGenerator(true); + } /** * Construct generator @@ -38,14 +40,13 @@ public: protected: virtual int InitializeInternal(); - void CreateMenuLinks( std::ostringstream& str, - std::ostringstream& deleteStr); + void CreateMenuLinks(std::ostringstream& str, std::ostringstream& deleteStr); int PackageFiles(); virtual const char* GetOutputExtension() { return ".exe"; } virtual const char* GetOutputPostfix() { return "win32"; } bool GetListOfSubdirectories(const char* dir, - std::vector<std::string>& dirs); + std::vector<std::string>& dirs); enum cmCPackGenerator::CPackSetDestdirSupport SupportsSetDestdir() const; virtual bool SupportsAbsoluteDestination() const; @@ -54,28 +55,24 @@ protected: /// Produce a string that contains the NSIS code to describe a /// particular component. Any added macros will be emitted via /// macrosOut. - std::string - CreateComponentDescription(cmCPackComponent *component, - std::ostringstream& macrosOut); + std::string CreateComponentDescription(cmCPackComponent* component, + std::ostringstream& macrosOut); /// Produce NSIS code that selects all of the components that this component /// depends on, recursively. - std::string CreateSelectionDependenciesDescription - (cmCPackComponent *component, - std::set<cmCPackComponent *>& visited); + std::string CreateSelectionDependenciesDescription( + cmCPackComponent* component, std::set<cmCPackComponent*>& visited); /// Produce NSIS code that de-selects all of the components that are /// dependent on this component, recursively. - std::string CreateDeselectionDependenciesDescription - (cmCPackComponent *component, - std::set<cmCPackComponent *>& visited); + std::string CreateDeselectionDependenciesDescription( + cmCPackComponent* component, std::set<cmCPackComponent*>& visited); /// Produce a string that contains the NSIS code to describe a /// particular component group, including its components. Any /// added macros will be emitted via macrosOut. - std::string - CreateComponentGroupDescription(cmCPackComponentGroup *group, - std::ostringstream& macrosOut); + std::string CreateComponentGroupDescription(cmCPackComponentGroup* group, + std::ostringstream& macrosOut); /// Translations any newlines found in the string into \\r\\n, so that the /// resulting string can be used within NSIS. |