summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-23 01:19:43 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-23 01:19:43 +0300
commitd94fca4c217f7adef156a80b450be8073364a707 (patch)
treefa644c0da71f4b312849c51fcc44b3017be51c24
parenta499fabac999d299da503061915cd261c73bf750 (diff)
downloadplus-d94fca4c217f7adef156a80b450be8073364a707.tar.gz
plus-d94fca4c217f7adef156a80b450be8073364a707.tar.bz2
plus-d94fca4c217f7adef156a80b450be8073364a707.tar.xz
plus-d94fca4c217f7adef156a80b450be8073364a707.zip
Move worldlistmodel into gui/models directory.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/models/worldlistmodel.h68
-rw-r--r--src/gui/windows/worldselectdialog.cpp39
4 files changed, 71 insertions, 38 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 84c0c5057..8e668ce2c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -236,6 +236,7 @@ SET(SRCS
gui/models/touchactionmodel.h
gui/models/updatetypemodel.h
gui/models/updatelistmodel.h
+ gui/models/worldlistmodel.h
gui/models/themesmodel.h
gui/widgets/tabstrip.cpp
gui/widgets/tabstrip.h
diff --git a/src/Makefile.am b/src/Makefile.am
index dc765b567..0d33eedcb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -332,6 +332,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/models/touchactionmodel.h \
gui/models/updatetypemodel.h \
gui/models/updatelistmodel.h \
+ gui/models/worldlistmodel.h \
gui/models/themesmodel.h \
gui/widgets/tabstrip.cpp \
gui/widgets/tabstrip.h \
diff --git a/src/gui/models/worldlistmodel.h b/src/gui/models/worldlistmodel.h
new file mode 100644
index 000000000..7d9dc322c
--- /dev/null
+++ b/src/gui/models/worldlistmodel.h
@@ -0,0 +1,68 @@
+/*
+ * 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_WORLDLISTMODEL_H
+#define GUI_MODELS_WORLDLISTMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "net/worldinfo.h"
+
+/**
+ * The list model for the server list.
+ */
+class WorldListModel final : public ListModel
+{
+ public:
+ explicit WorldListModel(Worlds worlds) :
+ mWorlds(worlds)
+ {
+ }
+
+ A_DELETE_COPY(WorldListModel)
+
+ ~WorldListModel()
+ { }
+
+ int getNumberOfElements() override final
+ {
+ return static_cast<int>(mWorlds.size());
+ }
+
+ std::string getElementAt(int i) override final
+ {
+ const WorldInfo *const si = mWorlds[i];
+ if (si)
+ {
+ return std::string(si->name).append(" (").append(
+ toString(si->online_users)).append(")");
+ }
+ else
+ {
+ return "???";
+ }
+ }
+ private:
+ Worlds mWorlds;
+};
+
+#endif // GUI_MODELS_WORLDLISTMODEL_H
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index e588e5eb0..db17820db 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -34,6 +34,7 @@
#include "gui/widgets/scrollarea.h"
#include "gui/models/listmodel.h"
+#include "gui/models/worldlistmodel.h"
#include "net/loginhandler.h"
#include "net/net.h"
@@ -44,44 +45,6 @@
extern WorldInfo **server_info;
-/**
- * The list model for the server list.
- */
-class WorldListModel final : public ListModel
-{
- public:
- explicit WorldListModel(Worlds worlds) :
- mWorlds(worlds)
- {
- }
-
- A_DELETE_COPY(WorldListModel)
-
- ~WorldListModel()
- { }
-
- int getNumberOfElements() override final
- {
- return static_cast<int>(mWorlds.size());
- }
-
- std::string getElementAt(int i) override final
- {
- const WorldInfo *const si = mWorlds[i];
- if (si)
- {
- return std::string(si->name).append(" (").append(
- toString(si->online_users)).append(")");
- }
- else
- {
- return "???";
- }
- }
- private:
- Worlds mWorlds;
-};
-
WorldSelectDialog::WorldSelectDialog(Worlds worlds):
// TRANSLATORS: world select dialog name
Window(_("Select World"), false, nullptr, "world.xml"),