From 7b12a241eda98e63f993415653449e78e7a7ffb5 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 9 Nov 2017 19:10:32 -0500 Subject: [PATCH] Remove BOMs Fix coding style and script --- modules/fieldlinessequence/util/commons.cpp | 2 +- modules/fieldlinessequence/util/kameleonfieldlinehelper.h | 2 +- modules/globebrowsing/rendering/layer/layer.cpp | 2 +- src/engine/configurationmanager_doc.inl | 2 +- support/coding/check_style_guide.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/fieldlinessequence/util/commons.cpp b/modules/fieldlinessequence/util/commons.cpp index df3f76978f..cf006a4abc 100644 --- a/modules/fieldlinessequence/util/commons.cpp +++ b/modules/fieldlinessequence/util/commons.cpp @@ -39,4 +39,4 @@ Model stringToModel(const std::string s) { } } // namespace fls -} // namespace openspace \ No newline at end of file +} // namespace openspace diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h index f6f898a5ed..e496dcd258 100644 --- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h +++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h @@ -45,4 +45,4 @@ bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string cdfPa } // namespace fls } // namespace openspace -#endif // __OPENSPACE_MODULE_FIELDLINESSEQUENCE___KAMELEONFIELDLINEHELPER___H__ \ No newline at end of file +#endif // __OPENSPACE_MODULE_FIELDLINESSEQUENCE___KAMELEONFIELDLINEHELPER___H__ diff --git a/modules/globebrowsing/rendering/layer/layer.cpp b/modules/globebrowsing/rendering/layer/layer.cpp index 1034cd385c..7a970cf579 100644 --- a/modules/globebrowsing/rendering/layer/layer.cpp +++ b/modules/globebrowsing/rendering/layer/layer.cpp @@ -1,4 +1,4 @@ -/***************************************************************************************** +/***************************************************************************************** * * * OpenSpace * * * diff --git a/src/engine/configurationmanager_doc.inl b/src/engine/configurationmanager_doc.inl index 5d13ee7742..561bd447e7 100644 --- a/src/engine/configurationmanager_doc.inl +++ b/src/engine/configurationmanager_doc.inl @@ -1,4 +1,4 @@ -/***************************************************************************************** +/***************************************************************************************** * * * OpenSpace * * * diff --git a/support/coding/check_style_guide.py b/support/coding/check_style_guide.py index a2c6d9705e..048bf311c4 100644 --- a/support/coding/check_style_guide.py +++ b/support/coding/check_style_guide.py @@ -310,7 +310,7 @@ def check_line_length(lines): previousSymbols = {} def check_header_file(file, component): - with open(file, 'r+') as f: + with open(file, 'r+', encoding="utf8") as f: lines = f.readlines() correctness = check_correctness(lines)