diff options
Diffstat (limited to 'src/gui/widgets/tabs')
| -rw-r--r-- | src/gui/widgets/tabs/chat/emulateguildtab.cpp | 10 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_audio.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_joystick.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/socialnavigationtab.h | 8 |
4 files changed, 12 insertions, 15 deletions
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp index 4374f6b2c..4e94bf11d 100644 --- a/src/gui/widgets/tabs/chat/emulateguildtab.cpp +++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp @@ -56,16 +56,14 @@ EmulateGuildTab::~EmulateGuildTab() bool EmulateGuildTab::handleCommand(const std::string &restrict type, const std::string &restrict args) { - if (guildManager == nullptr) - return false; if (type == "invite") - guildManager->invite(args); + GuildManager::invite(args); else if (type == "leave") - guildManager->leave(); + GuildManager::leave(); else if (type == "kick") - guildManager->kick(args); + GuildManager::kick(args); else if (type == "notice") - guildManager->notice(args); + GuildManager::notice(args); else return false; diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp index 7a37f2d89..bd8097318 100644 --- a/src/gui/widgets/tabs/setup_audio.cpp +++ b/src/gui/widgets/tabs/setup_audio.cpp @@ -72,14 +72,14 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemSlider(_("Sfx volume"), "", "sfxVolume", - this, "sfxVolumeEvent", 0, soundManager.getMaxVolume(), 1, + this, "sfxVolumeEvent", 0, SoundManager::getMaxVolume(), 1, 150, OnTheFly_true, MainConfig_true); // TRANSLATORS: settings option new SetupItemSlider(_("Music volume"), "", "musicVolume", - this, "musicVolumeEvent", 0, soundManager.getMaxVolume(), 1, + this, "musicVolumeEvent", 0, SoundManager::getMaxVolume(), 1, 150, OnTheFly_true, MainConfig_true); diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp index 490205b4b..84cd60521 100644 --- a/src/gui/widgets/tabs/setup_joystick.cpp +++ b/src/gui/widgets/tabs/setup_joystick.cpp @@ -164,8 +164,7 @@ void Setup_Joystick::setTempEnabled(const bool sel) void Setup_Joystick::cancel() { - if (joystick != nullptr) - joystick->setEnabled(mOriginalJoystickEnabled); + Joystick::setEnabled(mOriginalJoystickEnabled); if (mOriginalJoystickEnabled != mJoystickEnabled->isSelected()) setTempEnabled(mOriginalJoystickEnabled); @@ -178,7 +177,7 @@ void Setup_Joystick::apply() if (joystick == nullptr) return; - config.setValue("joystickEnabled", joystick->isEnabled()); + config.setValue("joystickEnabled", Joystick::isEnabled()); config.setValue("useInactiveJoystick", mUseInactiveCheckBox->isSelected()); joystick->setUseInactive(mUseInactiveCheckBox->isSelected()); diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h index 3bd584991..1b049f055 100644 --- a/src/gui/widgets/tabs/socialnavigationtab.h +++ b/src/gui/widgets/tabs/socialnavigationtab.h @@ -136,8 +136,8 @@ class SocialNavigationTab final : public SocialTab ->findPortalByTile(x, y); if (being != nullptr) { - being->setName(keyboard.getKeyShortString( - outfitWindow->keyName(idx))); + being->setName(KeyboardConfig::getKeyShortString( + OutfitWindow::keyName(idx))); } if (specialLayer != nullptr) @@ -146,8 +146,8 @@ class SocialNavigationTab final : public SocialTab ava->getX(), ava->getY()); if (portal != nullptr) { - portal->setName(keyboard.getKeyShortString( - outfitWindow->keyName(idx))); + portal->setName(KeyboardConfig::getKeyShortString( + OutfitWindow::keyName(idx))); } } } |