diff --git a/specter/include/specter/Button.hpp b/specter/include/specter/Button.hpp index 61bd38c6d..620ea588e 100644 --- a/specter/include/specter/Button.hpp +++ b/specter/include/specter/Button.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_BUTTON_HPP -#define SPECTER_BUTTON_HPP +#pragma once #include "specter/TextView.hpp" #include "specter/Control.hpp" @@ -132,4 +131,3 @@ public: } -#endif // SPECTER_BUTTON_HPP diff --git a/specter/include/specter/Control.hpp b/specter/include/specter/Control.hpp index e9f861bc8..b05b488e1 100644 --- a/specter/include/specter/Control.hpp +++ b/specter/include/specter/Control.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_CONTROL_HPP -#define SPECTER_CONTROL_HPP +#pragma once #include "View.hpp" @@ -119,4 +118,3 @@ public: } -#endif // SPECTER_CONTROL_HPP diff --git a/specter/include/specter/FileBrowser.hpp b/specter/include/specter/FileBrowser.hpp index 7bd7c30eb..6a667fdd7 100644 --- a/specter/include/specter/FileBrowser.hpp +++ b/specter/include/specter/FileBrowser.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_FILEBROWSER_HPP -#define SPECTER_FILEBROWSER_HPP +#pragma once #include "View.hpp" #include "ModalWindow.hpp" @@ -353,4 +352,3 @@ public: } -#endif // SPECTER_FILEBROWSER_HPP diff --git a/specter/include/specter/FontCache.hpp b/specter/include/specter/FontCache.hpp index b19263d0b..f168b8f74 100644 --- a/specter/include/specter/FontCache.hpp +++ b/specter/include/specter/FontCache.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_FONTCACHE_HPP -#define SPECTER_FONTCACHE_HPP +#pragma once #include #include FT_FREETYPE_H @@ -201,4 +200,3 @@ public: } -#endif // SPECTER_FONTCACHE_HPP diff --git a/specter/include/specter/IMenuNode.hpp b/specter/include/specter/IMenuNode.hpp index b68bd51a3..cb944a77a 100644 --- a/specter/include/specter/IMenuNode.hpp +++ b/specter/include/specter/IMenuNode.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_IMENUNODE_HPP -#define SPECTER_IMENUNODE_HPP +#pragma once #include "View.hpp" @@ -17,4 +16,3 @@ struct IMenuNode } -#endif // SPECTER_IMENUNODE_HPP diff --git a/specter/include/specter/IViewManager.hpp b/specter/include/specter/IViewManager.hpp index 05831c406..ea25166d4 100644 --- a/specter/include/specter/IViewManager.hpp +++ b/specter/include/specter/IViewManager.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_IVIEWMANAGER_HPP -#define SPECTER_IVIEWMANAGER_HPP +#pragma once #include "Translator.hpp" #include "SplitView.hpp" @@ -33,4 +32,3 @@ public: } -#endif // SPECTER_IVIEWMANAGER_HPP diff --git a/specter/include/specter/Icon.hpp b/specter/include/specter/Icon.hpp index bebb20b1e..c0e09bf28 100644 --- a/specter/include/specter/Icon.hpp +++ b/specter/include/specter/Icon.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_ICON_HPP -#define SPECTER_ICON_HPP +#pragma once #include "View.hpp" @@ -71,4 +70,3 @@ public: } -#endif // SPECTER_ICON_HPP diff --git a/specter/include/specter/Menu.hpp b/specter/include/specter/Menu.hpp index 76c385970..3da9512e0 100644 --- a/specter/include/specter/Menu.hpp +++ b/specter/include/specter/Menu.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_MENU_HPP -#define SPECTER_MENU_HPP +#pragma once #include "View.hpp" #include "TextView.hpp" @@ -92,4 +91,3 @@ public: } -#endif // SPECTER_MENU_HPP diff --git a/specter/include/specter/MessageWindow.hpp b/specter/include/specter/MessageWindow.hpp index 010e7976a..671e112f7 100644 --- a/specter/include/specter/MessageWindow.hpp +++ b/specter/include/specter/MessageWindow.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_MESSAGEWINDOW_HPP -#define SPECTER_MESSAGEWINDOW_HPP +#pragma once #include "ModalWindow.hpp" #include "MultiLineTextView.hpp" @@ -75,4 +74,3 @@ public: } -#endif // SPECTER_MESSAGEWINDOW_HPP diff --git a/specter/include/specter/ModalWindow.hpp b/specter/include/specter/ModalWindow.hpp index 2810a0e67..eed42dc8b 100644 --- a/specter/include/specter/ModalWindow.hpp +++ b/specter/include/specter/ModalWindow.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_MODAL_WINDOW_HPP -#define SPECTER_MODAL_WINDOW_HPP +#pragma once #include #include @@ -83,4 +82,3 @@ public: } -#endif // SPECTER_MODAL_WINDOW_HPP diff --git a/specter/include/specter/MultiLineTextView.hpp b/specter/include/specter/MultiLineTextView.hpp index 830fc1f04..91fe3bf8c 100644 --- a/specter/include/specter/MultiLineTextView.hpp +++ b/specter/include/specter/MultiLineTextView.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_MULTILINETEXTVIEW_HPP -#define SPECTER_MULTILINETEXTVIEW_HPP +#pragma once #include "View.hpp" #include "TextView.hpp" @@ -52,4 +51,3 @@ public: } -#endif // SPECTER_MULTILINETEXTVIEW_HPP diff --git a/specter/include/specter/Node.hpp b/specter/include/specter/Node.hpp index 04aa43777..3f59c932d 100644 --- a/specter/include/specter/Node.hpp +++ b/specter/include/specter/Node.hpp @@ -1,4 +1,2 @@ -#ifndef SPECTER_NODE_HPP -#define SPECTER_NODE_HPP +#pragma once -#endif // SPECTER_NODE_HPP diff --git a/specter/include/specter/NodeSocket.hpp b/specter/include/specter/NodeSocket.hpp index 51cff7ddb..3f59c932d 100644 --- a/specter/include/specter/NodeSocket.hpp +++ b/specter/include/specter/NodeSocket.hpp @@ -1,4 +1,2 @@ -#ifndef SPECTER_NODESOCKET_HPP -#define SPECTER_NODESOCKET_HPP +#pragma once -#endif // SPECTER_NODESOCKET_HPP diff --git a/specter/include/specter/NumericField.hpp b/specter/include/specter/NumericField.hpp index 194fb015a..c80a545a5 100644 --- a/specter/include/specter/NumericField.hpp +++ b/specter/include/specter/NumericField.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_NUMERICFIELD_HPP -#define SPECTER_NUMERICFIELD_HPP +#pragma once #include "specter/TextView.hpp" @@ -51,4 +50,3 @@ public: } -#endif // SPECTER_NUMERICFIELD_HPP diff --git a/specter/include/specter/Outliner.hpp b/specter/include/specter/Outliner.hpp index c8d83759c..31eea727c 100644 --- a/specter/include/specter/Outliner.hpp +++ b/specter/include/specter/Outliner.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_OUTLINER_HPP -#define SPECTER_OUTLINER_HPP +#pragma once namespace specter { @@ -41,4 +40,3 @@ class Outliner }; } -#endif // SPECTER_OUTLINER_HPP \ No newline at end of file diff --git a/specter/include/specter/Panel.hpp b/specter/include/specter/Panel.hpp index 1dfa6a358..3f59c932d 100644 --- a/specter/include/specter/Panel.hpp +++ b/specter/include/specter/Panel.hpp @@ -1,4 +1,2 @@ -#ifndef SPECTER_PANEL_HPP -#define SPECTER_PANEL_HPP +#pragma once -#endif // SPECTER_PANEL_HPP diff --git a/specter/include/specter/PathButtons.hpp b/specter/include/specter/PathButtons.hpp index 2036cbe0a..4df1465ab 100644 --- a/specter/include/specter/PathButtons.hpp +++ b/specter/include/specter/PathButtons.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_PATHBUTTONS_HPP -#define SPECTER_PATHBUTTONS_HPP +#pragma once #include "Button.hpp" #include "ScrollView.hpp" @@ -75,4 +74,3 @@ public: } -#endif // SPECTER_PATHBUTTONS_HPP diff --git a/specter/include/specter/RootView.hpp b/specter/include/specter/RootView.hpp index 2d7a985d1..0d90db5d1 100644 --- a/specter/include/specter/RootView.hpp +++ b/specter/include/specter/RootView.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_ROOTVIEW_HPP -#define SPECTER_ROOTVIEW_HPP +#pragma once #include "View.hpp" #include "ViewResources.hpp" @@ -252,4 +251,3 @@ private: } -#endif // SPECTER_ROOTVIEW_HPP diff --git a/specter/include/specter/ScrollView.hpp b/specter/include/specter/ScrollView.hpp index 311b6d88b..9a5258d7c 100644 --- a/specter/include/specter/ScrollView.hpp +++ b/specter/include/specter/ScrollView.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_SCROLLVIEW_HPP -#define SPECTER_SCROLLVIEW_HPP +#pragma once #include "Button.hpp" #include "IViewManager.hpp" @@ -99,4 +98,3 @@ public: } -#endif // SPECTER_SCROLLVIEW_HPP diff --git a/specter/include/specter/Space.hpp b/specter/include/specter/Space.hpp index d3af85ddd..ec171fcb1 100644 --- a/specter/include/specter/Space.hpp +++ b/specter/include/specter/Space.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_SPACE_HPP -#define SPECTER_SPACE_HPP +#pragma once #include "View.hpp" #include "Toolbar.hpp" @@ -81,4 +80,3 @@ inline Space* View::castToSpace() { return isSpace() ? static_cast(this) } -#endif // SPECTER_SPACE_HPP diff --git a/specter/include/specter/SplitView.hpp b/specter/include/specter/SplitView.hpp index 1ce93961f..061790392 100644 --- a/specter/include/specter/SplitView.hpp +++ b/specter/include/specter/SplitView.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_SPLITVIEW_HPP -#define SPECTER_SPLITVIEW_HPP +#pragma once #include "specter/View.hpp" @@ -119,4 +118,3 @@ inline SplitView* View::castToSplitView() { return isSplitView() ? static_cast #include @@ -33,4 +32,3 @@ public: } -#endif // SPECTER_TRANSLATOR_HPP diff --git a/specter/include/specter/View.hpp b/specter/include/specter/View.hpp index ed2f39c7b..250df89cb 100644 --- a/specter/include/specter/View.hpp +++ b/specter/include/specter/View.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_VIEW_HPP -#define SPECTER_VIEW_HPP +#pragma once #include "boo/boo.hpp" #include "optional.hpp" @@ -394,4 +393,3 @@ struct ScissorViewChild : ViewChild } -#endif // SPECTER_VIEW_HPP diff --git a/specter/include/specter/ViewResources.hpp b/specter/include/specter/ViewResources.hpp index 03055ec01..c1b8987a6 100644 --- a/specter/include/specter/ViewResources.hpp +++ b/specter/include/specter/ViewResources.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_VIEWRESOURCES_HPP -#define SPECTER_VIEWRESOURCES_HPP +#pragma once #include "TextView.hpp" #include "SplitView.hpp" @@ -218,4 +217,3 @@ public: }; } // namespace specter -#endif // SPECTER_VIEWRESOURCES_HPP diff --git a/specter/include/specter/genie.hpp b/specter/include/specter/genie.hpp index 2693cbe47..b1fd4f7ab 100644 --- a/specter/include/specter/genie.hpp +++ b/specter/include/specter/genie.hpp @@ -1,5 +1,4 @@ -#ifndef __SPECTER_GENIE_HPP__ -#define __SPECTER_GENIE_HPP__ +#pragma once #if __specter__ #define SPECTER_PROPERTY(n, d) \ @@ -12,4 +11,3 @@ #endif -#endif //__SPECTER_GENIE_HPP__ diff --git a/specter/include/specter/specter.hpp b/specter/include/specter/specter.hpp index cdac5e727..f2ec2fff6 100644 --- a/specter/include/specter/specter.hpp +++ b/specter/include/specter/specter.hpp @@ -1,5 +1,4 @@ -#ifndef SPECTER_HPP -#define SPECTER_HPP +#pragma once #include "View.hpp" #include "RootView.hpp" @@ -18,4 +17,3 @@ #include "FontCache.hpp" #include "ViewResources.hpp" -#endif // SPECTER_HPP diff --git a/specter/zeus b/specter/zeus index 11cd08a30..20603da60 160000 --- a/specter/zeus +++ b/specter/zeus @@ -1 +1 @@ -Subproject commit 11cd08a30a676f3a18a8ab4d586a6bf9c31f1976 +Subproject commit 20603da60d9f3b9adada4f0ccc81e2fc9a27828c