From bc3fd285b51fbcb02958307e76b4bca8aabb1792 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 14 May 2014 18:28:38 +0300 Subject: Move extendedlistboxitem into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/gui/widgets/extendedlistbox.h | 19 +-------------- src/gui/widgets/extendedlistboxitem.h | 44 +++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 src/gui/widgets/extendedlistboxitem.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b7ace9cbc..309599268 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -141,6 +141,7 @@ SET(SRCS gui/widgets/emoteshortcutcontainer.h gui/widgets/extendedlistbox.cpp gui/widgets/extendedlistbox.h + gui/widgets/extendedlistboxitem.h gui/models/extendedlistmodel.h gui/models/extendednamesmodel.cpp gui/models/extendednamesmodel.h diff --git a/src/Makefile.am b/src/Makefile.am index 342f2bc43..84357074b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -229,6 +229,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/emoteshortcutcontainer.h \ gui/widgets/extendedlistbox.cpp \ gui/widgets/extendedlistbox.h \ + gui/widgets/extendedlistboxitem.h \ gui/models/extendedlistmodel.h \ gui/models/extendednamesmodel.cpp \ gui/models/extendednamesmodel.h \ diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h index ae94cde02..0c26903e6 100644 --- a/src/gui/widgets/extendedlistbox.h +++ b/src/gui/widgets/extendedlistbox.h @@ -21,26 +21,9 @@ #ifndef GUI_WIDGETS_EXTENDEDLISTBOX_H #define GUI_WIDGETS_EXTENDEDLISTBOX_H +#include "gui/widgets/extendedlistboxitem.h" #include "gui/widgets/listbox.h" -struct ExtendedListBoxItem -{ - ExtendedListBoxItem(const int row0, - const std::string &text0, - const bool image0, - const int y0) : - row(row0), - text(text0), - image(image0), - y(y0) - { - } - int row; - std::string text; - bool image; - int y; -}; - class ExtendedListBox final : public ListBox { public: diff --git a/src/gui/widgets/extendedlistboxitem.h b/src/gui/widgets/extendedlistboxitem.h new file mode 100644 index 000000000..4fdc59633 --- /dev/null +++ b/src/gui/widgets/extendedlistboxitem.h @@ -0,0 +1,44 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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 . + */ + +#ifndef GUI_WIDGETS_EXTENDEDLISTBOXITEM_H +#define GUI_WIDGETS_EXTENDEDLISTBOXITEM_H + +#include + +struct ExtendedListBoxItem +{ + ExtendedListBoxItem(const int row0, + const std::string &text0, + const bool image0, + const int y0) : + row(row0), + text(text0), + image(image0), + y(y0) + { + } + int row; + std::string text; + bool image; + int y; +}; + +#endif // GUI_WIDGETS_EXTENDEDLISTBOXITEM_H -- cgit v1.2.3-70-g09d2