From 5c2028db24943332f7707fc7f2d026fe027d957e Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 6 Feb 2020 14:35:06 +0100 Subject: [PATCH] LibGfx: Unpublish FloatSize from the global namespace --- Libraries/LibGfx/FloatSize.h | 2 -- Libraries/LibHTML/Layout/LayoutBox.h | 2 +- Libraries/LibHTML/Layout/LayoutWidget.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Libraries/LibGfx/FloatSize.h b/Libraries/LibGfx/FloatSize.h index 90d4167538..b58a8df84b 100644 --- a/Libraries/LibGfx/FloatSize.h +++ b/Libraries/LibGfx/FloatSize.h @@ -115,5 +115,3 @@ inline const LogStream& operator<<(const LogStream& stream, const FloatSize& val } } - -using Gfx::FloatSize; diff --git a/Libraries/LibHTML/Layout/LayoutBox.h b/Libraries/LibHTML/Layout/LayoutBox.h index ccd2c91095..78d617f859 100644 --- a/Libraries/LibHTML/Layout/LayoutBox.h +++ b/Libraries/LibHTML/Layout/LayoutBox.h @@ -39,7 +39,7 @@ public: float y() const { return rect().y(); } float width() const { return rect().width(); } float height() const { return rect().height(); } - FloatSize size() const { return rect().size(); } + Gfx::FloatSize size() const { return rect().size(); } FloatPoint position() const { return rect().location(); } virtual HitTestResult hit_test(const Gfx::Point& position) const override; diff --git a/Libraries/LibHTML/Layout/LayoutWidget.cpp b/Libraries/LibHTML/Layout/LayoutWidget.cpp index 1c5c3ef530..4ef901bc70 100644 --- a/Libraries/LibHTML/Layout/LayoutWidget.cpp +++ b/Libraries/LibHTML/Layout/LayoutWidget.cpp @@ -43,7 +43,7 @@ LayoutWidget::~LayoutWidget() void LayoutWidget::layout() { - rect().set_size(FloatSize(widget().width(), widget().height())); + rect().set_size(widget().width(), widget().height()); LayoutReplaced::layout(); widget().move_to(rect().x(), rect().y()); }