diff options
author | Andreas Kling <kling@serenityos.org> | 2021-04-13 16:18:20 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-04-13 16:58:15 +0200 |
commit | a2baab38fd58e18f690e2256b0a5081580c05968 (patch) | |
tree | ee4585bda0e59a1727f10b1203e540e44a2edafb /Userland/Games | |
parent | 86bdfa1edf21293e2c0f3ca8b31808a21882cb99 (diff) | |
download | serenity-a2baab38fd58e18f690e2256b0a5081580c05968.zip |
Everywhere: It's now "Foobar", not "FooBar", and not "foo bar"
I hereby declare these to be full nouns that we don't split,
neither by space, nor by underscore:
- Breadcrumbbar
- Coolbar
- Menubar
- Progressbar
- Scrollbar
- Statusbar
- Taskbar
- Toolbar
This patch makes everything consistent by replacing every other variant
of these with the proper one. :^)
Diffstat (limited to 'Userland/Games')
-rw-r--r-- | Userland/Games/2048/main.cpp | 8 | ||||
-rw-r--r-- | Userland/Games/Breakout/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Games/Chess/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Games/Conway/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Games/Minesweeper/main.cpp | 6 | ||||
-rw-r--r-- | Userland/Games/Pong/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Games/Snake/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Games/Solitaire/main.cpp | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/Userland/Games/2048/main.cpp b/Userland/Games/2048/main.cpp index 5adbea5132..e43c751a4c 100644 --- a/Userland/Games/2048/main.cpp +++ b/Userland/Games/2048/main.cpp @@ -34,9 +34,9 @@ #include <LibGUI/Button.h> #include <LibGUI/Icon.h> #include <LibGUI/Menu.h> -#include <LibGUI/MenuBar.h> +#include <LibGUI/Menubar.h> #include <LibGUI/MessageBox.h> -#include <LibGUI/StatusBar.h> +#include <LibGUI/Statusbar.h> #include <LibGUI/Window.h> #include <stdio.h> #include <time.h> @@ -98,7 +98,7 @@ int main(int argc, char** argv) auto& board_view = main_widget.add<BoardView>(&game.board()); board_view.set_focus(true); - auto& statusbar = main_widget.add<GUI::StatusBar>(); + auto& statusbar = main_widget.add<GUI::Statusbar>(); auto update = [&]() { board_view.set_board(&game.board()); @@ -178,7 +178,7 @@ int main(int argc, char** argv) } }; - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); diff --git a/Userland/Games/Breakout/main.cpp b/Userland/Games/Breakout/main.cpp index af8e4d9a8c..306a228169 100644 --- a/Userland/Games/Breakout/main.cpp +++ b/Userland/Games/Breakout/main.cpp @@ -28,7 +28,7 @@ #include <LibGUI/Application.h> #include <LibGUI/Icon.h> #include <LibGUI/Menu.h> -#include <LibGUI/MenuBar.h> +#include <LibGUI/Menubar.h> #include <LibGUI/Window.h> #include <LibGfx/Bitmap.h> #include <unistd.h> @@ -67,7 +67,7 @@ int main(int argc, char** argv) auto& game = window->set_main_widget<Breakout::Game>(); window->show(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); app_menu.add_action(GUI::Action::create_checkable("Pause", { {}, Key_P }, [&](auto& action) { diff --git a/Userland/Games/Chess/main.cpp b/Userland/Games/Chess/main.cpp index c2a3a2de78..9e817a089b 100644 --- a/Userland/Games/Chess/main.cpp +++ b/Userland/Games/Chess/main.cpp @@ -33,7 +33,7 @@ #include <LibGUI/FilePicker.h> #include <LibGUI/Icon.h> #include <LibGUI/Menu.h> -#include <LibGUI/MenuBar.h> +#include <LibGUI/Menubar.h> #include <LibGUI/MessageBox.h> #include <LibGUI/Window.h> #include <unistd.h> @@ -96,7 +96,7 @@ int main(int argc, char** argv) widget.set_coordinates(config->read_bool_entry("Style", "Coordinates", true)); widget.set_show_available_moves(config->read_bool_entry("Style", "ShowAvailableMoves", true)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); app_menu.add_action(GUI::Action::create("Resign", { Mod_None, Key_F3 }, [&](auto&) { diff --git a/Userland/Games/Conway/main.cpp b/Userland/Games/Conway/main.cpp index bc7210b86b..1c2d6a37d2 100644 --- a/Userland/Games/Conway/main.cpp +++ b/Userland/Games/Conway/main.cpp @@ -28,7 +28,7 @@ #include <LibGUI/Application.h> #include <LibGUI/Icon.h> #include <LibGUI/Menu.h> -#include <LibGUI/MenuBar.h> +#include <LibGUI/Menubar.h> #include <LibGUI/Window.h> #include <stdio.h> #include <unistd.h> @@ -69,7 +69,7 @@ int main(int argc, char** argv) auto& game = window->set_main_widget<Game>(); window->set_minimum_size(game.columns(), game.rows()); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); diff --git a/Userland/Games/Minesweeper/main.cpp b/Userland/Games/Minesweeper/main.cpp index 8c3835b796..067bf6a570 100644 --- a/Userland/Games/Minesweeper/main.cpp +++ b/Userland/Games/Minesweeper/main.cpp @@ -34,7 +34,7 @@ #include <LibGUI/ImageWidget.h> #include <LibGUI/Label.h> #include <LibGUI/Menu.h> -#include <LibGUI/MenuBar.h> +#include <LibGUI/Menubar.h> #include <LibGUI/Window.h> #include <stdio.h> #include <unistd.h> @@ -92,7 +92,7 @@ int main(int argc, char** argv) auto& flag_label = container.add<GUI::Label>(); auto& face_button = container.add<GUI::Button>(); face_button.set_focus_policy(GUI::FocusPolicy::TabFocus); - face_button.set_button_style(Gfx::ButtonStyle::CoolBar); + face_button.set_button_style(Gfx::ButtonStyle::Coolbar); face_button.set_fixed_size(36, 36); auto& time_image = container.add<GUI::ImageWidget>(); @@ -104,7 +104,7 @@ int main(int argc, char** argv) window->resize(size); }); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); diff --git a/Userland/Games/Pong/main.cpp b/Userland/Games/Pong/main.cpp index 24829629ca..b967245b64 100644 --- a/Userland/Games/Pong/main.cpp +++ b/Userland/Games/Pong/main.cpp @@ -29,7 +29,7 @@ #include <LibGUI/Application.h> #include <LibGUI/Icon.h> #include <LibGUI/Menu.h> -#include <LibGUI/MenuBar.h> +#include <LibGUI/Menubar.h> #include <LibGUI/Window.h> #include <LibGfx/Bitmap.h> #include <unistd.h> @@ -74,7 +74,7 @@ int main(int argc, char** argv) window->set_main_widget<Pong::Game>(); window->show(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { diff --git a/Userland/Games/Snake/main.cpp b/Userland/Games/Snake/main.cpp index 9a6e1d87f9..6c237b233d 100644 --- a/Userland/Games/Snake/main.cpp +++ b/Userland/Games/Snake/main.cpp @@ -32,7 +32,7 @@ #include <LibGUI/Button.h> #include <LibGUI/Icon.h> #include <LibGUI/Menu.h> -#include <LibGUI/MenuBar.h> +#include <LibGUI/Menubar.h> #include <LibGUI/Window.h> #include <stdio.h> #include <unistd.h> @@ -78,7 +78,7 @@ int main(int argc, char** argv) auto& game = window->set_main_widget<SnakeGame>(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); diff --git a/Userland/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp index 7879b9269f..513c206f44 100644 --- a/Userland/Games/Solitaire/main.cpp +++ b/Userland/Games/Solitaire/main.cpp @@ -29,7 +29,7 @@ #include <LibGUI/Application.h> #include <LibGUI/Icon.h> #include <LibGUI/Menu.h> -#include <LibGUI/MenuBar.h> +#include <LibGUI/Menubar.h> #include <LibGUI/Window.h> #include <stdio.h> #include <unistd.h> @@ -63,7 +63,7 @@ int main(int argc, char** argv) window->set_title(String::formatted("Score: {} - Solitaire", score)); }); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); app_menu.add_action(GUI::Action::create("New game", { Mod_None, Key_F2 }, [&](auto&) { |