From a2baab38fd58e18f690e2256b0a5081580c05968 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 13 Apr 2021 16:18:20 +0200 Subject: 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. :^) --- Userland/Services/WindowServer/MenuBar.h | 65 -------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 Userland/Services/WindowServer/MenuBar.h (limited to 'Userland/Services/WindowServer/MenuBar.h') diff --git a/Userland/Services/WindowServer/MenuBar.h b/Userland/Services/WindowServer/MenuBar.h deleted file mode 100644 index 4008b8e722..0000000000 --- a/Userland/Services/WindowServer/MenuBar.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include "Menu.h" -#include -#include -#include - -namespace WindowServer { - -class MenuBar - : public RefCounted - , public Weakable { -public: - static NonnullRefPtr create(ClientConnection& client, int menubar_id) { return adopt(*new MenuBar(client, menubar_id)); } - ~MenuBar(); - - ClientConnection& client() { return m_client; } - const ClientConnection& client() const { return m_client; } - int menubar_id() const { return m_menubar_id; } - void add_menu(Menu&); - - template - void for_each_menu(Callback callback) - { - for (auto& menu : m_menus) { - if (callback(*menu) == IterationDecision::Break) - return; - } - } - -private: - MenuBar(ClientConnection&, int menubar_id); - - ClientConnection& m_client; - int m_menubar_id { 0 }; - Vector m_menus; -}; - -} -- cgit v1.2.3