From 66253e1f7d975b0c5dc3e850499054534bb0b95b Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 13 Oct 2020 09:25:46 +0200 Subject: [PATCH] Use #pragma once everywhere (thanks @guardonce project) --- radio/src/thirdparty/libopenui/src/basenumberedit.h | 4 +--- radio/src/thirdparty/libopenui/src/bitfield.h | 4 +--- radio/src/thirdparty/libopenui/src/bitmapbuffer.h | 4 +--- radio/src/thirdparty/libopenui/src/bufferedwindow.h | 4 +--- radio/src/thirdparty/libopenui/src/button.h | 4 +--- radio/src/thirdparty/libopenui/src/carousel.h | 4 +--- radio/src/thirdparty/libopenui/src/checkbox.h | 4 +--- radio/src/thirdparty/libopenui/src/choice.h | 4 +--- radio/src/thirdparty/libopenui/src/coloredit.h | 4 +--- radio/src/thirdparty/libopenui/src/dialog.h | 4 +--- radio/src/thirdparty/libopenui/src/expansion_panel.h | 4 +--- radio/src/thirdparty/libopenui/src/filechoice.h | 4 +--- radio/src/thirdparty/libopenui/src/font.h | 4 +--- radio/src/thirdparty/libopenui/src/form.h | 4 +--- radio/src/thirdparty/libopenui/src/gridlayout.h | 4 +--- radio/src/thirdparty/libopenui/src/keyboard_base.h | 4 +--- radio/src/thirdparty/libopenui/src/keyboard_number.h | 4 +--- radio/src/thirdparty/libopenui/src/keyboard_text.h | 4 +--- radio/src/thirdparty/libopenui/src/libopenui_defines.h | 4 +--- radio/src/thirdparty/libopenui/src/libopenui_depends.h | 4 +--- radio/src/thirdparty/libopenui/src/libopenui_file.h | 4 +--- radio/src/thirdparty/libopenui/src/libopenui_globals.h | 4 +--- radio/src/thirdparty/libopenui/src/libopenui_helpers.h | 4 +--- radio/src/thirdparty/libopenui/src/libopenui_types.h | 4 +--- radio/src/thirdparty/libopenui/src/mainwindow.h | 4 +--- radio/src/thirdparty/libopenui/src/menu.h | 4 +--- radio/src/thirdparty/libopenui/src/menutoolbar.h | 4 +--- radio/src/thirdparty/libopenui/src/modal_window.h | 4 +--- radio/src/thirdparty/libopenui/src/numberedit.h | 4 +--- radio/src/thirdparty/libopenui/src/progress.h | 4 +--- radio/src/thirdparty/libopenui/src/roller.h | 4 +--- radio/src/thirdparty/libopenui/src/slider.h | 4 +--- radio/src/thirdparty/libopenui/src/static.h | 4 +--- radio/src/thirdparty/libopenui/src/table.h | 4 +--- radio/src/thirdparty/libopenui/src/textedit.h | 4 +--- radio/src/thirdparty/libopenui/src/theme.h | 4 +--- radio/src/thirdparty/libopenui/src/window.h | 4 +--- 37 files changed, 37 insertions(+), 111 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/basenumberedit.h b/radio/src/thirdparty/libopenui/src/basenumberedit.h index f85f8754e..12e5694a2 100644 --- a/radio/src/thirdparty/libopenui/src/basenumberedit.h +++ b/radio/src/thirdparty/libopenui/src/basenumberedit.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _BASENUMBEREDIT_H_ -#define _BASENUMBEREDIT_H_ +#pragma once #include "form.h" @@ -99,4 +98,3 @@ class BaseNumberEdit : public FormField { std::function _setValue; }; -#endif // _BASENUMBEREDIT_H_ diff --git a/radio/src/thirdparty/libopenui/src/bitfield.h b/radio/src/thirdparty/libopenui/src/bitfield.h index abb309ab1..093119613 100644 --- a/radio/src/thirdparty/libopenui/src/bitfield.h +++ b/radio/src/thirdparty/libopenui/src/bitfield.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _BITFIELD_H -#define _BITFIELD_H +#pragma once #include @@ -82,4 +81,3 @@ inline T bfSingleBitGet(T y, uint8_t i) return bfBitGet(y, bfBit(i)); } -#endif //BITFIELD_H diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h b/radio/src/thirdparty/libopenui/src/bitmapbuffer.h index ea7a3c1f4..adfd435f4 100755 --- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h +++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _BITMAP_BUFFER_H_ -#define _BITMAP_BUFFER_H_ +#pragma once #include #include @@ -519,4 +518,3 @@ class BitmapBuffer: public BitmapBufferBase extern BitmapBuffer * lcd; -#endif // _BITMAP_BUFFER_H_ diff --git a/radio/src/thirdparty/libopenui/src/bufferedwindow.h b/radio/src/thirdparty/libopenui/src/bufferedwindow.h index 56d25447c..9f9dd89fb 100644 --- a/radio/src/thirdparty/libopenui/src/bufferedwindow.h +++ b/radio/src/thirdparty/libopenui/src/bufferedwindow.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _BUFFERED_WINDOW_H_ -#define _BUFFERED_WINDOW_H_ +#pragma once #include "window.h" @@ -123,4 +122,3 @@ class TransparentBitmapBackground: public TransparentBufferedWindow } }; -#endif // _BUFFERED_WINDOW_H_ diff --git a/radio/src/thirdparty/libopenui/src/button.h b/radio/src/thirdparty/libopenui/src/button.h index 252b24eaf..1eb14fc27 100644 --- a/radio/src/thirdparty/libopenui/src/button.h +++ b/radio/src/thirdparty/libopenui/src/button.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _BUTTON_H_ -#define _BUTTON_H_ +#pragma once #include "form.h" @@ -134,4 +133,3 @@ class IconButton: public Button { uint8_t icon; }; -#endif diff --git a/radio/src/thirdparty/libopenui/src/carousel.h b/radio/src/thirdparty/libopenui/src/carousel.h index 23b4ec0ea..1bcbeeaef 100644 --- a/radio/src/thirdparty/libopenui/src/carousel.h +++ b/radio/src/thirdparty/libopenui/src/carousel.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _CAROUSEL_H_ -#define _CAROUSEL_H_ +#pragma once #include #include "button.h" @@ -139,4 +138,3 @@ class Carousel: public Window { CarouselWindow * body = nullptr; }; -#endif // _CAROUSEL_H_ diff --git a/radio/src/thirdparty/libopenui/src/checkbox.h b/radio/src/thirdparty/libopenui/src/checkbox.h index ed4420d89..411f588b6 100644 --- a/radio/src/thirdparty/libopenui/src/checkbox.h +++ b/radio/src/thirdparty/libopenui/src/checkbox.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _CHECKBOX_H_ -#define _CHECKBOX_H_ +#pragma once #include "form.h" @@ -69,4 +68,3 @@ class CheckBox : public FormField { std::function _setValue; }; -#endif // _CHECKBOX_H_ diff --git a/radio/src/thirdparty/libopenui/src/choice.h b/radio/src/thirdparty/libopenui/src/choice.h index 7fce5cfd4..2344923a4 100644 --- a/radio/src/thirdparty/libopenui/src/choice.h +++ b/radio/src/thirdparty/libopenui/src/choice.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _CHOICE_H_ -#define _CHOICE_H_ +#pragma once #include #include "form.h" @@ -159,4 +158,3 @@ class Choice : public ChoiceBase { virtual void openMenu(); }; -#endif // _CHOICE_H_ diff --git a/radio/src/thirdparty/libopenui/src/coloredit.h b/radio/src/thirdparty/libopenui/src/coloredit.h index c12dedb55..0d862905f 100644 --- a/radio/src/thirdparty/libopenui/src/coloredit.h +++ b/radio/src/thirdparty/libopenui/src/coloredit.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _COLOREDIT_H_ -#define _COLOREDIT_H_ +#pragma once #include "form.h" @@ -34,4 +33,3 @@ class ColorEdit : public FormGroup { #endif }; -#endif // _COLOREDIT_H_ diff --git a/radio/src/thirdparty/libopenui/src/dialog.h b/radio/src/thirdparty/libopenui/src/dialog.h index 58d26233b..3e8816aae 100644 --- a/radio/src/thirdparty/libopenui/src/dialog.h +++ b/radio/src/thirdparty/libopenui/src/dialog.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _DIALOG_H_ -#define _DIALOG_H_ +#pragma once #include "modal_window.h" #include "form.h" @@ -55,4 +54,3 @@ class Dialog: public ModalWindow { DialogWindowContent * content; }; -#endif // _DIALOG_H_ diff --git a/radio/src/thirdparty/libopenui/src/expansion_panel.h b/radio/src/thirdparty/libopenui/src/expansion_panel.h index 4be4126d5..5aa7380c4 100644 --- a/radio/src/thirdparty/libopenui/src/expansion_panel.h +++ b/radio/src/thirdparty/libopenui/src/expansion_panel.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _EXPANSION_PANEL_H_ -#define _EXPANSION_PANEL_H_ +#pragma once #include "form.h" @@ -87,4 +86,3 @@ class ExpansionPanel: public FormGroup { bool isOpen = false; }; -#endif // _EXPANSION_PANEL_H_ diff --git a/radio/src/thirdparty/libopenui/src/filechoice.h b/radio/src/thirdparty/libopenui/src/filechoice.h index 877f3f933..0157ff68d 100644 --- a/radio/src/thirdparty/libopenui/src/filechoice.h +++ b/radio/src/thirdparty/libopenui/src/filechoice.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _FILECHOICE_H_ -#define _FILECHOICE_H_ +#pragma once #include "choice.h" #include @@ -54,4 +53,3 @@ class FileChoice: public ChoiceBase { bool openMenu(); }; -#endif // _FILECHOICE_H_ diff --git a/radio/src/thirdparty/libopenui/src/font.h b/radio/src/thirdparty/libopenui/src/font.h index 6503e3c78..b45bf8150 100644 --- a/radio/src/thirdparty/libopenui/src/font.h +++ b/radio/src/thirdparty/libopenui/src/font.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _FONT_H_ -#define _FONT_H_ +#pragma once #include "libopenui_types.h" @@ -27,4 +26,3 @@ uint8_t getFontHeight(LcdFlags flags); int getCharWidth(uint8_t c, const uint16_t * spec); int getTextWidth(const char * s, int len = 0, LcdFlags flags = 0); -#endif // _FONT_H_ diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/thirdparty/libopenui/src/form.h index 9f3eff28b..d2b989472 100644 --- a/radio/src/thirdparty/libopenui/src/form.h +++ b/radio/src/thirdparty/libopenui/src/form.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _FORM_H_ -#define _FORM_H_ +#pragma once #include "window.h" @@ -173,4 +172,3 @@ class FormWindow: public FormGroup { #endif }; -#endif diff --git a/radio/src/thirdparty/libopenui/src/gridlayout.h b/radio/src/thirdparty/libopenui/src/gridlayout.h index 535fc5050..a606f5796 100644 --- a/radio/src/thirdparty/libopenui/src/gridlayout.h +++ b/radio/src/thirdparty/libopenui/src/gridlayout.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _GRIDLAYOUT_H_ -#define _GRIDLAYOUT_H_ +#pragma once #include "window.h" @@ -120,4 +119,3 @@ class FormGridLayout: public GridLayout { coord_t lineMarginRight = PAGE_PADDING; }; -#endif diff --git a/radio/src/thirdparty/libopenui/src/keyboard_base.h b/radio/src/thirdparty/libopenui/src/keyboard_base.h index 540c228cc..072a6a961 100644 --- a/radio/src/thirdparty/libopenui/src/keyboard_base.h +++ b/radio/src/thirdparty/libopenui/src/keyboard_base.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _KEYBOARD_BASE_H_ -#define _KEYBOARD_BASE_H_ +#pragma once #include "mainwindow.h" #include "form.h" @@ -86,4 +85,3 @@ class Keyboard: public FormWindow { } }; -#endif // _KEYBOARD_BASE_H_ \ No newline at end of file diff --git a/radio/src/thirdparty/libopenui/src/keyboard_number.h b/radio/src/thirdparty/libopenui/src/keyboard_number.h index b82f68f1d..4f8fca93c 100644 --- a/radio/src/thirdparty/libopenui/src/keyboard_number.h +++ b/radio/src/thirdparty/libopenui/src/keyboard_number.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _KEYBOARD_NUMBER_H_ -#define _KEYBOARD_NUMBER_H_ +#pragma once #include "keyboard_base.h" @@ -48,4 +47,3 @@ class NumberKeyboard : public Keyboard { static NumberKeyboard * _instance; }; -#endif // _KEYBOARD_NUMBER_H_ \ No newline at end of file diff --git a/radio/src/thirdparty/libopenui/src/keyboard_text.h b/radio/src/thirdparty/libopenui/src/keyboard_text.h index 368d239ec..afc8cfef2 100644 --- a/radio/src/thirdparty/libopenui/src/keyboard_text.h +++ b/radio/src/thirdparty/libopenui/src/keyboard_text.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _KEYBOARD_TEXT_H_ -#define _KEYBOARD_TEXT_H_ +#pragma once #include "keyboard_base.h" @@ -61,4 +60,3 @@ class TextKeyboard : public Keyboard { const char * const * layout; }; -#endif // _KEYBOARD_TEXT_H_ \ No newline at end of file diff --git a/radio/src/thirdparty/libopenui/src/libopenui_defines.h b/radio/src/thirdparty/libopenui/src/libopenui_defines.h index 67e6111df..86ad01e18 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_defines.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_defines.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _LIBOPEUI_DEFINES_H_ -#define _LIBOPEUI_DEFINES_H_ +#pragma once #include "libopenui_types.h" @@ -116,4 +115,3 @@ #define TABLE_HEADER_BGCOLOR COLOR(TABLE_HEADER_BGCOLOR_INDEX) #define CUSTOM_COLOR COLOR(CUSTOM_COLOR_INDEX) -#endif diff --git a/radio/src/thirdparty/libopenui/src/libopenui_depends.h b/radio/src/thirdparty/libopenui/src/libopenui_depends.h index 6da9fa0d8..df319d028 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_depends.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_depends.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _LIBOPEUI_DEPENDS_H_ -#define _LIBOPEUI_DEPENDS_H_ +#pragma once #include #include "libopenui_config.h" @@ -31,4 +30,3 @@ void onKeyError(); void killEvents(event_t event); event_t getWindowEvent(); -#endif // _LIBOPEUI_DEPENDS_H_ diff --git a/radio/src/thirdparty/libopenui/src/libopenui_file.h b/radio/src/thirdparty/libopenui/src/libopenui_file.h index bbae7f362..e75cda9ee 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_file.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_file.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _LIBOPEUI_FILE_H_ -#define _LIBOPEUI_FILE_H_ +#pragma once #include #include @@ -38,4 +37,3 @@ inline bool compare_nocase(const std::string &first, const std::string &second) return strcasecmp(first.c_str(), second.c_str()) < 0; } -#endif diff --git a/radio/src/thirdparty/libopenui/src/libopenui_globals.h b/radio/src/thirdparty/libopenui/src/libopenui_globals.h index fe14e3e9d..27d5b92a9 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_globals.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_globals.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _LIBOPEUI_GLOBALS_H_ -#define _LIBOPEUI_GLOBALS_H_ +#pragma once #include #include "libopenui_config.h" @@ -32,4 +31,3 @@ inline void lcdSetColor(uint16_t color) lcdColorTable[CUSTOM_COLOR_INDEX] = color; } -#endif // _LIBOPEUI_GLOBALS_H_ diff --git a/radio/src/thirdparty/libopenui/src/libopenui_helpers.h b/radio/src/thirdparty/libopenui/src/libopenui_helpers.h index d188a92bd..640f05046 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_helpers.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_helpers.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _LIBOPEUI_HELPERS_H_ -#define _LIBOPEUI_HELPERS_H_ +#pragma once #include #include @@ -61,4 +60,3 @@ inline std::string TEXT_AT_INDEX(const char * val, uint8_t idx) return std::string(start, min(val[0], (uint8_t)strlen(start))); } -#endif diff --git a/radio/src/thirdparty/libopenui/src/libopenui_types.h b/radio/src/thirdparty/libopenui/src/libopenui_types.h index a643b2384..d9b3177c3 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_types.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_types.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _LIBOPEUI_TYPES_H_ -#define _LIBOPEUI_TYPES_H_ +#pragma once #include @@ -73,4 +72,3 @@ struct rect_t typedef uint32_t LcdFlags; typedef uint16_t event_t; -#endif // _LIBOPEUI_TYPES_H_ diff --git a/radio/src/thirdparty/libopenui/src/mainwindow.h b/radio/src/thirdparty/libopenui/src/mainwindow.h index da1cdef85..f51a0d56f 100644 --- a/radio/src/thirdparty/libopenui/src/mainwindow.h +++ b/radio/src/thirdparty/libopenui/src/mainwindow.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _MAINWINDOW_H_ -#define _MAINWINDOW_H_ +#pragma once #include #include "window.h" @@ -65,4 +64,3 @@ class MainWindow: public Window { extern MainWindow mainWindow; -#endif // _MAINWINDOW_H_ diff --git a/radio/src/thirdparty/libopenui/src/menu.h b/radio/src/thirdparty/libopenui/src/menu.h index e1398bef7..e21c30497 100644 --- a/radio/src/thirdparty/libopenui/src/menu.h +++ b/radio/src/thirdparty/libopenui/src/menu.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _MENU_H_ -#define _MENU_H_ +#pragma once #include #include @@ -223,4 +222,3 @@ Menu * MenuBody::getParentMenu() return static_cast(getParent()->getParent()); } -#endif // _MENU_H_ diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.h b/radio/src/thirdparty/libopenui/src/menutoolbar.h index bb0de621e..aae69d1a6 100644 --- a/radio/src/thirdparty/libopenui/src/menutoolbar.h +++ b/radio/src/thirdparty/libopenui/src/menutoolbar.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _MENUTOOLBAR_H_ -#define _MENUTOOLBAR_H_ +#pragma once #include "button.h" #include "menu.h" @@ -170,5 +169,4 @@ class MenuToolbar: public FormGroup { } }; -#endif // _MENUTOOLBAR_H_ diff --git a/radio/src/thirdparty/libopenui/src/modal_window.h b/radio/src/thirdparty/libopenui/src/modal_window.h index ac7f5b8a3..4240fe43e 100644 --- a/radio/src/thirdparty/libopenui/src/modal_window.h +++ b/radio/src/thirdparty/libopenui/src/modal_window.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _MODAL_WINDOW_H_ -#define _MODAL_WINDOW_H_ +#pragma once #include "window.h" @@ -122,4 +121,3 @@ class ModalWindowContent: public Window { std::string title; }; -#endif // _MODAL_WINDOW_H_ diff --git a/radio/src/thirdparty/libopenui/src/numberedit.h b/radio/src/thirdparty/libopenui/src/numberedit.h index 03e34850b..55ef21c27 100644 --- a/radio/src/thirdparty/libopenui/src/numberedit.h +++ b/radio/src/thirdparty/libopenui/src/numberedit.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _NUMBEREDIT_H_ -#define _NUMBEREDIT_H_ +#pragma once #include "basenumberedit.h" #include @@ -78,4 +77,3 @@ class NumberEdit : public BaseNumberEdit { std::function isValueAvailable; }; -#endif // _NUMBEREDIT_H_ diff --git a/radio/src/thirdparty/libopenui/src/progress.h b/radio/src/thirdparty/libopenui/src/progress.h index 176b38873..7653382bb 100644 --- a/radio/src/thirdparty/libopenui/src/progress.h +++ b/radio/src/thirdparty/libopenui/src/progress.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _PROGRESS_H_ -#define _PROGRESS_H_ +#pragma once #include "window.h" @@ -48,4 +47,3 @@ class Progress : public Window { int value = 0; }; -#endif diff --git a/radio/src/thirdparty/libopenui/src/roller.h b/radio/src/thirdparty/libopenui/src/roller.h index 608eab033..c70184224 100644 --- a/radio/src/thirdparty/libopenui/src/roller.h +++ b/radio/src/thirdparty/libopenui/src/roller.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _ROLLER_H_ -#define _ROLLER_H_ +#pragma once #include #include @@ -175,4 +174,3 @@ class Roller: public Choice } }; -#endif // _ROLLER_H_ diff --git a/radio/src/thirdparty/libopenui/src/slider.h b/radio/src/thirdparty/libopenui/src/slider.h index c883516cc..4b35c1fd0 100644 --- a/radio/src/thirdparty/libopenui/src/slider.h +++ b/radio/src/thirdparty/libopenui/src/slider.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _SLIDER_H_ -#define _SLIDER_H_ +#pragma once #include "form.h" @@ -69,4 +68,3 @@ class Slider: public FormField { std::function _setValue; }; -#endif diff --git a/radio/src/thirdparty/libopenui/src/static.h b/radio/src/thirdparty/libopenui/src/static.h index 159e71ad9..ea8015f2e 100644 --- a/radio/src/thirdparty/libopenui/src/static.h +++ b/radio/src/thirdparty/libopenui/src/static.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _STATIC_H_ -#define _STATIC_H_ +#pragma once #include "window.h" #include "button.h" // TODO just for BUTTON_BACKGROUND @@ -186,4 +185,3 @@ class DynamicNumber: public Window const char * suffix; }; -#endif diff --git a/radio/src/thirdparty/libopenui/src/table.h b/radio/src/thirdparty/libopenui/src/table.h index 75f5f3bd3..a00a1812c 100644 --- a/radio/src/thirdparty/libopenui/src/table.h +++ b/radio/src/thirdparty/libopenui/src/table.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _TABLE_H_ -#define _TABLE_H_ +#pragma once #include #include @@ -342,4 +341,3 @@ class Table: public FormField { Body body; }; -#endif // _TABLE_H_ diff --git a/radio/src/thirdparty/libopenui/src/textedit.h b/radio/src/thirdparty/libopenui/src/textedit.h index 52a732cc1..3688292b1 100644 --- a/radio/src/thirdparty/libopenui/src/textedit.h +++ b/radio/src/thirdparty/libopenui/src/textedit.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _TEXTEDIT_H_ -#define _TEXTEDIT_H_ +#pragma once #include "form.h" @@ -115,4 +114,3 @@ class TextEdit : public FormField { }; -#endif // _TEXTEDIT_H_ diff --git a/radio/src/thirdparty/libopenui/src/theme.h b/radio/src/thirdparty/libopenui/src/theme.h index d2eea9445..5b5a36fc4 100644 --- a/radio/src/thirdparty/libopenui/src/theme.h +++ b/radio/src/thirdparty/libopenui/src/theme.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _THEME_H_ -#define _THEME_H_ +#pragma once #include "bitmapbuffer.h" #include "checkbox.h" @@ -63,4 +62,3 @@ extern Theme * theme; MenuWindowContent * createMenuWindow(Menu * menu); DialogWindowContent * createDialogWindow(Dialog * dialog, const rect_t & rect); -#endif // _THEME_H_ diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/thirdparty/libopenui/src/window.h index 93f53815b..efd6b5122 100644 --- a/radio/src/thirdparty/libopenui/src/window.h +++ b/radio/src/thirdparty/libopenui/src/window.h @@ -17,8 +17,7 @@ * Lesser General Public License for more details. */ -#ifndef _WINDOW_H_ -#define _WINDOW_H_ +#pragma once #include #include @@ -419,4 +418,3 @@ class Window { bool hasOpaqueRect(const rect_t & testRect) const; }; -#endif // _WINDOW_H_