diff --git a/Userland/Applications/KeyboardSettings/CharacterMapFileListModel.h b/Userland/Applications/KeyboardSettings/CharacterMapFileListModel.h deleted file mode 100644 index 88095ef537..0000000000 --- a/Userland/Applications/KeyboardSettings/CharacterMapFileListModel.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2020, Hüseyin Aslıtürk - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include - -class CharacterMapFileListModel final : public GUI::Model { -public: - static NonnullRefPtr create(Vector& filenames) - { - return adopt_ref(*new CharacterMapFileListModel(filenames)); - } - - virtual ~CharacterMapFileListModel() override { } - - virtual int row_count(const GUI::ModelIndex&) const override - { - return m_filenames.size(); - } - - virtual int column_count(const GUI::ModelIndex&) const override - { - return 1; - } - - virtual GUI::Variant data(const GUI::ModelIndex& index, GUI::ModelRole role) const override - { - VERIFY(index.is_valid()); - VERIFY(index.column() == 0); - - if (role == GUI::ModelRole::Display) - return m_filenames.at(index.row()); - - return {}; - } - -private: - explicit CharacterMapFileListModel(Vector& filenames) - : m_filenames(filenames) - { - } - - Vector& m_filenames; -}; diff --git a/Userland/Applications/KeyboardSettings/main.cpp b/Userland/Applications/KeyboardSettings/main.cpp index 40af1946b9..8ee5820a2b 100644 --- a/Userland/Applications/KeyboardSettings/main.cpp +++ b/Userland/Applications/KeyboardSettings/main.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "CharacterMapFileListModel.h" #include #include #include @@ -16,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -122,7 +122,7 @@ int main(int argc, char** argv) auto& character_map_file_combo = character_map_file_selection_container.add(); character_map_file_combo.set_only_allow_values_from_model(true); - character_map_file_combo.set_model(*CharacterMapFileListModel::create(character_map_files)); + character_map_file_combo.set_model(*GUI::ItemListModel::create(character_map_files)); character_map_file_combo.set_selected_index(initial_keymap_index); auto& num_lock_checkbox = root_widget.add("Enable Num Lock on login");