diff options
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/dropdown.cpp | 3 | ||||
-rw-r--r-- | src/gui/widgets/extendedlistbox.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/extendedlistmodel.h | 34 | ||||
-rw-r--r-- | src/gui/widgets/extendednamesmodel.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_theme.cpp | 3 |
5 files changed, 6 insertions, 38 deletions
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index ec9a2e22f..763cf47a5 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -28,7 +28,8 @@ #include "input/keydata.h" -#include "gui/widgets/extendedlistmodel.h" +#include "gui/models/extendedlistmodel.h" + #include "gui/widgets/popuplist.h" #include "resources/image.h" diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index c507f986c..13fb70f28 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -20,7 +20,7 @@ #include "gui/widgets/extendedlistbox.h" -#include "gui/widgets/extendedlistmodel.h" +#include "gui/models/extendedlistmodel.h" #include "gui/font.h" diff --git a/src/gui/widgets/extendedlistmodel.h b/src/gui/widgets/extendedlistmodel.h deleted file mode 100644 index c3cd26b90..000000000 --- a/src/gui/widgets/extendedlistmodel.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 <http://www.gnu.org/licenses/>. - */ - -#ifndef GUI_WIDGETS_EXTENDEDLISTMODEL_H -#define GUI_WIDGETS_EXTENDEDLISTMODEL_H - -#include "resources/image.h" - -#include "gui/models/listmodel.h" - -class ExtendedListModel : public ListModel -{ - public: - virtual const Image *getImageAt(int i) A_WARN_UNUSED = 0; -}; - -#endif // GUI_WIDGETS_EXTENDEDLISTMODEL_H diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h index 93e87cfa0..3c38c48ed 100644 --- a/src/gui/widgets/extendednamesmodel.h +++ b/src/gui/widgets/extendednamesmodel.h @@ -23,7 +23,7 @@ #include "utils/stringvector.h" -#include "gui/widgets/extendedlistmodel.h" +#include "gui/models/extendedlistmodel.h" class ExtendedNamesModel : public ExtendedListModel { diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index 1d5f0f910..8d5b234e1 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -26,9 +26,10 @@ #include "gui/windows/okdialog.h" +#include "gui/models/extendedlistmodel.h" + #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" -#include "gui/widgets/extendedlistmodel.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/namesmodel.h" |