From 54a3cbfde3e8232928494c0b02225af4f669adbc Mon Sep 17 00:00:00 2001 From: Twan van Laarhoven Date: Sun, 26 Apr 2020 01:25:16 +0200 Subject: [PATCH] Replace include guards by #pragma once --- src/cli/cli_main.hpp | 5 +---- src/cli/text_io_handler.hpp | 5 +---- src/data/action/generic.hpp | 5 +---- src/data/action/keyword.hpp | 5 +---- src/data/action/set.hpp | 5 +---- src/data/action/symbol.hpp | 5 +---- src/data/action/symbol_part.hpp | 5 +---- src/data/action/value.hpp | 5 +---- src/data/add_cards_script.hpp | 5 +---- src/data/card.hpp | 5 +---- src/data/draw_what.hpp | 5 +---- src/data/export_template.hpp | 5 +---- src/data/field.hpp | 5 +---- src/data/field/boolean.hpp | 5 +---- src/data/field/choice.hpp | 5 +---- src/data/field/color.hpp | 5 +---- src/data/field/image.hpp | 5 +---- src/data/field/information.hpp | 5 +---- src/data/field/multiple_choice.hpp | 5 +---- src/data/field/package_choice.hpp | 5 +---- src/data/field/symbol.hpp | 5 +---- src/data/field/text.hpp | 5 +---- src/data/filter.hpp | 5 +---- src/data/font.hpp | 5 +---- src/data/format/clipboard.hpp | 5 +---- src/data/format/formats.hpp | 5 +---- src/data/format/image_to_symbol.hpp | 5 +---- src/data/game.hpp | 5 +---- src/data/graph_type.hpp | 5 +---- src/data/installer.hpp | 5 +---- src/data/keyword.hpp | 5 +---- src/data/locale.hpp | 5 +---- src/data/pack.hpp | 5 +---- src/data/set.hpp | 5 +---- src/data/settings.hpp | 5 +---- src/data/statistics.hpp | 5 +---- src/data/stylesheet.hpp | 5 +---- src/data/symbol.hpp | 5 +---- src/data/symbol_font.hpp | 5 +---- src/data/word_list.hpp | 5 +---- src/gfx/bezier.hpp | 5 +---- src/gfx/color.hpp | 5 +---- src/gfx/generated_image.hpp | 5 +---- src/gfx/gfx.hpp | 5 +---- src/gfx/polynomial.hpp | 5 +---- src/gui/about_window.hpp | 5 +---- src/gui/auto_replace_window.hpp | 5 +---- src/gui/card_select_window.hpp | 5 +---- src/gui/control/card_editor.hpp | 5 +---- src/gui/control/card_list.hpp | 5 +---- src/gui/control/card_list_column_select.hpp | 5 +---- src/gui/control/card_viewer.hpp | 5 +---- src/gui/control/filter_ctrl.hpp | 5 +---- src/gui/control/filtered_card_list.hpp | 5 +---- src/gui/control/gallery_list.hpp | 5 +---- src/gui/control/graph.hpp | 5 +---- src/gui/control/image_card_list.hpp | 5 +---- src/gui/control/item_list.hpp | 5 +---- src/gui/control/keyword_list.hpp | 5 +---- src/gui/control/native_look_editor.hpp | 5 +---- src/gui/control/package_list.hpp | 5 +---- src/gui/control/select_card_list.hpp | 5 +---- src/gui/control/text_ctrl.hpp | 5 +---- src/gui/control/tree_list.hpp | 5 +---- src/gui/drop_down_list.hpp | 5 +---- src/gui/html_export_window.hpp | 5 +---- src/gui/icon_menu.hpp | 5 +---- src/gui/image_slice_window.hpp | 5 +---- src/gui/images_export_window.hpp | 5 +---- src/gui/new_window.hpp | 5 +---- src/gui/package_update_list.hpp | 5 +---- src/gui/packages_window.hpp | 5 +---- src/gui/preferences_window.hpp | 5 +---- src/gui/print_window.hpp | 5 +---- src/gui/set/cards_panel.hpp | 5 +---- src/gui/set/console_panel.hpp | 5 +---- src/gui/set/keywords_panel.hpp | 5 +---- src/gui/set/panel.hpp | 5 +---- src/gui/set/random_pack_panel.hpp | 5 +---- src/gui/set/set_info_panel.hpp | 5 +---- src/gui/set/stats_panel.hpp | 5 +---- src/gui/set/style_panel.hpp | 5 +---- src/gui/set/window.hpp | 5 +---- src/gui/symbol/basic_shape_editor.hpp | 5 +---- src/gui/symbol/control.hpp | 5 +---- src/gui/symbol/editor.hpp | 5 +---- src/gui/symbol/part_list.hpp | 5 +---- src/gui/symbol/point_editor.hpp | 5 +---- src/gui/symbol/select_editor.hpp | 5 +---- src/gui/symbol/selection.hpp | 5 +---- src/gui/symbol/symmetry_editor.hpp | 5 +---- src/gui/symbol/window.hpp | 5 +---- src/gui/thumbnail_thread.hpp | 5 +---- src/gui/update_checker.hpp | 5 +---- src/gui/util.hpp | 5 +---- src/gui/value/choice.hpp | 5 +---- src/gui/value/color.hpp | 5 +---- src/gui/value/editor.hpp | 5 +---- src/gui/value/image.hpp | 5 +---- src/gui/value/information.hpp | 5 +---- src/gui/value/multiple_choice.hpp | 5 +---- src/gui/value/package_choice.hpp | 5 +---- src/gui/value/symbol.hpp | 5 +---- src/gui/value/text.hpp | 5 +---- src/gui/welcome_window.hpp | 5 +---- src/render/card/viewer.hpp | 5 +---- src/render/symbol/filter.hpp | 5 +---- src/render/symbol/viewer.hpp | 5 +---- src/render/text/element.hpp | 5 +---- src/render/text/viewer.hpp | 5 +---- src/render/value/choice.hpp | 5 +---- src/render/value/color.hpp | 5 +---- src/render/value/image.hpp | 5 +---- src/render/value/information.hpp | 5 +---- src/render/value/multiple_choice.hpp | 5 +---- src/render/value/package_choice.hpp | 5 +---- src/render/value/symbol.hpp | 5 +---- src/render/value/text.hpp | 5 +---- src/render/value/viewer.hpp | 5 +---- src/script/context.hpp | 5 +---- src/script/dependency.hpp | 5 +---- src/script/functions/functions.hpp | 5 +---- src/script/functions/util.hpp | 5 +---- src/script/image.hpp | 5 +---- src/script/parser.hpp | 5 +---- src/script/profiler.hpp | 5 +---- src/script/script.hpp | 5 +---- src/script/script_manager.hpp | 5 +---- src/script/scriptable.hpp | 5 +---- src/script/to_value.hpp | 5 +---- src/script/value.hpp | 5 +---- src/util/action_stack.hpp | 5 +---- src/util/age.hpp | 5 +---- src/util/alignment.hpp | 5 +---- src/util/angle.hpp | 5 +---- src/util/atomic.hpp | 5 +---- src/util/defaultable.hpp | 5 +---- src/util/delayed_index_maps.hpp | 5 +---- src/util/dynamic_arg.hpp | 5 +---- src/util/error.hpp | 5 +---- src/util/file_utils.hpp | 5 +---- src/util/find_replace.hpp | 5 +---- src/util/for_each.hpp | 5 +---- src/util/index_map.hpp | 5 +---- src/util/io/get_member.hpp | 5 +---- src/util/io/package.hpp | 5 +---- src/util/io/package_manager.hpp | 5 +---- src/util/io/reader.hpp | 5 +---- src/util/io/writer.hpp | 5 +---- src/util/locale.hpp | 5 +---- src/util/order_cache.hpp | 5 +---- src/util/platform.hpp | 5 +---- src/util/prec.hpp | 5 +---- src/util/real_point.hpp | 5 +---- src/util/reflect.hpp | 5 +---- src/util/regex.hpp | 5 +---- src/util/rotation.hpp | 5 +---- src/util/smart_ptr.hpp | 5 +---- src/util/spec_sort.hpp | 5 +---- src/util/spell_checker.hpp | 5 +---- src/util/string.hpp | 5 +---- src/util/tagged_string.hpp | 5 +---- src/util/vcs.hpp | 5 +---- src/util/vcs/subversion.hpp | 5 +---- src/util/vector2d.hpp | 7 +------ src/util/version.hpp | 5 +---- src/util/window_id.hpp | 5 +---- 167 files changed, 167 insertions(+), 670 deletions(-) diff --git a/src/cli/cli_main.hpp b/src/cli/cli_main.hpp index 73fd0591..0daa4c8d 100644 --- a/src/cli/cli_main.hpp +++ b/src/cli/cli_main.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_CLI_MAIN -#define HEADER_CLI_MAIN +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -48,5 +47,3 @@ private: bool run_script_file(String const& filename); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/cli/text_io_handler.hpp b/src/cli/text_io_handler.hpp index df022223..d7f38cc6 100644 --- a/src/cli/text_io_handler.hpp +++ b/src/cli/text_io_handler.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_CLI_TEXT_IO_HANDLER -#define HEADER_CLI_TEXT_IO_HANDLER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -60,5 +59,3 @@ private: /// The global TextIOHandler object extern TextIOHandler cli; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/action/generic.hpp b/src/data/action/generic.hpp index c2f5ee08..50d523b3 100644 --- a/src/data/action/generic.hpp +++ b/src/data/action/generic.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_ACTION_GENERIC -#define HEADER_DATA_ACTION_GENERIC +#pragma once /** @file data/action/generic.hpp * @@ -112,5 +111,3 @@ void GenericAddAction::perform(vector& container, bool to_undo) const { } } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/action/keyword.hpp b/src/data/action/keyword.hpp index 8497c80c..bcad3aab 100644 --- a/src/data/action/keyword.hpp +++ b/src/data/action/keyword.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_ACTION_KEYWORD -#define HEADER_DATA_ACTION_KEYWORD +#pragma once /** @file data/action/keyword.hpp * @@ -100,5 +99,3 @@ class ChangeKeywordModeAction : public Action { String mode; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/action/set.hpp b/src/data/action/set.hpp index f9407c31..70b5603f 100644 --- a/src/data/action/set.hpp +++ b/src/data/action/set.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_ACTION_SET -#define HEADER_DATA_ACTION_SET +#pragma once /** @file data/action/set.hpp * @@ -157,5 +156,3 @@ class ChangePackAction : public PackTypesAction { size_t pos; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/action/symbol.hpp b/src/data/action/symbol.hpp index 2b9364b8..8e0cbc26 100644 --- a/src/data/action/symbol.hpp +++ b/src/data/action/symbol.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_ACTION_SYMBOL -#define HEADER_DATA_ACTION_SYMBOL +#pragma once /** @file data/action/symbol.hpp * @@ -314,5 +313,3 @@ class UngroupSymbolPartsAction : public GroupSymbolPartsActionBase { virtual String getName(bool to_undo) const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/action/symbol_part.hpp b/src/data/action/symbol_part.hpp index 95fe57ce..31775195 100644 --- a/src/data/action/symbol_part.hpp +++ b/src/data/action/symbol_part.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_ACTION_SYMBOL_PART -#define HEADER_DATA_ACTION_SYMBOL_PART +#pragma once /** @file data/action/symbol_part.hpp * @@ -236,5 +235,3 @@ class SymmetryCopiesAction : public Action { String old_name; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/action/value.hpp b/src/data/action/value.hpp index b3a25137..1c475340 100644 --- a/src/data/action/value.hpp +++ b/src/data/action/value.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_ACTION_VALUE -#define HEADER_DATA_ACTION_VALUE +#pragma once /** @file data/action/value.hpp * @@ -178,5 +177,3 @@ class ValueActionPerformer { SetP set; ///< Set for the actions }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/add_cards_script.hpp b/src/data/add_cards_script.hpp index dacecec8..4c69e4e8 100644 --- a/src/data/add_cards_script.hpp +++ b/src/data/add_cards_script.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_ADD_CARDS_SCRIPT -#define HEADER_DATA_ADD_CARDS_SCRIPT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -34,5 +33,3 @@ class AddCardsScript : public IntrusivePtrBase { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/card.hpp b/src/data/card.hpp index 64ec74f4..1d930feb 100644 --- a/src/data/card.hpp +++ b/src/data/card.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_CARD -#define HEADER_DATA_CARD +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -100,5 +99,3 @@ inline String type_name(const vector&) { void mark_dependency_member(const Card& value, const String& name, const Dependency& dep); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/draw_what.hpp b/src/data/draw_what.hpp index 9ee0e845..27b72d56 100644 --- a/src/data/draw_what.hpp +++ b/src/data/draw_what.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_DRAW_WHAT -#define HEADER_DATA_DRAW_WHAT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -26,5 +25,3 @@ enum DrawWhat , DRAW_NATIVELOOK = 0x400 // use a native look }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/export_template.hpp b/src/data/export_template.hpp index 605a7ceb..f8da69df 100644 --- a/src/data/export_template.hpp +++ b/src/data/export_template.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_EXPORT_TEMPLATE -#define HEADER_DATA_EXPORT_TEMPLATE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -62,5 +61,3 @@ struct ExportInfo { DECLARE_DYNAMIC_ARG(ExportInfo*, export_info); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field.hpp b/src/data/field.hpp index 7be1764e..17f513f5 100644 --- a/src/data/field.hpp +++ b/src/data/field.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD -#define HEADER_DATA_FIELD +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -306,5 +305,3 @@ inline String type_name(const Value&) { void mark_dependency_member(const IndexMap& value, const String& name, const Dependency& dep); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/boolean.hpp b/src/data/field/boolean.hpp index 28ba9b24..caef5dd8 100644 --- a/src/data/field/boolean.hpp +++ b/src/data/field/boolean.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_BOOLEAN -#define HEADER_DATA_FIELD_BOOLEAN +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -57,5 +56,3 @@ class BooleanValue : public ChoiceValue { DECLARE_REFLECTION(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/choice.hpp b/src/data/field/choice.hpp index e3b5e129..2c9a42b6 100644 --- a/src/data/field/choice.hpp +++ b/src/data/field/choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_CHOICE -#define HEADER_DATA_FIELD_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -180,5 +179,3 @@ class ChoiceValue : public Value { virtual bool update(Context&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/color.hpp b/src/data/field/color.hpp index 9c08554b..483e7648 100644 --- a/src/data/field/color.hpp +++ b/src/data/field/color.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_COLOR -#define HEADER_DATA_FIELD_COLOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -81,5 +80,3 @@ class ColorValue : public Value { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/image.hpp b/src/data/field/image.hpp index 8819664c..da5ed7a3 100644 --- a/src/data/field/image.hpp +++ b/src/data/field/image.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_IMAGE -#define HEADER_DATA_FIELD_IMAGE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -52,5 +51,3 @@ class ImageValue : public Value { Age last_update; ///< When was the image last changed? }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/information.hpp b/src/data/field/information.hpp index bcf6f7a7..780eaa3a 100644 --- a/src/data/field/information.hpp +++ b/src/data/field/information.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_INFORMATION -#define HEADER_DATA_FIELD_INFORMATION +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -65,5 +64,3 @@ class InfoValue : public Value { virtual bool update(Context&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/multiple_choice.hpp b/src/data/field/multiple_choice.hpp index c3532b00..aef99a77 100644 --- a/src/data/field/multiple_choice.hpp +++ b/src/data/field/multiple_choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_MULTIPLE_CHOICE -#define HEADER_DATA_FIELD_MULTIPLE_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -79,5 +78,3 @@ class MultipleChoiceValue : public ChoiceValue { /// Is the given choice selected in the value? bool chosen(const String& multiple_choice_value, const String& chioce); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/package_choice.hpp b/src/data/field/package_choice.hpp index 3f85e2f2..aa7c4a5d 100644 --- a/src/data/field/package_choice.hpp +++ b/src/data/field/package_choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_PACKAGE_CHOICE -#define HEADER_DATA_FIELD_PACKAGE_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -66,5 +65,3 @@ class PackageChoiceValue : public Value { virtual bool update(Context&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/symbol.hpp b/src/data/field/symbol.hpp index bc5907f0..c0f75764 100644 --- a/src/data/field/symbol.hpp +++ b/src/data/field/symbol.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_SYMBOL -#define HEADER_DATA_FIELD_SYMBOL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -72,5 +71,3 @@ class SymbolValue : public Value { Age last_update; ///< When was the symbol last changed? }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/field/text.hpp b/src/data/field/text.hpp index 91393811..02ae6ae2 100644 --- a/src/data/field/text.hpp +++ b/src/data/field/text.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FIELD_TEXT -#define HEADER_DATA_FIELD_TEXT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -122,5 +121,3 @@ class FakeTextValue : public TextValue { virtual bool equals(const Value* that); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/filter.hpp b/src/data/filter.hpp index c2a440ef..58addbb6 100644 --- a/src/data/filter.hpp +++ b/src/data/filter.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FILTER -#define HEADER_DATA_FILTER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -84,5 +83,3 @@ class QuickFilter : public Filter { String query; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/font.hpp b/src/data/font.hpp index 89594d1d..57f6279b 100644 --- a/src/data/font.hpp +++ b/src/data/font.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FONT -#define HEADER_DATA_FONT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -71,5 +70,3 @@ class Font : public IntrusivePtrBase { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/format/clipboard.hpp b/src/data/format/clipboard.hpp index 2dbd611a..f4365fcc 100644 --- a/src/data/format/clipboard.hpp +++ b/src/data/format/clipboard.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FORMAT_CLIPBOARD -#define HEADER_DATA_FORMAT_CLIPBOARD +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -57,5 +56,3 @@ class CardsOnClipboard : public wxDataObjectComposite { CardsOnClipboard(const SetP& set, const vector& cards); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/format/formats.hpp b/src/data/format/formats.hpp index 5fcfdc23..342309ef 100644 --- a/src/data/format/formats.hpp +++ b/src/data/format/formats.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FORMAT_FORMATS -#define HEADER_DATA_FORMAT_FORMATS +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -108,5 +107,3 @@ void export_mws(Window* parent, const SetP& set); /// Export a set to Apprentice void export_apprentice(Window* parent, const SetP& set); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/format/image_to_symbol.hpp b/src/data/format/image_to_symbol.hpp index 01cd9b32..6d7c51bb 100644 --- a/src/data/format/image_to_symbol.hpp +++ b/src/data/format/image_to_symbol.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_FORMAT_IMAGE_TO_SYMBOL -#define HEADER_DATA_FORMAT_IMAGE_TO_SYMBOL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -33,5 +32,3 @@ void simplify_symbol(Symbol&); /// Simplify a symbol parts, i.e. use bezier curves instead of lots of lines void simplify_symbol_shape(SymbolShape&); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/game.hpp b/src/data/game.hpp index c560db6a..a54da007 100644 --- a/src/data/game.hpp +++ b/src/data/game.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_GAME -#define HEADER_DATA_GAME +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -84,5 +83,3 @@ inline String type_name(const Game&) { return _TYPE_("game"); } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/graph_type.hpp b/src/data/graph_type.hpp index c7bcdb90..5a6ae27e 100644 --- a/src/data/graph_type.hpp +++ b/src/data/graph_type.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_GRAPH_TYPE -#define HEADER_DATA_GRAPH_TYPE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -32,5 +31,3 @@ inline size_t dimensionality(GraphType type) { else return 0; } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/installer.hpp b/src/data/installer.hpp index 58bf7ba4..f97a4909 100644 --- a/src/data/installer.hpp +++ b/src/data/installer.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_INSTALLER -#define HEADER_DATA_INSTALLER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -196,5 +195,3 @@ extern String mse_package; InstallablePackageP mse_installable_package(); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/keyword.hpp b/src/data/keyword.hpp index 153b9e02..0a63550b 100644 --- a/src/data/keyword.hpp +++ b/src/data/keyword.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_KEYWORD -#define HEADER_DATA_KEYWORD +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -202,5 +201,3 @@ class KeywordParamValue : public ScriptValue { virtual ScriptValueP getMember(const String& name) const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/locale.hpp b/src/data/locale.hpp index 186dac5b..963fd11b 100644 --- a/src/data/locale.hpp +++ b/src/data/locale.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_LOCALE -#define HEADER_DATA_LOCALE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -52,5 +51,3 @@ protected: /// The global locale object extern LocaleP the_locale; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/pack.hpp b/src/data/pack.hpp index b47f8f16..01142253 100644 --- a/src/data/pack.hpp +++ b/src/data/pack.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_PACK -#define HEADER_DATA_PACK +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -145,5 +144,3 @@ class PackGenerator { int max_depth; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/set.hpp b/src/data/set.hpp index 7d83a3f4..1946b303 100644 --- a/src/data/set.hpp +++ b/src/data/set.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_SET -#define HEADER_DATA_SET +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -175,5 +174,3 @@ class SetView : public ActionListener { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/settings.hpp b/src/data/settings.hpp index c995e558..3599a23c 100644 --- a/src/data/settings.hpp +++ b/src/data/settings.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_SETTINGS -#define HEADER_DATA_SETTINGS +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -225,5 +224,3 @@ class Settings { /// The global settings object extern Settings settings; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/statistics.hpp b/src/data/statistics.hpp index 69be20c9..cc9cbf3a 100644 --- a/src/data/statistics.hpp +++ b/src/data/statistics.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_STATISTICS -#define HEADER_DATA_STATISTICS +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -69,5 +68,3 @@ class StatsCategory : public IntrusivePtrBase { DECLARE_REFLECTION(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/stylesheet.hpp b/src/data/stylesheet.hpp index 1e785e94..403c945e 100644 --- a/src/data/stylesheet.hpp +++ b/src/data/stylesheet.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_STYLESHEET -#define HEADER_DATA_STYLESHEET +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -79,5 +78,3 @@ inline String type_name(const StyleSheet&) { void mark_dependency_value(const StyleSheet& value, const Dependency& dep); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/symbol.hpp b/src/data/symbol.hpp index 92a8b0ca..58384484 100644 --- a/src/data/symbol.hpp +++ b/src/data/symbol.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_SYMBOL -#define HEADER_DATA_SYMBOL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -318,5 +317,3 @@ class SymbolView : public ActionListener { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/symbol_font.hpp b/src/data/symbol_font.hpp index 85aae859..8eae6562 100644 --- a/src/data/symbol_font.hpp +++ b/src/data/symbol_font.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_SYMBOL_FONT -#define HEADER_DATA_SYMBOL_FONT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -167,5 +166,3 @@ class SymbolFontRef { void loadFont(Context& ctx); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/data/word_list.hpp b/src/data/word_list.hpp index b240a8e5..3261f2a5 100644 --- a/src/data/word_list.hpp +++ b/src/data/word_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_DATA_WORD_LIST -#define HEADER_DATA_WORD_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -59,5 +58,3 @@ class AutoReplace : public IntrusivePtrVirtualBase { DECLARE_REFLECTION(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gfx/bezier.hpp b/src/gfx/bezier.hpp index 4b856f57..8705159b 100644 --- a/src/gfx/bezier.hpp +++ b/src/gfx/bezier.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GFX_BEZIER -#define HEADER_GFX_BEZIER +#pragma once /** @file gfx/bezier.hpp * @@ -122,5 +121,3 @@ UInt intersect_bezier_ray(const ControlPoint& p1, const ControlPoint& p2, const // Does the line between p1 and p2 intersect the ray (half line) from (-inf, pos.y) to pos? bool intersect_line_ray(const Vector2D& p1, const Vector2D& p2, const Vector2D& pos); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gfx/color.hpp b/src/gfx/color.hpp index 811b1b2f..dc336559 100644 --- a/src/gfx/color.hpp +++ b/src/gfx/color.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GFX_COLOR -#define HEADER_GFX_COLOR +#pragma once /** @file gfx/color.hpp * @@ -114,5 +113,3 @@ void recolor(Image& img, RGB cr); /// Fills an image with the specified color void fill_image(Image& image, RGB color); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gfx/generated_image.hpp b/src/gfx/generated_image.hpp index 9126af81..cf8b1bd9 100644 --- a/src/gfx/generated_image.hpp +++ b/src/gfx/generated_image.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GFX_GENERATED_IMAGE -#define HEADER_GFX_GENERATED_IMAGE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -386,5 +385,3 @@ class ImageValueToImage : public GeneratedImage { Age age; ///< Age the symbol was last updated }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gfx/gfx.hpp b/src/gfx/gfx.hpp index 4131999d..8d691e83 100644 --- a/src/gfx/gfx.hpp +++ b/src/gfx/gfx.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GFX_GFX -#define HEADER_GFX_GFX +#pragma once /** @file gfx/gfx.hpp * @@ -191,5 +190,3 @@ class AlphaMask : public IntrusivePtrBase { void loadRowSizes() const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gfx/polynomial.hpp b/src/gfx/polynomial.hpp index 653d6c92..2d8539c3 100644 --- a/src/gfx/polynomial.hpp +++ b/src/gfx/polynomial.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GFX_POLYNOMIAL -#define HEADER_GFX_POLYNOMIAL +#pragma once /** @file gfx/polynomial.hpp * @@ -39,5 +38,3 @@ UInt solve_cubic(double a, double b, double c, double d, double* roots); */ UInt solve_cubic(double a, double b, double c, double* roots); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/about_window.hpp b/src/gui/about_window.hpp index 623522e8..6c8ccd3d 100644 --- a/src/gui/about_window.hpp +++ b/src/gui/about_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_ABOUT_WINDOW -#define HEADER_GUI_ABOUT_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -102,5 +101,3 @@ class HoverButton : public HoverButtonBase { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/auto_replace_window.hpp b/src/gui/auto_replace_window.hpp index aadd0a6a..f15d8d65 100644 --- a/src/gui/auto_replace_window.hpp +++ b/src/gui/auto_replace_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_AUTO_REPLACE_WINDOW -#define HEADER_GUI_AUTO_REPLACE_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -49,5 +48,3 @@ class AutoReplaceWindow : public wxDialog { void store(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/card_select_window.hpp b/src/gui/card_select_window.hpp index 1fa55278..3670d273 100644 --- a/src/gui/card_select_window.hpp +++ b/src/gui/card_select_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CARD_SELECT_WINDOW -#define HEADER_GUI_CARD_SELECT_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -94,5 +93,3 @@ class CardSelectWindow : public wxDialog { void onSelectNone(wxCommandEvent&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/card_editor.hpp b/src/gui/control/card_editor.hpp index 90b633da..4f43a9a0 100644 --- a/src/gui/control/card_editor.hpp +++ b/src/gui/control/card_editor.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_CARD_EDITOR -#define HEADER_GUI_CONTROL_CARD_EDITOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -149,5 +148,3 @@ typedef DataEditor CardEditor; FOR_EACH_REVERSE(v, viewers) \ if (ValueEditor* e = v->getEditor()) -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/card_list.hpp b/src/gui/control/card_list.hpp index 2f43e146..ca7c12d1 100644 --- a/src/gui/control/card_list.hpp +++ b/src/gui/control/card_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_CARD_LIST -#define HEADER_GUI_CONTROL_CARD_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -150,5 +149,3 @@ class CardListBase : public ItemList, public SetView { void onContextMenu (wxContextMenuEvent&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/card_list_column_select.hpp b/src/gui/control/card_list_column_select.hpp index a787644a..b786f792 100644 --- a/src/gui/control/card_list_column_select.hpp +++ b/src/gui/control/card_list_column_select.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_CARD_LIST_COLUMN_SELECT -#define HEADER_GUI_CONTROL_CARD_LIST_COLUMN_SELECT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -62,5 +61,3 @@ class CardListColumnSelectDialog : public wxDialog { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/card_viewer.hpp b/src/gui/control/card_viewer.hpp index 567e3473..ea3be6c6 100644 --- a/src/gui/control/card_viewer.hpp +++ b/src/gui/control/card_viewer.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_CARD_VIEWER -#define HEADER_GUI_CONTROL_CARD_VIEWER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -65,5 +64,3 @@ class CardViewer : public wxControl, public DataViewer { class OverdrawDC_aux; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/filter_ctrl.hpp b/src/gui/control/filter_ctrl.hpp index decf74fe..a3567eac 100644 --- a/src/gui/control/filter_ctrl.hpp +++ b/src/gui/control/filter_ctrl.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_FILTER_CTRL -#define HEADER_GUI_CONTROL_FILTER_CTRL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -57,5 +56,3 @@ class FilterCtrl : public wxControl { void onKillFocus(wxFocusEvent&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/filtered_card_list.hpp b/src/gui/control/filtered_card_list.hpp index 197f4ee8..e7b21851 100644 --- a/src/gui/control/filtered_card_list.hpp +++ b/src/gui/control/filtered_card_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_FILTERED_CARD_LIST -#define HEADER_GUI_CONTROL_FILTERED_CARD_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -36,5 +35,3 @@ class FilteredCardList : public CardListBase { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/gallery_list.hpp b/src/gui/control/gallery_list.hpp index 03461b66..1630cf89 100644 --- a/src/gui/control/gallery_list.hpp +++ b/src/gui/control/gallery_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_GALLERY_LIST -#define HEADER_GUI_CONTROL_GALLERY_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -138,5 +137,3 @@ class GalleryList : public wxPanel { static const int SPACING = MARGIN + 2*BORDER; // distance between items }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/graph.hpp b/src/gui/control/graph.hpp index 28ecce7a..e8355122 100644 --- a/src/gui/control/graph.hpp +++ b/src/gui/control/graph.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_GRAPH -#define HEADER_GUI_CONTROL_GRAPH +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -381,5 +380,3 @@ class GraphControl : public wxControl { void onSelectionChange(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/image_card_list.hpp b/src/gui/control/image_card_list.hpp index 4c352bf5..c510b800 100644 --- a/src/gui/control/image_card_list.hpp +++ b/src/gui/control/image_card_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_IMAGE_CARD_LIST -#define HEADER_GUI_CONTROL_IMAGE_CARD_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -58,5 +57,3 @@ class FilteredImageCardList : public ImageCardList { CardListFilterP filter; ///< Filter with which this.cards is made }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/item_list.hpp b/src/gui/control/item_list.hpp index 84a9622d..4291667c 100644 --- a/src/gui/control/item_list.hpp +++ b/src/gui/control/item_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_ITEM_LIST -#define HEADER_GUI_CONTROL_ITEM_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -112,5 +111,3 @@ class ItemList : public wxListView { void onContextMenu(wxContextMenuEvent&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/keyword_list.hpp b/src/gui/control/keyword_list.hpp index a6440b21..6ef593e4 100644 --- a/src/gui/control/keyword_list.hpp +++ b/src/gui/control/keyword_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_KEYWORD_LIST -#define HEADER_GUI_CONTROL_KEYWORD_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -105,5 +104,3 @@ class KeywordList : public ItemList, public SetView { void onContextMenu (wxContextMenuEvent&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/native_look_editor.hpp b/src/gui/control/native_look_editor.hpp index a0b4faa1..43117763 100644 --- a/src/gui/control/native_look_editor.hpp +++ b/src/gui/control/native_look_editor.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_NATIVE_LOOK_EDITOR -#define HEADER_GUI_CONTROL_NATIVE_LOOK_EDITOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -93,5 +92,3 @@ class ExportOptionsEditor : public NativeLookEditor { ExportTemplateP export_template; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/package_list.hpp b/src/gui/control/package_list.hpp index c76c682c..46e708ba 100644 --- a/src/gui/control/package_list.hpp +++ b/src/gui/control/package_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_PACKAGE_LIST -#define HEADER_GUI_CONTROL_PACKAGE_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -74,5 +73,3 @@ class PackageList : public GalleryList { vector packages; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/select_card_list.hpp b/src/gui/control/select_card_list.hpp index 76826f98..b2b03ed8 100644 --- a/src/gui/control/select_card_list.hpp +++ b/src/gui/control/select_card_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_SELECT_CARD_LIST -#define HEADER_GUI_CONTROL_SELECT_CARD_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -46,5 +45,3 @@ class SelectCardList : public CardListBase { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/text_ctrl.hpp b/src/gui/control/text_ctrl.hpp index 3666521e..230ab622 100644 --- a/src/gui/control/text_ctrl.hpp +++ b/src/gui/control/text_ctrl.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_TEXT_CTRL -#define HEADER_GUI_CONTROL_TEXT_CTRL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -71,5 +70,3 @@ class TextCtrl : public DataEditor { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/control/tree_list.hpp b/src/gui/control/tree_list.hpp index 4272e103..49ddacc6 100644 --- a/src/gui/control/tree_list.hpp +++ b/src/gui/control/tree_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_CONTROL_TREE_LIST -#define HEADER_GUI_CONTROL_TREE_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -103,5 +102,3 @@ class TreeList : public wxPanel { void RefreshLine(size_t line); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/drop_down_list.hpp b/src/gui/drop_down_list.hpp index d7e7bf95..fb51733e 100644 --- a/src/gui/drop_down_list.hpp +++ b/src/gui/drop_down_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_DROP_DOWN_LIST -#define HEADER_GUI_DROP_DOWN_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -129,5 +128,3 @@ class DropDownList : public wxPopupWindow { virtual void redrawArrowOnParent(); // allow override }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/html_export_window.hpp b/src/gui/html_export_window.hpp index 52a6d038..0e8656f2 100644 --- a/src/gui/html_export_window.hpp +++ b/src/gui/html_export_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_HTML_EXPORT_WINDOW -#define HEADER_GUI_HTML_EXPORT_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -34,5 +33,3 @@ class HtmlExportWindow : public ExportWindowBase { void onUpdateUI(wxUpdateUIEvent& ev); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/icon_menu.hpp b/src/gui/icon_menu.hpp index e50e96f1..6d8adc07 100644 --- a/src/gui/icon_menu.hpp +++ b/src/gui/icon_menu.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_ICON_MENU -#define HEADER_GUI_ICON_MENU +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -35,5 +34,3 @@ class IconMenu : public wxMenu { void set_menu_item_image(wxMenuItem* menuitem, const String& resource); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/image_slice_window.hpp b/src/gui/image_slice_window.hpp index 1894122b..991f45cf 100644 --- a/src/gui/image_slice_window.hpp +++ b/src/gui/image_slice_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_IMAGE_SLICE_WINDOW -#define HEADER_GUI_IMAGE_SLICE_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -195,5 +194,3 @@ class ImageSliceSelector : public wxControl { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/images_export_window.hpp b/src/gui/images_export_window.hpp index 1956f817..e6662e25 100644 --- a/src/gui/images_export_window.hpp +++ b/src/gui/images_export_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_IMAGES_EXPORT_WINDOW -#define HEADER_GUI_IMAGES_EXPORT_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -29,5 +28,3 @@ class ImagesExportWindow : public ExportWindowBase { wxChoice* conflicts; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/new_window.hpp b/src/gui/new_window.hpp index 1fbcda7e..5e7b1f62 100644 --- a/src/gui/new_window.hpp +++ b/src/gui/new_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_NEW_WINDOW -#define HEADER_GUI_NEW_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -89,5 +88,3 @@ class SelectStyleSheetWindow : public wxDialog { void done(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/package_update_list.hpp b/src/gui/package_update_list.hpp index 27cec2af..0c00fcbf 100644 --- a/src/gui/package_update_list.hpp +++ b/src/gui/package_update_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_PACKAGE_UPDATE_LIST -#define HEADER_GUI_PACKAGE_UPDATE_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -79,5 +78,3 @@ class PackageUpdateList : public TreeList { friend class PackageIconRequest; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/packages_window.hpp b/src/gui/packages_window.hpp index 36b40e62..ce622a3d 100644 --- a/src/gui/packages_window.hpp +++ b/src/gui/packages_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_PACKAGES_WINDOW -#define HEADER_GUI_PACKAGES_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -53,5 +52,3 @@ class PackagesWindow : public wxDialog { bool checkInstallerList(bool refresh = true); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/preferences_window.hpp b/src/gui/preferences_window.hpp index 04e175f0..39492a6f 100644 --- a/src/gui/preferences_window.hpp +++ b/src/gui/preferences_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_PREFERENCES_WINDOW -#define HEADER_GUI_PREFERENCES_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -25,5 +24,3 @@ class PreferencesWindow : public wxDialog { void onOk(wxCommandEvent&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/print_window.hpp b/src/gui/print_window.hpp index a87c86a4..f544a1f2 100644 --- a/src/gui/print_window.hpp +++ b/src/gui/print_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_PRINT_WINDOW -#define HEADER_GUI_PRINT_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -72,5 +71,3 @@ void print_preview(Window* parent, const SetP& set, const ExportCardSelectionCho void print_set(Window* parent, const PrintJobP& job); void print_set(Window* parent, const SetP& set, const ExportCardSelectionChoices& choices); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/cards_panel.hpp b/src/gui/set/cards_panel.hpp index 9bd3f0cc..019d9dcf 100644 --- a/src/gui/set/cards_panel.hpp +++ b/src/gui/set/cards_panel.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_CARDS_PANEL -#define HEADER_GUI_SET_CARDS_PANEL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -100,5 +99,3 @@ class CardsPanel : public SetWindowPanel { wxMenu* makeAddCardsSubmenu(bool add_single_card_option); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/console_panel.hpp b/src/gui/set/console_panel.hpp index 874538a9..0ad149b1 100644 --- a/src/gui/set/console_panel.hpp +++ b/src/gui/set/console_panel.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_CONSOLE_PANEL -#define HEADER_GUI_SET_CONSOLE_PANEL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -68,5 +67,3 @@ private: void onTimer(wxTimerEvent&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/keywords_panel.hpp b/src/gui/set/keywords_panel.hpp index 51fab280..1b5e2e98 100644 --- a/src/gui/set/keywords_panel.hpp +++ b/src/gui/set/keywords_panel.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_KEYWORDS_PANEL -#define HEADER_GUI_SET_KEYWORDS_PANEL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -79,5 +78,3 @@ class KeywordsPanel : public SetWindowPanel { void onModeChange(wxCommandEvent& ev); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/panel.hpp b/src/gui/set/panel.hpp index 0391eb43..c3a4dba8 100644 --- a/src/gui/set/panel.hpp +++ b/src/gui/set/panel.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_PANEL -#define HEADER_GUI_SET_PANEL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -80,5 +79,3 @@ class SetWindowPanel : public wxPanel, public SetView { bool isInitialized() const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/random_pack_panel.hpp b/src/gui/set/random_pack_panel.hpp index 689d2644..57b1260a 100644 --- a/src/gui/set/random_pack_panel.hpp +++ b/src/gui/set/random_pack_panel.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_RANDOM_PACK_PANEL -#define HEADER_GUI_SET_RANDOM_PACK_PANEL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -98,5 +97,3 @@ class RandomPackPanel : public SetWindowPanel { typedef PackItem PackItem_for_typeof; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/set_info_panel.hpp b/src/gui/set/set_info_panel.hpp index ccb3597e..f370a30a 100644 --- a/src/gui/set/set_info_panel.hpp +++ b/src/gui/set/set_info_panel.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_SET_INFO_PANEL -#define HEADER_GUI_SET_SET_INFO_PANEL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -43,5 +42,3 @@ class SetInfoPanel : public SetWindowPanel { SetInfoEditor* editor; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/stats_panel.hpp b/src/gui/set/stats_panel.hpp index 462d1c46..d60dda31 100644 --- a/src/gui/set/stats_panel.hpp +++ b/src/gui/set/stats_panel.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_STATS_PANEL -#define HEADER_GUI_SET_STATS_PANEL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -73,5 +72,3 @@ class StatsPanel : public SetWindowPanel { void filterCards(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/style_panel.hpp b/src/gui/set/style_panel.hpp index 3848501e..522004f3 100644 --- a/src/gui/set/style_panel.hpp +++ b/src/gui/set/style_panel.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_STYLE_PANEL -#define HEADER_GUI_SET_STYLE_PANEL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -63,5 +62,3 @@ class StylePanel : public SetWindowPanel { void initControls(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/set/window.hpp b/src/gui/set/window.hpp index d1f8e7fd..80af1fd7 100644 --- a/src/gui/set/window.hpp +++ b/src/gui/set/window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SET_WINDOW -#define HEADER_GUI_SET_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -175,5 +174,3 @@ private: void onEraseBackground (wxEraseEvent&) {} // reduce flicker }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/basic_shape_editor.hpp b/src/gui/symbol/basic_shape_editor.hpp index 9d98d859..772e5733 100644 --- a/src/gui/symbol/basic_shape_editor.hpp +++ b/src/gui/symbol/basic_shape_editor.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_BASIC_SHAPE_EDITOR -#define HEADER_GUI_SYMBOL_BASIC_SHAPE_EDITOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -69,5 +68,3 @@ class SymbolBasicShapeEditor : public SymbolEditorBase { void makeCenteredShape(const Vector2D& c, Vector2D r, bool constrained); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/control.hpp b/src/gui/symbol/control.hpp index b96da9a3..a5883edb 100644 --- a/src/gui/symbol/control.hpp +++ b/src/gui/symbol/control.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_CONTROL -#define HEADER_GUI_SYMBOL_CONTROL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -102,5 +101,3 @@ class SymbolControl : public wxControl, public SymbolViewer { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/editor.hpp b/src/gui/symbol/editor.hpp index 5cb69394..d778f606 100644 --- a/src/gui/symbol/editor.hpp +++ b/src/gui/symbol/editor.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_EDITOR -#define HEADER_GUI_SYMBOL_EDITOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -91,5 +90,3 @@ class SymbolEditorBase : public IntrusivePtrVirtualBase { virtual bool isEditing() { return false; } }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/part_list.hpp b/src/gui/symbol/part_list.hpp index 299e8824..4bcce421 100644 --- a/src/gui/symbol/part_list.hpp +++ b/src/gui/symbol/part_list.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_PART_LIST -#define HEADER_GUI_SYMBOL_PART_LIST +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -105,5 +104,3 @@ class SymbolPartList : public wxScrolledWindow, public SymbolView { void updateCaret(DC& dc, int x, int y, int h, const SymbolPartP& part); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/point_editor.hpp b/src/gui/symbol/point_editor.hpp index 3f7207ae..6d8a76ff 100644 --- a/src/gui/symbol/point_editor.hpp +++ b/src/gui/symbol/point_editor.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_POINT_EDITOR -#define HEADER_GUI_SYMBOL_POINT_EDITOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -165,5 +164,3 @@ class SymbolPointEditor : public SymbolEditorBase { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/select_editor.hpp b/src/gui/symbol/select_editor.hpp index d94a7d77..46842015 100644 --- a/src/gui/symbol/select_editor.hpp +++ b/src/gui/symbol/select_editor.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_SELECT_EDITOR -#define HEADER_GUI_SYMBOL_SELECT_EDITOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -120,5 +119,3 @@ class SymbolSelectEditor : public SymbolEditorBase { void resetActions(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/selection.hpp b/src/gui/symbol/selection.hpp index 08272059..2bf6db6c 100644 --- a/src/gui/symbol/selection.hpp +++ b/src/gui/symbol/selection.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_SELECTION -#define HEADER_GUI_SYMBOL_SELECTION +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -83,5 +82,3 @@ class SymbolPartsSelection { void clearChildren (SymbolPart* part); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/symmetry_editor.hpp b/src/gui/symbol/symmetry_editor.hpp index ab9092c0..e2f4b233 100644 --- a/src/gui/symbol/symmetry_editor.hpp +++ b/src/gui/symbol/symmetry_editor.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_SYMMETRY_EDITOR -#define HEADER_GUI_SYMBOL_SYMMETRY_EDITOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -70,5 +69,3 @@ class SymbolSymmetryEditor : public SymbolEditorBase { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/symbol/window.hpp b/src/gui/symbol/window.hpp index 41941ea0..1412a2e9 100644 --- a/src/gui/symbol/window.hpp +++ b/src/gui/symbol/window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_WINDOW -#define HEADER_GUI_SYMBOL_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -71,5 +70,3 @@ class SymbolWindow : public wxFrame { void onSelectFromControl(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/thumbnail_thread.hpp b/src/gui/thumbnail_thread.hpp index 5b8ef74d..6c5b67d1 100644 --- a/src/gui/thumbnail_thread.hpp +++ b/src/gui/thumbnail_thread.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_THUMBNAIL_THREAD -#define HEADER_GUI_THUMBNAIL_THREAD +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -80,5 +79,3 @@ class ThumbnailThread { /// The global thumbnail generator thread extern ThumbnailThread thumbnail_thread; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/update_checker.hpp b/src/gui/update_checker.hpp index 32a93061..5bf63870 100644 --- a/src/gui/update_checker.hpp +++ b/src/gui/update_checker.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_UPDATE_CHECKER -#define HEADER_UTIL_UPDATE_CHECKER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -31,5 +30,3 @@ bool update_data_found(); /// Is there an update? bool update_available(); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/util.hpp b/src/gui/util.hpp index bcced20f..717f2b14 100644 --- a/src/gui/util.hpp +++ b/src/gui/util.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_UTIL -#define HEADER_GUI_UTIL +#pragma once /** @file gui/util.hpp * Utility functions for use in the gui. Most are related to drawing. @@ -89,5 +88,3 @@ void draw_selection_rectangle(Window* win, DC& dc, const wxRect& rect, bool sele /// Enable fancy themed selection rectangle on windows void enable_themed_selection_rectangle(Window* win); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/choice.hpp b/src/gui/value/choice.hpp index 87dbf4be..67e71083 100644 --- a/src/gui/value/choice.hpp +++ b/src/gui/value/choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_CHOICE -#define HEADER_GUI_VALUE_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -100,5 +99,3 @@ class DropDownChoiceList : public DropDownChoiceListBase { virtual DropDownList* createSubMenu(ChoiceField::ChoiceP group) const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/color.hpp b/src/gui/value/color.hpp index 232ce5aa..155f80f3 100644 --- a/src/gui/value/color.hpp +++ b/src/gui/value/color.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_COLOR -#define HEADER_GUI_VALUE_COLOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -39,5 +38,3 @@ class ColorValueEditor : public ColorValueViewer, public ValueEditor { void changeCustom(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/editor.hpp b/src/gui/value/editor.hpp index 209011e9..1c616d80 100644 --- a/src/gui/value/editor.hpp +++ b/src/gui/value/editor.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_EDITOR -#define HEADER_GUI_VALUE_EDITOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -153,5 +152,3 @@ class ValueEditor { Type##ValueEditor::Type##ValueEditor(DataEditor& parent, const Type##StyleP& style) \ : Type##ValueViewer(parent, style) -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/image.hpp b/src/gui/value/image.hpp index 0d19221f..35e2b7ea 100644 --- a/src/gui/value/image.hpp +++ b/src/gui/value/image.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_IMAGE -#define HEADER_GUI_VALUE_IMAGE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -37,5 +36,3 @@ class ImageValueEditor : public ImageValueViewer, public ValueEditor { void sliceImage(const Image&); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/information.hpp b/src/gui/value/information.hpp index bbeb52ea..5655135e 100644 --- a/src/gui/value/information.hpp +++ b/src/gui/value/information.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_INFORMATION -#define HEADER_GUI_VALUE_INFORMATION +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -24,5 +23,3 @@ class InfoValueEditor : public InfoValueViewer, public ValueEditor { virtual bool drawLabel() const { return false; } }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/multiple_choice.hpp b/src/gui/value/multiple_choice.hpp index 14480242..a6ddd614 100644 --- a/src/gui/value/multiple_choice.hpp +++ b/src/gui/value/multiple_choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_MULTIPLE_CHOICE -#define HEADER_GUI_VALUE_MULTIPLE_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -42,5 +41,3 @@ class MultipleChoiceValueEditor : public MultipleChoiceValueViewer, public Value void toggleDefault(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/package_choice.hpp b/src/gui/value/package_choice.hpp index c52bae2b..3864158a 100644 --- a/src/gui/value/package_choice.hpp +++ b/src/gui/value/package_choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_PACKAGE_CHOICE -#define HEADER_GUI_VALUE_PACKAGE_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -38,5 +37,3 @@ class PackageChoiceValueEditor : public PackageChoiceValueViewer, public ValueEd }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/symbol.hpp b/src/gui/value/symbol.hpp index 5200a347..710f4274 100644 --- a/src/gui/value/symbol.hpp +++ b/src/gui/value/symbol.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_SYMBOL -#define HEADER_GUI_VALUE_SYMBOL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -43,5 +42,3 @@ class SymbolValueEditor : public SymbolValueViewer, public ValueEditor { Bitmap button_images[1]; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/value/text.hpp b/src/gui/value/text.hpp index 3196529d..469291b8 100644 --- a/src/gui/value/text.hpp +++ b/src/gui/value/text.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_VALUE_TEXT -#define HEADER_GUI_VALUE_TEXT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -187,5 +186,3 @@ class TextValueEditor : public TextValueViewer, public ValueEditor { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/gui/welcome_window.hpp b/src/gui/welcome_window.hpp index 5d5c1d1e..5786bc60 100644 --- a/src/gui/welcome_window.hpp +++ b/src/gui/welcome_window.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_WELCOME_WINDOW -#define HEADER_GUI_WELCOME_WINDOW +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -67,5 +66,3 @@ class HoverButtonExt : public HoverButton { virtual void draw(DC& dc); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/card/viewer.hpp b/src/render/card/viewer.hpp index d070aee2..8cbf043c 100644 --- a/src/render/card/viewer.hpp +++ b/src/render/card/viewer.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_CARD_VIEWER -#define HEADER_RENDER_CARD_VIEWER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -103,5 +102,3 @@ class DataViewer : public SetView { mutable StyleSheetP stylesheet; ///< Stylesheet being used }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/symbol/filter.hpp b/src/render/symbol/filter.hpp index e731ad6e..ce71fb59 100644 --- a/src/render/symbol/filter.hpp +++ b/src/render/symbol/filter.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_SYMBOL_FILTER -#define HEADER_RENDER_SYMBOL_FILTER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -126,5 +125,3 @@ class RadialGradientSymbolFilter : public GradientSymbolFilter { inline double t(double x, double y) const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/symbol/viewer.hpp b/src/render/symbol/viewer.hpp index 882a49ed..6ad1320e 100644 --- a/src/render/symbol/viewer.hpp +++ b/src/render/symbol/viewer.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_GUI_SYMBOL_VIEWER -#define HEADER_GUI_SYMBOL_VIEWER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -97,5 +96,3 @@ class SymbolViewer : public SymbolView { void calcBezierOpt(const BezierCurve& c, const Vector2D& p0, const Vector2D& p1, double t0, double t1, wxPoint*& p_out, UInt count); */}; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/text/element.hpp b/src/render/text/element.hpp index 64b8748a..ac21a687 100644 --- a/src/render/text/element.hpp +++ b/src/render/text/element.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_TEXT_ELEMENT -#define HEADER_RENDER_TEXT_ELEMENT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -172,5 +171,3 @@ class ErrorTextElement : public CompoundTextElement { virtual void draw(RotatedDC& dc, double scale, const RealRect& rect, const double* xs, DrawWhat what, size_t start, size_t end) const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/text/viewer.hpp b/src/render/text/viewer.hpp index 76b5c49b..cb3e2f54 100644 --- a/src/render/text/viewer.hpp +++ b/src/render/text/viewer.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_TEXT_VIEWER -#define HEADER_RENDER_TEXT_VIEWER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -156,5 +155,3 @@ class TextViewer { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/choice.hpp b/src/render/value/choice.hpp index 4ea3fa1f..b3aa55d4 100644 --- a/src/render/value/choice.hpp +++ b/src/render/value/choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_CHOICE -#define HEADER_RENDER_VALUE_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -28,5 +27,3 @@ class ChoiceValueViewer : public ValueViewer { bool prepare_choice_viewer(RotatedDC& dc, ValueViewer& viewer, ChoiceStyle& style, const String& value); void draw_choice_viewer(RotatedDC& dc, ValueViewer& viewer, ChoiceStyle& style, const String& value); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/color.hpp b/src/render/value/color.hpp index 9e7b6fbe..8ad28303 100644 --- a/src/render/value/color.hpp +++ b/src/render/value/color.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_COLOR -#define HEADER_RENDER_VALUE_COLOR +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -26,5 +25,3 @@ class ColorValueViewer : public ValueViewer { virtual bool containsPoint(const RealPoint& p) const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/image.hpp b/src/render/value/image.hpp index 5c559c3a..8a7969d0 100644 --- a/src/render/value/image.hpp +++ b/src/render/value/image.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_IMAGE -#define HEADER_RENDER_VALUE_IMAGE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -36,5 +35,3 @@ class ImageValueViewer : public ValueViewer { static Bitmap imagePlaceholder(const Rotation& rot, UInt w, UInt h, const Image& background, bool editing); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/information.hpp b/src/render/value/information.hpp index 13154275..82c40341 100644 --- a/src/render/value/information.hpp +++ b/src/render/value/information.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_INFORMATION -#define HEADER_RENDER_VALUE_INFORMATION +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -24,5 +23,3 @@ class InfoValueViewer : public ValueViewer { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/multiple_choice.hpp b/src/render/value/multiple_choice.hpp index 9b694878..599f582a 100644 --- a/src/render/value/multiple_choice.hpp +++ b/src/render/value/multiple_choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_MULTIPLE_CHOICE -#define HEADER_RENDER_VALUE_MULTIPLE_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -29,5 +28,3 @@ class MultipleChoiceValueViewer : public ValueViewer { void drawChoice(RotatedDC& dc, RealPoint& pos, const String& choice, bool active = true); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/package_choice.hpp b/src/render/value/package_choice.hpp index 99c68489..9773fa62 100644 --- a/src/render/value/package_choice.hpp +++ b/src/render/value/package_choice.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_PACKAGE_CHOICE -#define HEADER_RENDER_VALUE_PACKAGE_CHOICE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -34,5 +33,3 @@ class PackageChoiceValueViewer : public ValueViewer { struct ComparePackagePosHint; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/symbol.hpp b/src/render/value/symbol.hpp index ae2ffd19..77b36283 100644 --- a/src/render/value/symbol.hpp +++ b/src/render/value/symbol.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_SYMBOL -#define HEADER_RENDER_VALUE_SYMBOL +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -27,5 +26,3 @@ class SymbolValueViewer : public ValueViewer { vector symbols; ///< Cached images }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/text.hpp b/src/render/value/text.hpp index 37b41685..5a8e0a1a 100644 --- a/src/render/value/text.hpp +++ b/src/render/value/text.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_TEXT -#define HEADER_RENDER_VALUE_TEXT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -33,5 +32,3 @@ class TextValueViewer : public ValueViewer { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/render/value/viewer.hpp b/src/render/value/viewer.hpp index effac66f..271880e1 100644 --- a/src/render/value/viewer.hpp +++ b/src/render/value/viewer.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_RENDER_VALUE_VIEWER -#define HEADER_RENDER_VALUE_VIEWER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -120,5 +119,3 @@ class ValueViewer : public StyleListener { } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/script/context.hpp b/src/script/context.hpp index a26b9742..fd402f52 100644 --- a/src/script/context.hpp +++ b/src/script/context.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_SCRIPT_CONTEXT -#define HEADER_SCRIPT_CONTEXT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -138,5 +137,3 @@ class LocalScope { size_t scope; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/script/dependency.hpp b/src/script/dependency.hpp index 6d28d732..5f36b4db 100644 --- a/src/script/dependency.hpp +++ b/src/script/dependency.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_SCRIPT_DEPENDENCY -#define HEADER_SCRIPT_DEPENDENCY +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -63,5 +62,3 @@ class Dependencies : public vector { using vector::push_back; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/script/functions/functions.hpp b/src/script/functions/functions.hpp index 907bc9d6..c420944b 100644 --- a/src/script/functions/functions.hpp +++ b/src/script/functions/functions.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_SCRIPT_FUNCTIONS_FUNCTIONS -#define HEADER_SCRIPT_FUNCTIONS_FUNCTIONS +#pragma once /** @file script/functions/functions.cpp * @@ -41,5 +40,3 @@ inline void init_script_functions(Context& ctx) { init_script_construction_functions(ctx); } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/script/functions/util.hpp b/src/script/functions/util.hpp index b0a4a727..44c09f9a 100644 --- a/src/script/functions/util.hpp +++ b/src/script/functions/util.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_SCRIPT_FUNCTIONS_UTIL -#define HEADER_SCRIPT_FUNCTIONS_UTIL +#pragma once /** @file script/functions/util.cpp * @@ -224,5 +223,3 @@ inline Type from_script(const ScriptValueP& v, Variable var) { ScriptValueP ScriptRule_##name::dependencies(Context& ctx, const Dependency& dep) const -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/script/image.hpp b/src/script/image.hpp index db36fc45..2937a83e 100644 --- a/src/script/image.hpp +++ b/src/script/image.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_SCRIPT_IMAGE -#define HEADER_SCRIPT_IMAGE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -142,5 +141,3 @@ class CachedScriptableMask { friend class GetDefaultMember; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/script/parser.hpp b/src/script/parser.hpp index 379b7e50..64b5a88c 100644 --- a/src/script/parser.hpp +++ b/src/script/parser.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_SCRIPT_PARSER -#define HEADER_SCRIPT_PARSER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -36,5 +35,3 @@ ScriptP parse(const String& s, Packaged* package, bool string_mode, vector& s) { handle(s.value); } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/script/to_value.hpp b/src/script/to_value.hpp index 43397974..8d6d49c9 100644 --- a/src/script/to_value.hpp +++ b/src/script/to_value.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_SCRIPT_TO_VALUE -#define HEADER_SCRIPT_TO_VALUE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -430,5 +429,3 @@ template <> inline bool from_script (const ScriptValueP& va template <> inline Color from_script (const ScriptValueP& value) { return *value; } template <> inline wxDateTime from_script (const ScriptValueP& value) { return *value; } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/script/value.hpp b/src/script/value.hpp index 85fbe954..52cec90b 100644 --- a/src/script/value.hpp +++ b/src/script/value.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_SCRIPT_VALUE -#define HEADER_SCRIPT_VALUE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -134,5 +133,3 @@ extern ScriptValueP dependency_dummy; ///< Dummy value used during dependency an /// compare script values for equallity bool equal(const ScriptValueP& a, const ScriptValueP& b); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/action_stack.hpp b/src/util/action_stack.hpp index 3a24c35b..a46a4e27 100644 --- a/src/util/action_stack.hpp +++ b/src/util/action_stack.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_ACTION_STACK -#define HEADER_UTIL_ACTION_STACK +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -140,5 +139,3 @@ class ActionStack { Type##variable.second = false) -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/age.hpp b/src/util/age.hpp index 45157317..092666d2 100644 --- a/src/util/age.hpp +++ b/src/util/age.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_AGE -#define HEADER_UTIL_AGE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -59,5 +58,3 @@ class Age { */ DECLARE_DYNAMIC_ARG (AtomicIntEquiv, last_update_age); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/alignment.hpp b/src/util/alignment.hpp index 7462d23e..a1dc1a84 100644 --- a/src/util/alignment.hpp +++ b/src/util/alignment.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_ALIGNMENT -#define HEADER_UTIL_ALIGNMENT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -74,5 +73,3 @@ enum Direction { /** If the direction is horizontal the to_move.width is used, otherwise to_move.height */ RealPoint move_in_direction(Direction dir, const RealPoint& point, const RealSize to_move, double spacing = 0); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/angle.hpp b/src/util/angle.hpp index d6cd855c..517254aa 100644 --- a/src/util/angle.hpp +++ b/src/util/angle.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_ANGLE -#define HEADER_UTIL_ANGLE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -73,5 +72,3 @@ inline bool is_sideways(Radians angle) { } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/atomic.hpp b/src/util/atomic.hpp index 499d8637..241c2376 100644 --- a/src/util/atomic.hpp +++ b/src/util/atomic.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_ATOMIC -#define HEADER_UTIL_ATOMIC +#pragma once /** @file util/atomic.hpp * @@ -113,5 +112,3 @@ #endif -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/defaultable.hpp b/src/util/defaultable.hpp index 44b95e5e..e7181ffc 100644 --- a/src/util/defaultable.hpp +++ b/src/util/defaultable.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_DEFAULTABLE -#define HEADER_UTIL_DEFAULTABLE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -86,5 +85,3 @@ void GetDefaultMember::handle(const Defaultable& def) { handle(def()); } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/delayed_index_maps.hpp b/src/util/delayed_index_maps.hpp index ee8b1afb..c51c7674 100644 --- a/src/util/delayed_index_maps.hpp +++ b/src/util/delayed_index_maps.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_DELAYED_INDEX_MAPS -#define HEADER_UTIL_DELAYED_INDEX_MAPS +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -79,5 +78,3 @@ void GetDefaultMember::handle(const DelayedIndexMapsData& d) { handle(d.read_data); } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/dynamic_arg.hpp b/src/util/dynamic_arg.hpp index bf257c82..186d7a79 100644 --- a/src/util/dynamic_arg.hpp +++ b/src/util/dynamic_arg.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_DYNAMIC_ARG -#define HEADER_UTIL_DYNAMIC_ARG +#pragma once /** @file util/dynamic_arg.hpp * @@ -118,5 +117,3 @@ #endif -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/error.hpp b/src/util/error.hpp index 23da28d3..03fe8980 100644 --- a/src/util/error.hpp +++ b/src/util/error.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_ERROR -#define HEADER_UTIL_ERROR +#pragma once /** @file util/error.hpp * @@ -181,5 +180,3 @@ String get_stack_trace(); handle_error(InternalError(_("An unexpected exception occurred!"))); \ } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/file_utils.hpp b/src/util/file_utils.hpp index c0d0aabc..e291b6ef 100644 --- a/src/util/file_utils.hpp +++ b/src/util/file_utils.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_FILE_UTILS -#define HEADER_UTIL_FILE_UTILS +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -62,5 +61,3 @@ bool rename_file_or_dir(const String& old_name, const String& new_name); /// Move files/dirs that are ignored by packages to another directory void move_ignored_files(const String& from_dir, const String& to_dir); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/find_replace.hpp b/src/util/find_replace.hpp index 0e4652fe..924cb395 100644 --- a/src/util/find_replace.hpp +++ b/src/util/find_replace.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_FIND_REPLACE -#define HEADER_UTIL_FIND_REPLACE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -44,5 +43,3 @@ class FindInfo { wxFindReplaceData& what; ///< What to search for, the direction to search in }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/for_each.hpp b/src/util/for_each.hpp index 557e5115..4b48a9f4 100644 --- a/src/util/for_each.hpp +++ b/src/util/for_each.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_FOR_EACH -#define HEADER_UTIL_FOR_EACH +#pragma once /** @file util/for_each.hpp * @@ -140,5 +139,3 @@ TYPEOF_CIT(Collection2), TYPEOF_CREF(Collection2), Elem2, Collection2) -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/index_map.hpp b/src/util/index_map.hpp index 49487824..06f2e6ab 100644 --- a/src/util/index_map.hpp +++ b/src/util/index_map.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_INDEX_MAP -#define HEADER_UTIL_INDEX_MAP +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -159,5 +158,3 @@ class DelayedIndexMaps { }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/io/get_member.hpp b/src/util/io/get_member.hpp index a0eef1da..830f4144 100644 --- a/src/util/io/get_member.hpp +++ b/src/util/io/get_member.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_IO_GET_MEMBER -#define HEADER_UTIL_IO_GET_MEMBER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -160,5 +159,3 @@ class EnumGetMember { GetDefaultMember& gdm; ///< The object to store output in }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/io/package.hpp b/src/util/io/package.hpp index bdb2744d..61291e1b 100644 --- a/src/util/io/package.hpp +++ b/src/util/io/package.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_IO_PACKAGE -#define HEADER_UTIL_IO_PACKAGE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -297,5 +296,3 @@ inline void Package::readFile(const String& file, T& obj) { } } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/io/package_manager.hpp b/src/util/io/package_manager.hpp index 2d848d06..8d9df7b5 100644 --- a/src/util/io/package_manager.hpp +++ b/src/util/io/package_manager.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_IO_PACKAGE_MANAGER -#define HEADER_UTIL_IO_PACKAGE_MANAGER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -234,5 +233,3 @@ class PackageVersion : public IntrusivePtrBase { DECLARE_REFLECTION(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/io/reader.hpp b/src/util/io/reader.hpp index 1e7f52b3..79d9aca8 100644 --- a/src/util/io/reader.hpp +++ b/src/util/io/reader.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_IO_READER -#define HEADER_UTIL_IO_READER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -299,5 +298,3 @@ class EnumReader { String notDoneErrorMessage() const; }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/io/writer.hpp b/src/util/io/writer.hpp index f732c72c..b1660847 100644 --- a/src/util/io/writer.hpp +++ b/src/util/io/writer.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_IO_WRITER -#define HEADER_UTIL_IO_WRITER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -164,5 +163,3 @@ class EnumWriter { Writer& writer; ///< The writer to write output to }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/locale.hpp b/src/util/locale.hpp index f77358f7..d60c47fc 100644 --- a/src/util/locale.hpp +++ b/src/util/locale.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_LOCALE -#define HEADER_UTIL_LOCALE +#pragma once /** @file util/locale.hpp * @@ -134,5 +133,3 @@ inline String format_string(const String& format, const String& a0, const String return String::Format(format, a0.c_str(), a1.c_str(), a2.c_str(), a3.c_str()); } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/order_cache.hpp b/src/util/order_cache.hpp index 068bc92c..6d756779 100644 --- a/src/util/order_cache.hpp +++ b/src/util/order_cache.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_ORDER_CACHE -#define HEADER_UTIL_ORDER_CACHE +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -83,5 +82,3 @@ int OrderCache::find(const T& key) const { return it->second; } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/platform.hpp b/src/util/platform.hpp index 1b487cad..490c8277 100644 --- a/src/util/platform.hpp +++ b/src/util/platform.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_PLATFORM -#define HEADER_UTIL_PLATFORM +#pragma once /** @file util/platform.hpp * @@ -31,5 +30,3 @@ #endif -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/prec.hpp b/src/util/prec.hpp index 11102c5e..13ecb4e5 100644 --- a/src/util/prec.hpp +++ b/src/util/prec.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_PREC -#define HEADER_UTIL_PREC +#pragma once /** @file util/prec.hpp * @@ -122,5 +121,3 @@ class FileName : public wxString { #endif #endif -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/real_point.hpp b/src/util/real_point.hpp index 85eb7159..e1c27037 100644 --- a/src/util/real_point.hpp +++ b/src/util/real_point.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_REAL_POINT -#define HEADER_UTIL_REAL_POINT +#pragma once /** @file util/real_point.hpp * @@ -225,5 +224,3 @@ inline void operator += (RealPoint& p, const RealSize& s) { p.y += s.height; } -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/reflect.hpp b/src/util/reflect.hpp index c08c666d..981b2848 100644 --- a/src/util/reflect.hpp +++ b/src/util/reflect.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_REFLECT -#define HEADER_UTIL_REFLECT +#pragma once /** @file util/reflect.hpp * @@ -193,5 +192,3 @@ /// Declare a possible value of an enum under the given name #define VALUE_N(name, val) tag.handle(_(name), val, enum_) -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/regex.hpp b/src/util/regex.hpp index 37eae47b..6a7461eb 100644 --- a/src/util/regex.hpp +++ b/src/util/regex.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_REGEX -#define HEADER_UTIL_REGEX +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -177,5 +176,3 @@ #endif -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/rotation.hpp b/src/util/rotation.hpp index b1c95378..a8a005e9 100644 --- a/src/util/rotation.hpp +++ b/src/util/rotation.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_ROTATION -#define HEADER_UTIL_ROTATION +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -217,5 +216,3 @@ class RotatedDC : public Rotation { RenderQuality quality; ///< Quality of the text }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/smart_ptr.hpp b/src/util/smart_ptr.hpp index c1209d21..97b8c621 100644 --- a/src/util/smart_ptr.hpp +++ b/src/util/smart_ptr.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_SMART_PTR -#define HEADER_UTIL_SMART_PTR +#pragma once /** @file util/smart_ptr.hpp * @@ -62,5 +61,3 @@ class IntrusivePtrBaseWithDelete : public IntrusivePtrBase VoidP; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/spec_sort.hpp b/src/util/spec_sort.hpp index 2f7a31ce..a1b1fbe2 100644 --- a/src/util/spec_sort.hpp +++ b/src/util/spec_sort.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_SPEC_SORT -#define HEADER_UTIL_SPEC_SORT +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -44,5 +43,3 @@ */ String spec_sort(const String& spec, String input); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/spell_checker.hpp b/src/util/spell_checker.hpp index 2b0ce749..a6ee6b24 100644 --- a/src/util/spell_checker.hpp +++ b/src/util/spell_checker.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_SPELL_CHECKER -#define HEADER_UTIL_SPELL_CHECKER +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -52,5 +51,3 @@ class SpellChecker : public Hunspell, public IntrusivePtrBase { static map spellers; //< Cached checkers for each language }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/string.hpp b/src/util/string.hpp index 784216b9..52ff0cb2 100644 --- a/src/util/string.hpp +++ b/src/util/string.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_STRING -#define HEADER_UTIL_STRING +#pragma once /** @file util/string.hpp * @@ -227,5 +226,3 @@ String regex_escape(const String& s); /** Basicly replaces "(" with "(?:" */ String make_non_capturing(const String& re); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/tagged_string.hpp b/src/util/tagged_string.hpp index 717080b9..2c5034c9 100644 --- a/src/util/tagged_string.hpp +++ b/src/util/tagged_string.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_TAGGED_STRING -#define HEADER_UTIL_TAGGED_STRING +#pragma once /** @file util/tagged_string.hpp * @@ -218,5 +217,3 @@ String simplify_tagged_overlap(const String& str); /// Turn straight quotes into curly ones or vice-versa String curly_quotes(String str, bool curl); -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/vcs.hpp b/src/util/vcs.hpp index 826c0811..568fc20a 100644 --- a/src/util/vcs.hpp +++ b/src/util/vcs.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_IO_VCS -#define HEADER_UTIL_IO_VCS +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -45,5 +44,3 @@ class VCS : public IntrusivePtrVirtualBase DECLARE_REFLECTION_VIRTUAL(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/vcs/subversion.hpp b/src/util/vcs/subversion.hpp index a17ca4e9..95f4804f 100644 --- a/src/util/vcs/subversion.hpp +++ b/src/util/vcs/subversion.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_IO_SUBVERSION -#define HEADER_UTIL_IO_SUBVERSION +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -23,5 +22,3 @@ class SubversionVCS : public VCS { DECLARE_REFLECTION(); }; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/vector2d.hpp b/src/util/vector2d.hpp index 4d295ace..e583ef2a 100644 --- a/src/util/vector2d.hpp +++ b/src/util/vector2d.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_VECTOR2D -#define HEADER_UTIL_VECTOR2D +#pragma once // ----------------------------------------------------------------------------- : Includes @@ -163,7 +162,3 @@ inline Vector2D operator * (const Vector2D& a, const Matrix2D& m) { inline Matrix2D operator * (const Matrix2D& a, const Matrix2D& m) { return Matrix2D(a.mx * m, a.my * m); } - - -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/version.hpp b/src/util/version.hpp index beb796ea..baa36889 100644 --- a/src/util/version.hpp +++ b/src/util/version.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_VERSION -#define HEADER_UTIL_VERSION +#pragma once /** @file util/version.hpp * @@ -64,5 +63,3 @@ extern const Version file_version_symbol; extern const Version file_version_clipboard; extern const Version file_version_script; -// ----------------------------------------------------------------------------- : EOF -#endif diff --git a/src/util/window_id.hpp b/src/util/window_id.hpp index dc5fad01..289671d7 100644 --- a/src/util/window_id.hpp +++ b/src/util/window_id.hpp @@ -4,8 +4,7 @@ //| License: GNU General Public License 2 or later (see file COPYING) | //+----------------------------------------------------------------------------+ -#ifndef HEADER_UTIL_WINDOW_ID -#define HEADER_UTIL_WINDOW_ID +#pragma once /** @file util/window_id.hpp * @@ -288,5 +287,3 @@ enum ControlID { , ID_DEFAULTS }; -// ----------------------------------------------------------------------------- : EOF -#endif