diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-23 00:39:39 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-23 00:39:39 +0300 |
commit | f5186d4bc4c97b357fda2df45255d81c1045ee33 (patch) | |
tree | 42e9387495e978d227b5cfe37dd55fd99c376d16 | |
parent | 76165a338ca9679ab029e95f6c4d691e85ddb7fb (diff) | |
download | plus-f5186d4bc4c97b357fda2df45255d81c1045ee33.tar.gz plus-f5186d4bc4c97b357fda2df45255d81c1045ee33.tar.bz2 plus-f5186d4bc4c97b357fda2df45255d81c1045ee33.tar.xz plus-f5186d4bc4c97b357fda2df45255d81c1045ee33.zip |
Move updatelistmodel into gui/models directory.
-rw-r--r-- | src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/gui/models/updatelistmodel.h | 66 | ||||
-rw-r--r-- | src/gui/windows/logindialog.cpp | 33 |
4 files changed, 69 insertions, 32 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 608314038..84c0c5057 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -235,6 +235,7 @@ SET(SRCS gui/models/touchactionmodel.cpp gui/models/touchactionmodel.h gui/models/updatetypemodel.h + gui/models/updatelistmodel.h gui/models/themesmodel.h gui/widgets/tabstrip.cpp gui/widgets/tabstrip.h diff --git a/src/Makefile.am b/src/Makefile.am index 62de23970..dc765b567 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -331,6 +331,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/models/touchactionmodel.cpp \ gui/models/touchactionmodel.h \ gui/models/updatetypemodel.h \ + gui/models/updatelistmodel.h \ gui/models/themesmodel.h \ gui/widgets/tabstrip.cpp \ gui/widgets/tabstrip.h \ diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h new file mode 100644 index 000000000..31f96c959 --- /dev/null +++ b/src/gui/models/updatelistmodel.h @@ -0,0 +1,66 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-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 <http://www.gnu.org/licenses/>. + */ + +#ifndef GUI_MODELS_UPDATELISTMODEL_H +#define GUI_MODELS_UPDATELISTMODEL_H + +#include "gui/models/listmodel.h" + +#include "net/logindata.h" + +#include "utils/gettext.h" + +#include "debug.h" + +class UpdateListModel final : public ListModel +{ + public: + explicit UpdateListModel(LoginData *const data) : + ListModel(), + mLoginData(data) + { + } + + A_DELETE_COPY(UpdateListModel) + + ~UpdateListModel() + { } + + int getNumberOfElements() override final + { + if (!mLoginData) + return 0; + return static_cast<int>(mLoginData->updateHosts.size()); + } + + std::string getElementAt(int i) override final + { + if (!mLoginData || i >= getNumberOfElements() || i < 0) + return "???"; + return mLoginData->updateHosts[i]; + } + + protected: + LoginData *mLoginData; +}; + +#endif // GUI_MODELS_UPDATELISTMODEL_H diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index edd010707..71abf153a 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -29,6 +29,7 @@ #include "input/keydata.h" +#include "gui/models/updatelistmodel.h" #include "gui/models/updatetypemodel.h" #include "gui/windows/confirmdialog.h" @@ -76,38 +77,6 @@ namespace } urlListener; } // namespace -class UpdateListModel final : public ListModel -{ - public: - explicit UpdateListModel(LoginData *const data) : - ListModel(), - mLoginData(data) - { - } - - A_DELETE_COPY(UpdateListModel) - - ~UpdateListModel() - { } - - int getNumberOfElements() override final - { - if (!mLoginData) - return 0; - return static_cast<int>(mLoginData->updateHosts.size()); - } - - std::string getElementAt(int i) override final - { - if (!mLoginData || i >= getNumberOfElements() || i < 0) - return "???"; - return mLoginData->updateHosts[i]; - } - - protected: - LoginData *mLoginData; -}; - LoginDialog::LoginDialog(LoginData *const data, std::string serverName, std::string *const updateHost): // TRANSLATORS: login dialog name |