mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 10:47:35 +00:00
Userland: Rename Core::Object to Core::EventReceiver
This is a more precise description of what this class actually does.
This commit is contained in:
parent
bdf696e488
commit
ddbe6bd7b4
128 changed files with 399 additions and 401 deletions
|
@ -11,7 +11,7 @@
|
|||
|
||||
namespace WindowServer {
|
||||
|
||||
class AppletManager : public Core::Object {
|
||||
class AppletManager : public Core::EventReceiver {
|
||||
C_OBJECT(AppletManager)
|
||||
public:
|
||||
~AppletManager() = default;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include <AK/OwnPtr.h>
|
||||
#include <AK/RefPtr.h>
|
||||
#include <LibCore/Object.h>
|
||||
#include <LibCore/EventReceiver.h>
|
||||
#include <LibGfx/Color.h>
|
||||
#include <LibGfx/DisjointRectSet.h>
|
||||
#include <LibGfx/Font/Font.h>
|
||||
|
@ -87,7 +87,7 @@ struct CompositorScreenData {
|
|||
}
|
||||
};
|
||||
|
||||
class Compositor final : public Core::Object {
|
||||
class Compositor final : public Core::EventReceiver {
|
||||
C_OBJECT(Compositor)
|
||||
friend struct CompositorScreenData;
|
||||
friend class Overlay;
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include <AK/Optional.h>
|
||||
#include <AK/OwnPtr.h>
|
||||
#include <AK/WeakPtr.h>
|
||||
#include <LibCore/Object.h>
|
||||
#include <LibCore/EventReceiver.h>
|
||||
#include <LibGfx/Bitmap.h>
|
||||
#include <LibGfx/Rect.h>
|
||||
#include <LibIPC/ConnectionFromClient.h>
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <AK/WeakPtr.h>
|
||||
#include <LibCore/EventReceiver.h>
|
||||
#include <LibCore/FileWatcher.h>
|
||||
#include <LibCore/Object.h>
|
||||
#include <LibKeyboard/CharacterMap.h>
|
||||
#include <WindowServer/WMConnectionFromClient.h>
|
||||
|
||||
namespace WindowServer {
|
||||
|
||||
class KeymapSwitcher final : public Core::Object {
|
||||
class KeymapSwitcher final : public Core::EventReceiver {
|
||||
C_OBJECT(KeymapSwitcher)
|
||||
public:
|
||||
virtual ~KeymapSwitcher() override = default;
|
||||
|
|
|
@ -39,7 +39,7 @@ u32 find_ampersand_shortcut_character(StringView string)
|
|||
}
|
||||
|
||||
Menu::Menu(ConnectionFromClient* client, int menu_id, String name)
|
||||
: Core::Object(client)
|
||||
: Core::EventReceiver(client)
|
||||
, m_client(client)
|
||||
, m_menu_id(menu_id)
|
||||
, m_name(move(name))
|
||||
|
@ -491,7 +491,7 @@ void Menu::event(Core::Event& event)
|
|||
return;
|
||||
}
|
||||
}
|
||||
Core::Object::event(event);
|
||||
Core::EventReceiver::event(event);
|
||||
}
|
||||
|
||||
void Menu::clear_hovered_item()
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/WeakPtr.h>
|
||||
#include <LibCore/Object.h>
|
||||
#include <LibCore/EventReceiver.h>
|
||||
#include <LibGfx/Font/Font.h>
|
||||
#include <LibGfx/Font/FontDatabase.h>
|
||||
#include <LibGfx/Forward.h>
|
||||
|
@ -23,7 +23,7 @@ class ConnectionFromClient;
|
|||
class Menubar;
|
||||
class Window;
|
||||
|
||||
class Menu final : public Core::Object {
|
||||
class Menu final : public Core::EventReceiver {
|
||||
C_OBJECT(Menu);
|
||||
|
||||
public:
|
||||
|
|
|
@ -149,7 +149,7 @@ void MenuManager::event(Core::Event& event)
|
|||
}
|
||||
}
|
||||
|
||||
return Core::Object::event(event);
|
||||
return Core::EventReceiver::event(event);
|
||||
}
|
||||
|
||||
void MenuManager::handle_mouse_event(MouseEvent& mouse_event)
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
namespace WindowServer {
|
||||
|
||||
class MenuManager final : public Core::Object {
|
||||
class MenuManager final : public Core::EventReceiver {
|
||||
C_OBJECT(MenuManager);
|
||||
|
||||
public:
|
||||
|
|
|
@ -84,8 +84,8 @@ static Gfx::Bitmap& move_icon()
|
|||
return *s_icon;
|
||||
}
|
||||
|
||||
Window::Window(Core::Object& parent, WindowType type)
|
||||
: Core::Object(&parent)
|
||||
Window::Window(Core::EventReceiver& parent, WindowType type)
|
||||
: Core::EventReceiver(&parent)
|
||||
, m_type(type)
|
||||
, m_icon(default_window_icon())
|
||||
, m_frame(*this)
|
||||
|
@ -95,7 +95,7 @@ Window::Window(Core::Object& parent, WindowType type)
|
|||
}
|
||||
|
||||
Window::Window(ConnectionFromClient& client, WindowType window_type, WindowMode window_mode, int window_id, bool minimizable, bool closeable, bool frameless, bool resizable, bool fullscreen, Window* parent_window)
|
||||
: Core::Object(&client)
|
||||
: Core::EventReceiver(&client)
|
||||
, m_client(&client)
|
||||
, m_type(window_type)
|
||||
, m_mode(window_mode)
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/IntrusiveList.h>
|
||||
#include <AK/WeakPtr.h>
|
||||
#include <LibCore/Object.h>
|
||||
#include <LibCore/EventReceiver.h>
|
||||
#include <LibGfx/Bitmap.h>
|
||||
#include <LibGfx/DisjointRectSet.h>
|
||||
#include <LibGfx/Rect.h>
|
||||
|
@ -81,7 +81,7 @@ enum class WindowMinimizedState : u32 {
|
|||
Hidden,
|
||||
};
|
||||
|
||||
class Window final : public Core::Object {
|
||||
class Window final : public Core::EventReceiver {
|
||||
C_OBJECT(Window);
|
||||
|
||||
public:
|
||||
|
@ -375,7 +375,7 @@ public:
|
|||
|
||||
private:
|
||||
Window(ConnectionFromClient&, WindowType, WindowMode, int window_id, bool minimizable, bool closeable, bool frameless, bool resizable, bool fullscreen, Window* parent_window = nullptr);
|
||||
Window(Core::Object&, WindowType);
|
||||
Window(Core::EventReceiver&, WindowType);
|
||||
|
||||
virtual void event(Core::Event&) override;
|
||||
void handle_mouse_event(MouseEvent const&);
|
||||
|
|
|
@ -1559,7 +1559,7 @@ void WindowManager::event(Core::Event& event)
|
|||
return;
|
||||
}
|
||||
|
||||
Core::Object::event(event);
|
||||
Core::EventReceiver::event(event);
|
||||
}
|
||||
|
||||
bool WindowManager::is_window_in_modal_chain(Window& chain_window, Window& other_window)
|
||||
|
|
|
@ -45,7 +45,7 @@ class DndOverlay;
|
|||
class WindowGeometryOverlay;
|
||||
class TileWindowOverlay;
|
||||
|
||||
class WindowManager : public Core::Object {
|
||||
class WindowManager : public Core::EventReceiver {
|
||||
C_OBJECT(WindowManager)
|
||||
|
||||
friend class Compositor;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include <AK/Vector.h>
|
||||
#include <AK/WeakPtr.h>
|
||||
#include <LibCore/Object.h>
|
||||
#include <LibCore/EventReceiver.h>
|
||||
#include <LibGfx/Forward.h>
|
||||
#include <LibGfx/Rect.h>
|
||||
|
||||
|
@ -17,7 +17,7 @@ namespace WindowServer {
|
|||
class KeyEvent;
|
||||
class Window;
|
||||
|
||||
class WindowSwitcher final : public Core::Object {
|
||||
class WindowSwitcher final : public Core::EventReceiver {
|
||||
C_OBJECT(WindowSwitcher)
|
||||
public:
|
||||
enum class Mode {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue