Use nested namespace specifiers for skui::graphics.

skui-org · Oct 14, 2018 · b6c7f7e · b6c7f7e
1 parent 9b9949a
commit b6c7f7e
Show file tree

Hide file tree

Showing 48 changed files with 1,044 additions and 1,199 deletions.
diff --git a/graphics/canvas.c++ b/graphics/canvas.c++
@@ -31,14 +31,11 @@
 #include "graphics/shape/text.h++"
 #include "graphics/shape/rectangle.h++"
 
-namespace skui
+namespace skui::graphics
 {
-  namespace graphics
-  {
-    canvas::~canvas() = default;
+  canvas::~canvas() = default;
 
-    canvas::canvas(canvas_flags flags)
-      : flags{flags}
-    {}
-  }
+  canvas::canvas(canvas_flags flags)
+    : flags{flags}
+  {}
 }
diff --git a/graphics/canvas.h++ b/graphics/canvas.h++
@@ -39,54 +39,51 @@
 
 #include <optional>
 
-namespace skui
+namespace skui::graphics
 {
-  namespace graphics
-  {
-    class ellipse;
-    class path;
-    class rectangle;
-    class text;
+  class ellipse;
+  class path;
+  class rectangle;
+  class text;
 
-    enum class canvas_flag
-    {
-      none,
-      anti_alias
-    };
-    using canvas_flags = core::bitflag<canvas_flag>;
+  enum class canvas_flag
+  {
+    none,
+    anti_alias
+  };
+  using canvas_flags = core::bitflag<canvas_flag>;
 
-    class canvas
-    {
-    public:
-      virtual ~canvas() = 0;
+  class canvas
+  {
+  public:
+    virtual ~canvas() = 0;
 
-      // Primitives
-      virtual void draw(const style::fill& background,
-                        const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
-      virtual void draw(const rectangle& rectangle,
-                        const scalar_position& position,
-                        const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
-      virtual void draw(const ellipse& ellipse,
-                        const scalar_position& position,
-                        const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
-      virtual void draw(const text& text,
-                        const scalar_position& position,
-                        const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
-      virtual void draw(const path& path,
-                        const scalar_position& position,
-                        const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
+    // Primitives
+    virtual void draw(const style::fill& background,
+                      const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
+    virtual void draw(const rectangle& rectangle,
+                      const scalar_position& position,
+                      const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
+    virtual void draw(const ellipse& ellipse,
+                      const scalar_position& position,
+                      const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
+    virtual void draw(const text& text,
+                      const scalar_position& position,
+                      const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
+    virtual void draw(const path& path,
+                      const scalar_position& position,
+                      const std::optional<scalar_bounding_box>& clipping_box = {}) = 0;
 
-      // text size needs knowledge of underlying graphics system exposed through canvas
-      virtual scalar_size measure_text(const text& text) const = 0;
+    // text size needs knowledge of underlying graphics system exposed through canvas
+    virtual scalar_size measure_text(const text& text) const = 0;
 
-     style::fill background = graphics::colors::white;
+    style::fill background = graphics::colors::white;
 
-    protected:
-      canvas(canvas_flags flags);
+  protected:
+    canvas(canvas_flags flags);
 
-      canvas_flags flags;
-    };
-  }
+    canvas_flags flags;
+  };
 }
 
 #endif