diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-11-08 11:39:45 +0100 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-11-08 11:40:25 +0100 |
commit | 8a024a33053cc7c54e9ea365b4538b88e1e1898f (patch) | |
tree | a7f9e99e756ec8d0eeecc8342e52c97181347016 /Libraries | |
parent | 69883bea6f0b447b3abfd63bc7289ced87526675 (diff) | |
download | serenity-8a024a33053cc7c54e9ea365b4538b88e1e1898f.zip |
LibGUI: Rename GEventLoop.{cpp,h} => GWindowServerConnection
The GEventLoop class is long gone, and the only class in these files is
GWindowServerConnection, so let's update the file names. :^)
Diffstat (limited to 'Libraries')
-rw-r--r-- | Libraries/LibGUI/GApplication.cpp | 2 | ||||
-rw-r--r-- | Libraries/LibGUI/GClipboard.cpp | 2 | ||||
-rw-r--r-- | Libraries/LibGUI/GDesktop.cpp | 2 | ||||
-rw-r--r-- | Libraries/LibGUI/GMenu.cpp | 4 | ||||
-rw-r--r-- | Libraries/LibGUI/GMenuBar.cpp | 2 | ||||
-rw-r--r-- | Libraries/LibGUI/GMenuItem.cpp | 2 | ||||
-rw-r--r-- | Libraries/LibGUI/GWidget.cpp | 10 | ||||
-rw-r--r-- | Libraries/LibGUI/GWindow.cpp | 2 | ||||
-rw-r--r-- | Libraries/LibGUI/GWindowServerConnection.cpp (renamed from Libraries/LibGUI/GEventLoop.cpp) | 6 | ||||
-rw-r--r-- | Libraries/LibGUI/GWindowServerConnection.h (renamed from Libraries/LibGUI/GEventLoop.h) | 0 | ||||
-rw-r--r-- | Libraries/LibGUI/Makefile | 2 |
11 files changed, 17 insertions, 17 deletions
diff --git a/Libraries/LibGUI/GApplication.cpp b/Libraries/LibGUI/GApplication.cpp index 9bdd7af840..e3f9610c83 100644 --- a/Libraries/LibGUI/GApplication.cpp +++ b/Libraries/LibGUI/GApplication.cpp @@ -1,10 +1,10 @@ #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> -#include <LibGUI/GEventLoop.h> #include <LibGUI/GLabel.h> #include <LibGUI/GMenuBar.h> #include <LibGUI/GPainter.h> #include <LibGUI/GWindow.h> +#include <LibGUI/GWindowServerConnection.h> #include <WindowServer/WSAPITypes.h> static GApplication* s_the; diff --git a/Libraries/LibGUI/GClipboard.cpp b/Libraries/LibGUI/GClipboard.cpp index cfb8d29c23..dde06f8aa1 100644 --- a/Libraries/LibGUI/GClipboard.cpp +++ b/Libraries/LibGUI/GClipboard.cpp @@ -1,6 +1,6 @@ #include <LibC/SharedBuffer.h> #include <LibGUI/GClipboard.h> -#include <LibGUI/GEventLoop.h> +#include <LibGUI/GWindowServerConnection.h> #include <WindowServer/WSAPITypes.h> GClipboard& GClipboard::the() diff --git a/Libraries/LibGUI/GDesktop.cpp b/Libraries/LibGUI/GDesktop.cpp index 60d286550d..d4ae3a93de 100644 --- a/Libraries/LibGUI/GDesktop.cpp +++ b/Libraries/LibGUI/GDesktop.cpp @@ -1,5 +1,5 @@ #include <LibGUI/GDesktop.h> -#include <LibGUI/GEventLoop.h> +#include <LibGUI/GWindowServerConnection.h> #include <string.h> #include <unistd.h> diff --git a/Libraries/LibGUI/GMenu.cpp b/Libraries/LibGUI/GMenu.cpp index c24dd888d6..6a90a55ddd 100644 --- a/Libraries/LibGUI/GMenu.cpp +++ b/Libraries/LibGUI/GMenu.cpp @@ -1,7 +1,7 @@ #include <AK/HashMap.h> #include <LibGUI/GAction.h> -#include <LibGUI/GEventLoop.h> #include <LibGUI/GMenu.h> +#include <LibGUI/GWindowServerConnection.h> //#define GMENU_DEBUG @@ -113,7 +113,7 @@ int GMenu::realize_menu() request.menu.enabled = true; request.menu.checkable = false; request.menu.checked = false; - + // no shortcut on submenu, make sure this is cleared out request.menu.shortcut_text_length = 0; strcpy(request.menu.shortcut_text, "\0"); diff --git a/Libraries/LibGUI/GMenuBar.cpp b/Libraries/LibGUI/GMenuBar.cpp index a48e094a11..a3a37a66a5 100644 --- a/Libraries/LibGUI/GMenuBar.cpp +++ b/Libraries/LibGUI/GMenuBar.cpp @@ -1,5 +1,5 @@ -#include <LibGUI/GEventLoop.h> #include <LibGUI/GMenuBar.h> +#include <LibGUI/GWindowServerConnection.h> GMenuBar::GMenuBar() { diff --git a/Libraries/LibGUI/GMenuItem.cpp b/Libraries/LibGUI/GMenuItem.cpp index 2da0200ca3..970a1b59f8 100644 --- a/Libraries/LibGUI/GMenuItem.cpp +++ b/Libraries/LibGUI/GMenuItem.cpp @@ -1,7 +1,7 @@ #include <LibGUI/GAction.h> -#include <LibGUI/GEventLoop.h> #include <LibGUI/GMenu.h> #include <LibGUI/GMenuItem.h> +#include <LibGUI/GWindowServerConnection.h> #include <WindowServer/WSAPITypes.h> GMenuItem::GMenuItem(unsigned menu_id, Type type) diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/GWidget.cpp index 56d9137339..4e7eff78df 100644 --- a/Libraries/LibGUI/GWidget.cpp +++ b/Libraries/LibGUI/GWidget.cpp @@ -1,15 +1,15 @@ -#include "GWidget.h" -#include "GEvent.h" -#include "GEventLoop.h" -#include "GWindow.h" #include <AK/Assertions.h> #include <AK/JsonObject.h> +#include <LibDraw/GraphicsBitmap.h> #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> +#include <LibGUI/GEvent.h> #include <LibGUI/GLayout.h> #include <LibGUI/GMenu.h> #include <LibGUI/GPainter.h> -#include <LibDraw/GraphicsBitmap.h> +#include <LibGUI/GWidget.h> +#include <LibGUI/GWindow.h> +#include <LibGUI/GWindowServerConnection.h> #include <unistd.h> GWidget::GWidget(GWidget* parent) diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp index bd03ef61d3..3352cbf545 100644 --- a/Libraries/LibGUI/GWindow.cpp +++ b/Libraries/LibGUI/GWindow.cpp @@ -8,10 +8,10 @@ #include <LibDraw/GraphicsBitmap.h> #include <LibGUI/GApplication.h> #include <LibGUI/GEvent.h> -#include <LibGUI/GEventLoop.h> #include <LibGUI/GPainter.h> #include <LibGUI/GWidget.h> #include <LibGUI/GWindow.h> +#include <LibGUI/GWindowServerConnection.h> //#define UPDATE_COALESCING_DEBUG diff --git a/Libraries/LibGUI/GEventLoop.cpp b/Libraries/LibGUI/GWindowServerConnection.cpp index 2736a2a3ad..7e60155e7a 100644 --- a/Libraries/LibGUI/GEventLoop.cpp +++ b/Libraries/LibGUI/GWindowServerConnection.cpp @@ -1,6 +1,3 @@ -#include "GEventLoop.h" -#include "GEvent.h" -#include "GWindow.h" #include <LibC/errno.h> #include <LibC/fcntl.h> #include <LibC/stdio.h> @@ -17,8 +14,11 @@ #include <LibGUI/GApplication.h> #include <LibGUI/GClipboard.h> #include <LibGUI/GDesktop.h> +#include <LibGUI/GEvent.h> #include <LibGUI/GMenu.h> #include <LibGUI/GWidget.h> +#include <LibGUI/GWindow.h> +#include <LibGUI/GWindowServerConnection.h> #include <sys/uio.h> //#define GEVENTLOOP_DEBUG diff --git a/Libraries/LibGUI/GEventLoop.h b/Libraries/LibGUI/GWindowServerConnection.h index 522dcb9bcd..522dcb9bcd 100644 --- a/Libraries/LibGUI/GEventLoop.h +++ b/Libraries/LibGUI/GWindowServerConnection.h diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile index 28921c6c7f..ac082da414 100644 --- a/Libraries/LibGUI/Makefile +++ b/Libraries/LibGUI/Makefile @@ -4,7 +4,7 @@ OBJS = \ GPainter.o \ GButton.o \ GCheckBox.o \ - GEventLoop.o \ + GWindowServerConnection.o \ GLabel.o \ GTextBox.o \ GScrollBar.o \ |