diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_misc.cpp (renamed from src/gui/widgets/tabs/setup_other.cpp) | 10 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_misc.h (renamed from src/gui/widgets/tabs/setup_other.h) | 14 | ||||
| -rw-r--r-- | src/gui/windows/setupwindow.cpp | 4 |
5 files changed, 18 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1c10028db..236ba3e4d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -442,10 +442,10 @@ SET(SRCS gui/widgets/tabs/setup_colors.h gui/widgets/tabs/setup_joystick.cpp gui/widgets/tabs/setup_joystick.h + gui/widgets/tabs/setup_misc.cpp + gui/widgets/tabs/setup_misc.h gui/widgets/tabs/setup_mods.cpp gui/widgets/tabs/setup_mods.h - gui/widgets/tabs/setup_other.cpp - gui/widgets/tabs/setup_other.h gui/widgets/tabs/setup_theme.cpp gui/widgets/tabs/setup_theme.h gui/widgets/tabs/setup_touch.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 36b43c5ef..83ea3e584 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1154,10 +1154,10 @@ SRC = ${BASE_SRC} \ gui/widgets/tabs/setup_colors.h \ gui/widgets/tabs/setup_joystick.cpp \ gui/widgets/tabs/setup_joystick.h \ + gui/widgets/tabs/setup_misc.cpp \ + gui/widgets/tabs/setup_misc.h \ gui/widgets/tabs/setup_mods.cpp \ gui/widgets/tabs/setup_mods.h \ - gui/widgets/tabs/setup_other.cpp \ - gui/widgets/tabs/setup_other.h \ gui/widgets/tabs/setup_theme.cpp \ gui/widgets/tabs/setup_theme.h \ gui/widgets/tabs/setup_touch.cpp \ diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_misc.cpp index e608d27e1..759f6507e 100644 --- a/src/gui/widgets/tabs/setup_other.cpp +++ b/src/gui/widgets/tabs/setup_misc.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/tabs/setup_other.h" +#include "gui/widgets/tabs/setup_misc.h" #include "configuration.h" @@ -91,7 +91,7 @@ static const char *const densityList[] = N_("xxhigh") }; -Setup_Other::Setup_Other(const Widget2 *const widget) : +Setup_Misc::Setup_Misc(const Widget2 *const widget) : SetupTabScroll(widget), mProxyTypeList(new NamesModel), mShortcutsList(new NamesModel), @@ -449,14 +449,14 @@ Setup_Other::Setup_Other(const Widget2 *const widget) : setDimension(Rect(0, 0, 550, 350)); } -Setup_Other::~Setup_Other() +Setup_Misc::~Setup_Misc() { delete2(mProxyTypeList); delete2(mShortcutsList); delete2(mDensityList); } -void Setup_Other::apply() +void Setup_Misc::apply() { SetupTabScroll::apply(); @@ -465,7 +465,7 @@ void Setup_Other::apply() Net::loadIgnorePackets(); } -void Setup_Other::externalUpdated() +void Setup_Misc::externalUpdated() { reread("showJob"); reread("enableGuildBot"); diff --git a/src/gui/widgets/tabs/setup_other.h b/src/gui/widgets/tabs/setup_misc.h index 4039f3e15..c31026c92 100644 --- a/src/gui/widgets/tabs/setup_other.h +++ b/src/gui/widgets/tabs/setup_misc.h @@ -20,21 +20,21 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_TABS_SETUP_OTHER_H -#define GUI_WIDGETS_TABS_SETUP_OTHER_H +#ifndef GUI_WIDGETS_TABS_SETUP_MISC_H +#define GUI_WIDGETS_TABS_SETUP_MISC_H #include "gui/widgets/tabs/setuptabscroll.h" class NamesModel; -class Setup_Other final : public SetupTabScroll +class Setup_Misc final : public SetupTabScroll { public: - explicit Setup_Other(const Widget2 *const widget); + explicit Setup_Misc(const Widget2 *const widget); - A_DELETE_COPY(Setup_Other) + A_DELETE_COPY(Setup_Misc) - ~Setup_Other(); + ~Setup_Misc(); void apply() override final; @@ -46,4 +46,4 @@ class Setup_Other final : public SetupTabScroll NamesModel *mDensityList; }; -#endif // GUI_WIDGETS_TABS_SETUP_OTHER_H +#endif // GUI_WIDGETS_TABS_SETUP_MISC_H diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 6228ecd45..eeb86ce7d 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -36,8 +36,8 @@ #include "gui/widgets/tabs/setup_colors.h" #include "gui/widgets/tabs/setup_input.h" #include "gui/widgets/tabs/setup_joystick.h" +#include "gui/widgets/tabs/setup_misc.h" #include "gui/widgets/tabs/setup_mods.h" -#include "gui/widgets/tabs/setup_other.h" #include "gui/widgets/tabs/setup_perfomance.h" #include "gui/widgets/tabs/setup_players.h" #include "gui/widgets/tabs/setup_quick.h" @@ -142,7 +142,7 @@ void SetupWindow::postInit() mTabs.push_back(new Setup_Players(this)); mTabs.push_back(new Setup_Relations(this)); mTabs.push_back(new Setup_Theme(this)); - mTabs.push_back(new Setup_Other(this)); + mTabs.push_back(new Setup_Misc(this)); FOR_EACH (std::list<SetupTab*>::const_iterator, i, mTabs) { |