summaryrefslogtreecommitdiff
path: root/src/gui/base
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 16:26:52 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 16:26:52 +0300
commit5fc6d9e0f9637e3aaa71972478bee9febbe78ca7 (patch)
tree0b65e519506388e0f4c225ab585b85c84aa03a55 /src/gui/base
parent4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06 (diff)
downloadmanaplus-5fc6d9e0f9637e3aaa71972478bee9febbe78ca7.tar.gz
manaplus-5fc6d9e0f9637e3aaa71972478bee9febbe78ca7.tar.bz2
manaplus-5fc6d9e0f9637e3aaa71972478bee9febbe78ca7.tar.xz
manaplus-5fc6d9e0f9637e3aaa71972478bee9febbe78ca7.zip
Move listmodel into gui/modesl directory.
Diffstat (limited to 'src/gui/base')
-rw-r--r--src/gui/base/listmodel.hpp106
-rw-r--r--src/gui/base/widgets/listbox.cpp2
-rw-r--r--src/gui/base/widgets/listbox.hpp3
3 files changed, 2 insertions, 109 deletions
diff --git a/src/gui/base/listmodel.hpp b/src/gui/base/listmodel.hpp
deleted file mode 100644
index 4b98f46fe..000000000
--- a/src/gui/base/listmodel.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * The ManaPlus Client
- * 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/>.
- */
-
-/* _______ __ __ __ ______ __ __ _______ __ __
- * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
- * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
- * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- * be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_LISTMODEL_HPP
-#define GCN_LISTMODEL_HPP
-
-#include <string>
-
-#include "localconsts.h"
-
-namespace gcn
-{
- /**
- * An interface for a model that represents a list. It is
- * used in certain widgets, like the ListBox, to handle a
- * lists with string elements. If you want to use widgets
- * like ListBox, make a derived class from this class that
- * represents your list.
- */
- class ListModel
- {
- public:
- /**
- * Destructor.
- */
- virtual ~ListModel()
- { }
-
- /**
- * Gets the number of elements in the list.
- *
- * @return The number of elements in the list
- */
- virtual int getNumberOfElements() A_WARN_UNUSED = 0;
-
- /**
- * Gets an element at a certain index in the list.
- *
- * @param i An index in the list.
- * @return An element as a string at the a certain index.
- */
- virtual std::string getElementAt(int i) A_WARN_UNUSED = 0;
- };
-} // namespace gcn
-
-#endif // end GCN_LISTMODEL_HPP
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index 9aca373b9..62a3062a5 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -69,7 +69,7 @@
#include "gui/font.h"
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
#include "listeners/selectionlistener.h"
diff --git a/src/gui/base/widgets/listbox.hpp b/src/gui/base/widgets/listbox.hpp
index 4046f5ddf..079e5a7d5 100644
--- a/src/gui/base/widgets/listbox.hpp
+++ b/src/gui/base/widgets/listbox.hpp
@@ -71,12 +71,11 @@
#include "listeners/keylistener.h"
#include "listeners/mouselistener.h"
+class ListModel;
class SelectionListener;
namespace gcn
{
- class ListModel;
-
/**
* An implementation of a list box where an item can be selected.
*