From 5c696b1607e7b7b4d6cbbb9a77d5dc76cfe742b8 Mon Sep 17 00:00:00 2001 From: Daniel McEwen Date: Fri, 17 May 2019 16:26:10 +0100 Subject: [PATCH] Purge underscored header file barriers Change-Id: I9e57f3cf9d687531fd7c38139f39f4b61e5c2812 --- examples/image-scaling-irregular-grid/grid-flags.h | 11 ++++++----- examples/text-label-emojis/emoji-strings.h | 6 +++--- shared/multi-language-strings.h | 6 +++--- shared/view.h | 6 +++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/examples/image-scaling-irregular-grid/grid-flags.h b/examples/image-scaling-irregular-grid/grid-flags.h index 01bb44f..1c151cc 100644 --- a/examples/image-scaling-irregular-grid/grid-flags.h +++ b/examples/image-scaling-irregular-grid/grid-flags.h @@ -1,5 +1,5 @@ -#ifndef __DALI_DEMO_GRID_FLAGS_H_ -#define __DALI_DEMO_GRID_FLAGS_H_ +#ifndef DALI_DEMO_GRID_FLAGS_H +#define DALI_DEMO_GRID_FLAGS_H /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. * @@ -197,7 +197,8 @@ private: unsigned mHighestUsedRow; }; -} /* namespace Demo */ -} /* namespace Dali */ +} // namespace Demo -#endif /* __DALI_DEMO_GRID_FLAGS_H_ */ +} // namespace Dali + +#endif // DALI_DEMO_GRID_FLAGS_H diff --git a/examples/text-label-emojis/emoji-strings.h b/examples/text-label-emojis/emoji-strings.h index 81c8a6f..99822a8 100644 --- a/examples/text-label-emojis/emoji-strings.h +++ b/examples/text-label-emojis/emoji-strings.h @@ -1,5 +1,5 @@ -#ifndef __DALI_DEMO_EMOJI_STRINGS_H__ -#define __DALI_DEMO_EMOJI_STRINGS_H__ +#ifndef DALI_DEMO_EMOJI_STRINGS_H +#define DALI_DEMO_EMOJI_STRINGS_H /* * Copyright (c) 2015 Samsung Electronics Co., Ltd. @@ -100,4 +100,4 @@ namespace EmojiStrings } // EmojiStrings -#endif // __DALI_DEMO_EMOJI_STRINGS_H__ +#endif // DALI_DEMO_EMOJI_STRINGS_H diff --git a/shared/multi-language-strings.h b/shared/multi-language-strings.h index f5f1675..5879d03 100644 --- a/shared/multi-language-strings.h +++ b/shared/multi-language-strings.h @@ -1,5 +1,5 @@ -#ifndef __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__ -#define __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__ +#ifndef DALI_DEMO_MULTI_LANGUAGE_STRINGS_H +#define DALI_DEMO_MULTI_LANGUAGE_STRINGS_H /* * Copyright (c) 2015 Samsung Electronics Co., Ltd. @@ -227,4 +227,4 @@ namespace MultiLanguageStrings } // MultiLanguageStrings -#endif // __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__ +#endif // DALI_DEMO_MULTI_LANGUAGE_STRINGS_H diff --git a/shared/view.h b/shared/view.h index 6ec55d0..4497a63 100644 --- a/shared/view.h +++ b/shared/view.h @@ -1,5 +1,5 @@ -#ifndef __DALI_DEMO_HELPER_VIEW_H__ -#define __DALI_DEMO_HELPER_VIEW_H__ +#ifndef DALI_DEMO_HELPER_VIEW_H +#define DALI_DEMO_HELPER_VIEW_H /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -177,4 +177,4 @@ Dali::Toolkit::TextLabel CreateToolBarLabel( const std::string& text ) } // DemoHelper -#endif // __DALI_DEMO_HELPER_VIEW_H__ +#endif // DALI_DEMO_HELPER_VIEW_H -- 2.7.4