RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:17:34 +00:00
Code Issues Activity Actions

LibGUI: Put all classes in the GUI namespace and remove the leading G

Browse source 
This took me a moment. Welcome to the new world of GUI::Widget! :^)
This commit is contained in:
Andreas Kling 2020-02-02 15:07:41 +01:00
parent 2d39da5405
commit c5bd9d4ed1
337 changed files with 5400 additions and 4816 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Games/Minesweeper/Field.h
View file

@ -30,9 +30,12 @@
#include <LibCore/CTimer.h>
#include <LibGUI/GFrame.h>
namespace GUI {
class Button;
class Label;
}
class Field;
class GButton;
class GLabel;
class SquareButton;
class SquareLabel;
@ -57,12 +60,12 @@ public:
void for_each_neighbor(Callback);
};
class Field final : public GFrame {
class Field final : public GUI::Frame {
C_OBJECT(Field)
friend class Square;
friend class SquareLabel;
public:
Field(GLabel& flag_label, GLabel& time_label, GButton& face_button, GWidget* parent, Function<void(Size)> on_size_changed);
Field(GUI::Label& flag_label, GUI::Label& time_label, GUI::Button& face_button, GUI::Widget* parent, Function<void(Size)> on_size_changed);
virtual ~Field() override;
int rows() const { return m_rows; }
@ -77,7 +80,7 @@ public:
void reset();
private:
virtual void paint_event(GPaintEvent&) override;
virtual void paint_event(GUI::PaintEvent&) override;
void on_square_clicked(Square&);
void on_square_right_clicked(Square&);
@ -118,9 +121,9 @@ private:
RefPtr<GraphicsBitmap> m_good_face_bitmap;
RefPtr<GraphicsBitmap> m_bad_face_bitmap;
RefPtr<GraphicsBitmap> m_number_bitmap[8];
GButton& m_face_button;
GLabel& m_flag_label;
GLabel& m_time_label;
GUI::Button& m_face_button;
GUI::Label& m_flag_label;
GUI::Label& m_time_label;
RefPtr<Core::Timer> m_timer;
int m_time_elapsed { 0 };
int m_flags_left { 0 };