summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/models/serverslistmodel.h109
-rw-r--r--src/gui/windows/serverdialog.cpp42
-rw-r--r--src/gui/windows/serverdialog.h42
3 files changed, 112 insertions, 81 deletions
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
new file mode 100644
index 000000000..630d9664e
--- /dev/null
+++ b/src/gui/models/serverslistmodel.h
@@ -0,0 +1,109 @@
+/*
+ * 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_SERVERSLISTMODEL_H
+#define GUI_MODELS_SERVERSLISTMODEL_H
+
+#include "net/serverinfo.h"
+
+#include "utils/mutex.h"
+
+#include "gui/models/listmodel.h"
+
+#include "net/serverinfo.h"
+
+#include <string>
+#include <vector>
+
+class ServerDialog;
+
+/**
+ * Server and Port List Model
+ */
+class ServersListModel final : public ListModel
+{
+ public:
+ typedef std::pair<int, std::string> VersionString;
+
+ ServersListModel(ServerInfos *const servers,
+ ServerDialog *const parent) :
+ mServers(servers),
+ mVersionStrings(servers->size(), VersionString(0, "")),
+ mParent(parent)
+ {
+ }
+
+ A_DELETE_COPY(ServersListModel)
+
+ /**
+ * Used to get number of line in the list
+ */
+ int getNumberOfElements() override final A_WARN_UNUSED
+ {
+ MutexLocker lock = mParent->lock();
+ return static_cast<int>(mServers->size());
+ }
+
+ /**
+ * Used to get an element from the list
+ */
+ std::string getElementAt(int elementIndex)
+ override final A_WARN_UNUSED
+ {
+ MutexLocker lock = mParent->lock();
+ const ServerInfo &server = mServers->at(elementIndex);
+ std::string myServer;
+ myServer.append(server.hostname);
+ return myServer;
+ }
+
+ /**
+ * Used to get the corresponding Server struct
+ */
+ const ServerInfo &getServer(const int elementIndex) const A_WARN_UNUSED
+ { return mServers->at(elementIndex); }
+
+ void setVersionString(const int index, const std::string &version)
+ {
+ if (index < 0 || index >= static_cast<int>(mVersionStrings.size()))
+ return;
+
+ if (version.empty() || !gui)
+ {
+ mVersionStrings[index] = VersionString(0, "");
+ }
+ else
+ {
+ mVersionStrings[index] = VersionString(
+ gui->getFont()->getWidth(version), version);
+ }
+ }
+
+ private:
+ typedef std::vector<VersionString> VersionStrings;
+
+ ServerInfos *mServers;
+ VersionStrings mVersionStrings;
+ ServerDialog *mParent;
+};
+
+#endif // GUI_MODELS_SERVERSLISTMODEL_H
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index a6e3637fb..18da8682e 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -34,6 +34,8 @@
#include "gui/font.h"
#include "gui/gui.h"
+#include "gui/models/serverslistmodel.h"
+
#include "gui/widgets/checkbox.h"
#include "gui/windows/editserverdialog.h"
#include "gui/windows/logindialog.h"
@@ -105,46 +107,6 @@ static uint16_t defaultPortForServerType(const ServerInfo::Type type)
}
}
-ServersListModel::ServersListModel(ServerInfos *const servers,
- ServerDialog *const parent) :
- mServers(servers),
- mVersionStrings(servers->size(), VersionString(0, "")),
- mParent(parent)
-{
-}
-
-int ServersListModel::getNumberOfElements()
-{
- MutexLocker lock = mParent->lock();
- return static_cast<int>(mServers->size());
-}
-
-std::string ServersListModel::getElementAt(int elementIndex)
-{
- MutexLocker lock = mParent->lock();
- const ServerInfo &server = mServers->at(elementIndex);
- std::string myServer;
- myServer.append(server.hostname);
- return myServer;
-}
-
-void ServersListModel::setVersionString(const int index,
- const std::string &version)
-{
- if (index < 0 || index >= static_cast<int>(mVersionStrings.size()))
- return;
-
- if (version.empty() || !gui)
- {
- mVersionStrings[index] = VersionString(0, "");
- }
- else
- {
- mVersionStrings[index] = VersionString(
- gui->getFont()->getWidth(version), version);
- }
-}
-
class ServersListBox final : public ListBox
{
public:
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 2d0ada344..07e2b5dcc 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -44,47 +44,7 @@ class CheckBox;
class Label;
class ListBox;
class ServerDialog;
-
-/**
- * Server and Port List Model
- */
-class ServersListModel final : public ListModel
-{
- public:
- typedef std::pair<int, std::string> VersionString;
-
- ServersListModel(ServerInfos *const servers,
- ServerDialog *const parent);
-
- A_DELETE_COPY(ServersListModel)
-
- /**
- * Used to get number of line in the list
- */
- int getNumberOfElements() override final A_WARN_UNUSED;
-
- /**
- * Used to get an element from the list
- */
- std::string getElementAt(int elementIndex)
- override final A_WARN_UNUSED;
-
- /**
- * Used to get the corresponding Server struct
- */
- const ServerInfo &getServer(const int elementIndex) const A_WARN_UNUSED
- { return mServers->at(elementIndex); }
-
- void setVersionString(const int index, const std::string &version);
-
- private:
- typedef std::vector<VersionString> VersionStrings;
-
- ServerInfos *mServers;
- VersionStrings mVersionStrings;
- ServerDialog *mParent;
-};
-
+class ServersListModel;
/**
* The server choice dialog.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 01:59:20 +0000