summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 18:01:50 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 18:01:50 +0300
commit4574f63edea86ecf31f43818615722015f01ebb4 (patch)
treeff402c853a0f1efef8ee338fd72134c9c336ff5a
parent792ea379274005afc321cbb4ba26b9e79b51f0eb (diff)
downloadmanaverse-4574f63edea86ecf31f43818615722015f01ebb4.tar.gz
manaverse-4574f63edea86ecf31f43818615722015f01ebb4.tar.bz2
manaverse-4574f63edea86ecf31f43818615722015f01ebb4.tar.xz
manaverse-4574f63edea86ecf31f43818615722015f01ebb4.zip
Move avatarlistmodel into gui/models directory.
-rw-r--r--src/gui/models/avatarlistmodel.h40
-rw-r--r--src/gui/widgets/avatarlistbox.cpp2
-rw-r--r--src/gui/widgets/avatarlistbox.h10
-rw-r--r--src/gui/windows/socialwindow.cpp1
-rw-r--r--src/guild.h2
-rw-r--r--src/party.h2
6 files changed, 46 insertions, 11 deletions
diff --git a/src/gui/models/avatarlistmodel.h b/src/gui/models/avatarlistmodel.h
new file mode 100644
index 000000000..2bbd64878
--- /dev/null
+++ b/src/gui/models/avatarlistmodel.h
@@ -0,0 +1,40 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 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_AVATARLISTMODEL_H
+#define GUI_MODELS_AVATARLISTMODEL_H
+
+#include "avatar.h"
+
+#include "gui/models/listmodel.h"
+
+#include <string>
+
+class AvatarListModel : public ListModel
+{
+ public:
+ virtual Avatar *getAvatarAt(const int i) A_WARN_UNUSED = 0;
+
+ std::string getElementAt(int i) override final A_WARN_UNUSED
+ { return getAvatarAt(i)->getName(); }
+};
+
+#endif // GUI_MODELS_AVATARLISTMODEL_H
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 46b6ea20f..cf01517c6 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -32,6 +32,8 @@
#include "gui/gui.h"
#include "gui/viewport.h"
+#include "gui/models/avatarlistmodel.h"
+
#include "gui/windows/chatwindow.h"
#include "resources/image.h"
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index e98cee368..e4f65a992 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -32,17 +32,9 @@
#include <string>
+class AvatarListModel;
class Image;
-class AvatarListModel : public ListModel
-{
-public:
- virtual Avatar *getAvatarAt(const int i) A_WARN_UNUSED = 0;
-
- std::string getElementAt(int i) override final A_WARN_UNUSED
- { return getAvatarAt(i)->getName(); }
-};
-
class AvatarListBox final : public ListBox,
public ConfigListener
{
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 3dbfa566d..5fb479510 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -41,6 +41,7 @@
#include "gui/windows/outfitwindow.h"
+#include "gui/widgets/avatarlistbox.h"
#include "gui/widgets/button.h"
#include "gui/widgets/browserbox.h"
#include "gui/widgets/label.h"
diff --git a/src/guild.h b/src/guild.h
index 48b3d17b2..6206271e0 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -25,7 +25,7 @@
#include "avatar.h"
-#include "gui/widgets/avatarlistbox.h"
+#include "gui/models/avatarlistmodel.h"
#include "utils/dtor.h"
#include "utils/stringvector.h"
diff --git a/src/party.h b/src/party.h
index 79fdfcf9e..c839168c7 100644
--- a/src/party.h
+++ b/src/party.h
@@ -22,7 +22,7 @@
#ifndef PARTY_H
#define PARTY_H
-#include "gui/widgets/avatarlistbox.h"
+#include "gui/models/avatarlistmodel.h"
#include "utils/dtor.h"
#include "utils/stringvector.h"