Index: ps/trunk/source/gui/CGUIColor.h =================================================================== --- ps/trunk/source/gui/CGUIColor.h (revision 22635) +++ ps/trunk/source/gui/CGUIColor.h (revision 22636) @@ -1,45 +1,39 @@ /* Copyright (C) 2019 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * 0 A.D. is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with 0 A.D. If not, see . */ #ifndef INCLUDED_GUICOLOR #define INCLUDED_GUICOLOR #include "graphics/Color.h" #include "gui/GUIManager.h" /** * Same as the CColor class, but this one can also parse colors predefined in the GUI page (such as "yellow"). */ struct CGUIColor : CColor { - CGUIColor() - { - CColor(); - } + CGUIColor() : CColor() {} - CGUIColor(float r, float g, float b, float a) - { - CColor(r, g, b, a); - } + CGUIColor(float r, float g, float b, float a) : CColor(r, g, b, a) {} bool ParseString(const CStr& value, int defaultAlpha = 255) { return g_GUI->GetPreDefinedColor(value, *this) || CColor::ParseString(value, defaultAlpha); } }; #endif // INCLUDED_GUICOLOR