From 2f0c3a26431ed87be273b182b341d9c167f92eca Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Feb 2014 17:13:32 +0300 Subject: Move namesmodel into gui/models directory. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/gui/models/namesmodel.cpp | 52 ++++++++++++++++++++++++++ src/gui/models/namesmodel.h | 61 +++++++++++++++++++++++++++++++ src/gui/widgets/namesmodel.cpp | 52 -------------------------- src/gui/widgets/namesmodel.h | 61 ------------------------------- src/gui/widgets/setuptouchitem.h | 3 +- src/gui/widgets/tabs/setup_audio.cpp | 3 +- src/gui/widgets/tabs/setup_joystick.cpp | 3 +- src/gui/widgets/tabs/setup_other.cpp | 3 +- src/gui/widgets/tabs/setup_perfomance.cpp | 3 +- src/gui/widgets/tabs/setup_theme.cpp | 2 +- src/gui/widgets/tabs/setup_touch.cpp | 3 +- src/gui/widgets/tabs/setup_visual.cpp | 3 +- src/gui/windows/emotewindow.cpp | 2 +- 15 files changed, 133 insertions(+), 126 deletions(-) create mode 100644 src/gui/models/namesmodel.cpp create mode 100644 src/gui/models/namesmodel.h delete mode 100644 src/gui/widgets/namesmodel.cpp delete mode 100644 src/gui/widgets/namesmodel.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e13f9098..42c1e5b85 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -176,8 +176,8 @@ SET(SRCS gui/widgets/linkhandler.h gui/widgets/listbox.cpp gui/widgets/listbox.h - gui/widgets/namesmodel.cpp - gui/widgets/namesmodel.h + gui/models/namesmodel.cpp + gui/models/namesmodel.h gui/widgets/passwordfield.cpp gui/widgets/passwordfield.h gui/widgets/playerbox.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 5622d0a42..7051ae052 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -274,8 +274,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/linkhandler.h \ gui/widgets/listbox.cpp \ gui/widgets/listbox.h \ - gui/widgets/namesmodel.cpp \ - gui/widgets/namesmodel.h \ + gui/models/namesmodel.cpp \ + gui/models/namesmodel.h \ gui/widgets/passwordfield.cpp \ gui/widgets/passwordfield.h \ gui/widgets/playerbox.cpp \ diff --git a/src/gui/models/namesmodel.cpp b/src/gui/models/namesmodel.cpp new file mode 100644 index 000000000..54a10c2cf --- /dev/null +++ b/src/gui/models/namesmodel.cpp @@ -0,0 +1,52 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "gui/models/namesmodel.h" + +#include "utils/gettext.h" + +#include "debug.h" + +NamesModel::NamesModel() : + mNames() +{ +} + +NamesModel::~NamesModel() +{ +} + +int NamesModel::getNumberOfElements() +{ + return static_cast(mNames.size()); +} + +std::string NamesModel::getElementAt(int i) +{ + if (i >= getNumberOfElements() || i < 0) + return "???"; + return mNames[i]; +} + +void NamesModel::fillFromArray(const char *const *const arr, std::size_t sz) +{ + for (size_t f = 0; f < sz; f ++) + mNames.push_back(gettext(arr[f])); +} diff --git a/src/gui/models/namesmodel.h b/src/gui/models/namesmodel.h new file mode 100644 index 000000000..96d16de36 --- /dev/null +++ b/src/gui/models/namesmodel.h @@ -0,0 +1,61 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GUI_MODELS_NAMESMODEL_H +#define GUI_MODELS_NAMESMODEL_H + +#include "utils/stringvector.h" + +#include "gui/models/listmodel.h" + +#include "localconsts.h" + +class NamesModel : public ListModel +{ + public: + NamesModel(); + + A_DELETE_COPY(NamesModel) + + virtual ~NamesModel(); + + virtual int getNumberOfElements() override final A_WARN_UNUSED; + + virtual std::string getElementAt(int i) override final A_WARN_UNUSED; + + StringVect &getNames() A_WARN_UNUSED + { return mNames; } + + size_t size() const A_WARN_UNUSED + { return mNames.size(); } + + void clear() + { mNames.clear(); } + + void add(const std::string &str) + { mNames.push_back(str); } + + void fillFromArray(const char *const *const arr, std::size_t size); + + protected: + StringVect mNames; +}; + +#endif // GUI_MODELS_NAMESMODEL_H diff --git a/src/gui/widgets/namesmodel.cpp b/src/gui/widgets/namesmodel.cpp deleted file mode 100644 index 339f835d5..000000000 --- a/src/gui/widgets/namesmodel.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2014 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "gui/widgets/namesmodel.h" - -#include "utils/gettext.h" - -#include "debug.h" - -NamesModel::NamesModel() : - mNames() -{ -} - -NamesModel::~NamesModel() -{ -} - -int NamesModel::getNumberOfElements() -{ - return static_cast(mNames.size()); -} - -std::string NamesModel::getElementAt(int i) -{ - if (i >= getNumberOfElements() || i < 0) - return "???"; - return mNames[i]; -} - -void NamesModel::fillFromArray(const char *const *const arr, std::size_t sz) -{ - for (size_t f = 0; f < sz; f ++) - mNames.push_back(gettext(arr[f])); -} diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h deleted file mode 100644 index 4018a3755..000000000 --- a/src/gui/widgets/namesmodel.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2014 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GUI_WIDGETS_NAMESMODEL_H -#define GUI_WIDGETS_NAMESMODEL_H - -#include "utils/stringvector.h" - -#include "gui/models/listmodel.h" - -#include "localconsts.h" - -class NamesModel : public ListModel -{ - public: - NamesModel(); - - A_DELETE_COPY(NamesModel) - - virtual ~NamesModel(); - - virtual int getNumberOfElements() override final A_WARN_UNUSED; - - virtual std::string getElementAt(int i) override final A_WARN_UNUSED; - - StringVect &getNames() A_WARN_UNUSED - { return mNames; } - - size_t size() const A_WARN_UNUSED - { return mNames.size(); } - - void clear() - { mNames.clear(); } - - void add(const std::string &str) - { mNames.push_back(str); } - - void fillFromArray(const char *const *const arr, std::size_t size); - - protected: - StringVect mNames; -}; - -#endif // GUI_WIDGETS_NAMESMODEL_H diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h index f15c0d43d..b84b15f81 100644 --- a/src/gui/widgets/setuptouchitem.h +++ b/src/gui/widgets/setuptouchitem.h @@ -21,7 +21,8 @@ #ifndef GUI_WIDGETS_SETUPTOUCHITEM_H #define GUI_WIDGETS_SETUPTOUCHITEM_H -#include "gui/widgets/namesmodel.h" +#include "gui/models/namesmodel.h" + #include "gui/widgets/setupitem.h" class TouchActionsModel final : public NamesModel diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp index d70e4e1b4..e7c49723a 100644 --- a/src/gui/widgets/tabs/setup_audio.cpp +++ b/src/gui/widgets/tabs/setup_audio.cpp @@ -30,8 +30,9 @@ #include "gui/viewport.h" +#include "gui/models/namesmodel.h" + #include "gui/widgets/layouthelper.h" -#include "gui/widgets/namesmodel.h" #include "gui/widgets/scrollarea.h" #include "utils/gettext.h" diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp index e2e66c6fc..ba5c37b5a 100644 --- a/src/gui/widgets/tabs/setup_joystick.cpp +++ b/src/gui/widgets/tabs/setup_joystick.cpp @@ -26,12 +26,13 @@ #include "input/joystick.h" +#include "gui/models/namesmodel.h" + #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" -#include "gui/widgets/namesmodel.h" #include "utils/gettext.h" diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp index 4640150e4..678dc2672 100644 --- a/src/gui/widgets/tabs/setup_other.cpp +++ b/src/gui/widgets/tabs/setup_other.cpp @@ -22,8 +22,9 @@ #include "gui/widgets/tabs/setup_other.h" +#include "gui/models/namesmodel.h" + #include "gui/widgets/layouthelper.h" -#include "gui/widgets/namesmodel.h" #include "gui/widgets/setupitem.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/widgets/tabs/setup_perfomance.cpp b/src/gui/widgets/tabs/setup_perfomance.cpp index 88cf6279c..cd92c8542 100644 --- a/src/gui/widgets/tabs/setup_perfomance.cpp +++ b/src/gui/widgets/tabs/setup_perfomance.cpp @@ -22,8 +22,9 @@ #include "gui/widgets/tabs/setup_perfomance.h" +#include "gui/models/namesmodel.h" + #include "gui/widgets/layouthelper.h" -#include "gui/widgets/namesmodel.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/setupitem.h" diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index 8d5b234e1..99deda940 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -27,12 +27,12 @@ #include "gui/windows/okdialog.h" #include "gui/models/extendedlistmodel.h" +#include "gui/models/namesmodel.h" #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" -#include "gui/widgets/namesmodel.h" #include "configuration.h" diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp index 1d9149fbd..e26716973 100644 --- a/src/gui/widgets/tabs/setup_touch.cpp +++ b/src/gui/widgets/tabs/setup_touch.cpp @@ -20,8 +20,9 @@ #include "gui/widgets/tabs/setup_touch.h" +#include "gui/models/namesmodel.h" + #include "gui/widgets/layouthelper.h" -#include "gui/widgets/namesmodel.h" #include "gui/widgets/setuptouchitem.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp index d7c2ff788..525d73d07 100644 --- a/src/gui/widgets/tabs/setup_visual.cpp +++ b/src/gui/widgets/tabs/setup_visual.cpp @@ -21,8 +21,9 @@ #include "gui/widgets/tabs/setup_visual.h" +#include "gui/models/namesmodel.h" + #include "gui/widgets/layouthelper.h" -#include "gui/widgets/namesmodel.h" #include "gui/widgets/scrollarea.h" #include "client.h" diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index 97ce9b5c7..3a7141533 100644 --- a/src/gui/windows/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -21,10 +21,10 @@ #include "gui/windows/emotewindow.h" #include "gui/models/colormodel.h" +#include "gui/models/namesmodel.h" #include "gui/widgets/colorpage.h" #include "gui/widgets/emotepage.h" -#include "gui/widgets/namesmodel.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabbedarea.h" -- cgit v1.2.3-70-g09d2