From 6210e0d85c9191e3c88183d8aa4cc888a3c4d6a7 Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 30 Sep 2015 16:45:04 -0300 Subject: [PATCH] Change she::Capabilities to a enum class --- src/she/alleg4/she.cpp | 2 +- src/she/capabilities.h | 10 +++++----- src/she/skia/skia_system.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/she/alleg4/she.cpp b/src/she/alleg4/she.cpp index 7727cdc56..5a0506de4 100644 --- a/src/she/alleg4/she.cpp +++ b/src/she/alleg4/she.cpp @@ -148,7 +148,7 @@ public: } Capabilities capabilities() const override { - return (Capabilities)(kCanResizeDisplayCapability); + return (Capabilities)(Capabilities::CanResizeDisplay); } EventQueue* eventQueue() override { // TODO remove this function diff --git a/src/she/capabilities.h b/src/she/capabilities.h index d74aaca29..cb66ef81f 100644 --- a/src/she/capabilities.h +++ b/src/she/capabilities.h @@ -1,5 +1,5 @@ // SHE library -// Copyright (C) 2012-2013 David Capello +// Copyright (C) 2012-2013, 2015 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -10,10 +10,10 @@ namespace she { - enum Capabilities { - kMultipleDisplaysCapability = 1, - kCanResizeDisplayCapability = 2, - kDisplayScaleCapability = 4, + enum class Capabilities { + MultipleDisplays = 1, + CanResizeDisplay = 2, + DisplayScale = 4, }; } // namespace she diff --git a/src/she/skia/skia_system.h b/src/she/skia/skia_system.h index a8426a19d..b378ce767 100644 --- a/src/she/skia/skia_system.h +++ b/src/she/skia/skia_system.h @@ -46,9 +46,9 @@ public: Capabilities capabilities() const override { return Capabilities( - int(kMultipleDisplaysCapability) | - int(kCanResizeDisplayCapability) | - int(kDisplayScaleCapability)); + int(Capabilities::MultipleDisplays) | + int(Capabilities::CanResizeDisplay) | + int(Capabilities::DisplayScale)); } EventQueue* eventQueue() override {