From 5bd149387fe8ce35915e9c58d35938eb03b99051 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Feb 2014 23:35:31 +0300 Subject: Move soundsmodel into gui/models directory. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/gui/models/soundsmodel.h | 42 ++++++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/setup_audio.cpp | 15 +------------ 4 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 src/gui/models/soundsmodel.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bff6a6ae1..857b09896 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -219,6 +219,7 @@ SET(SRCS gui/widgets/skillinfo.h gui/models/skillmodel.cpp gui/models/skillmodel.h + gui/models/soundsmodel.h gui/widgets/slider.cpp gui/widgets/slider.h gui/widgets/sliderlist.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 7de2a97d0..931a5da9f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -317,6 +317,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/skillinfo.h \ gui/models/skillmodel.cpp \ gui/models/skillmodel.h \ + gui/models/soundsmodel.h \ gui/widgets/slider.cpp \ gui/widgets/slider.h \ gui/widgets/sliderlist.cpp \ diff --git a/src/gui/models/soundsmodel.h b/src/gui/models/soundsmodel.h new file mode 100644 index 000000000..2851e2265 --- /dev/null +++ b/src/gui/models/soundsmodel.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * 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 . + */ + +#include "gui/theme.h" + +#include "gui/models/namesmodel.h" + +#include "utils/gettext.h" + +#include "debug.h" + +class SoundsModel final : public NamesModel +{ + public: + SoundsModel() : + NamesModel() + { + mNames.push_back(gettext("(no sound)")); + Theme::fillSoundsList(mNames); + } + + ~SoundsModel() + { } +}; diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp index e7c49723a..c5cb8cef1 100644 --- a/src/gui/widgets/tabs/setup_audio.cpp +++ b/src/gui/widgets/tabs/setup_audio.cpp @@ -31,6 +31,7 @@ #include "gui/viewport.h" #include "gui/models/namesmodel.h" +#include "gui/models/soundsmodel.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/scrollarea.h" @@ -39,20 +40,6 @@ #include "debug.h" -class SoundsModel final : public NamesModel -{ -public: - SoundsModel() : - NamesModel() - { - mNames.push_back(gettext("(no sound)")); - Theme::fillSoundsList(mNames); - } - - ~SoundsModel() - { } -}; - Setup_Audio::Setup_Audio(const Widget2 *const widget) : SetupTabScroll(widget), mSoundModel(new SoundsModel), -- cgit v1.2.3-70-g09d2