From c42ca3200f0c9a1c17f6d239e99c3e533f67d912 Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 13 May 2015 10:34:00 -0300 Subject: [PATCH] Remove (now) unused ISettings::get/setCenterOnZoom() --- src/app/settings/settings.h | 2 -- src/app/settings/ui_settings_impl.cpp | 12 ------------ src/app/settings/ui_settings_impl.h | 3 --- 3 files changed, 17 deletions(-) diff --git a/src/app/settings/settings.h b/src/app/settings/settings.h index ca611d077..00e59a253 100644 --- a/src/app/settings/settings.h +++ b/src/app/settings/settings.h @@ -44,7 +44,6 @@ namespace app { virtual ~ISettings() { } // General settings - virtual bool getCenterOnZoom() = 0; virtual bool getShowSpriteEditorScrollbars() = 0; virtual RightClickMode getRightClickMode() = 0; virtual bool getGrabAlpha() = 0; @@ -54,7 +53,6 @@ namespace app { virtual tools::Tool* getCurrentTool() = 0; virtual app::ColorSwatches* getColorSwatches() = 0; - virtual void setCenterOnZoom(bool state) = 0; virtual void setShowSpriteEditorScrollbars(bool state) = 0; virtual void setRightClickMode(RightClickMode mode) = 0; virtual void setGrabAlpha(bool state) = 0; diff --git a/src/app/settings/ui_settings_impl.cpp b/src/app/settings/ui_settings_impl.cpp index 08825b290..847390037 100644 --- a/src/app/settings/ui_settings_impl.cpp +++ b/src/app/settings/ui_settings_impl.cpp @@ -78,7 +78,6 @@ UISettingsImpl::UISettingsImpl() : m_currentTool(NULL) , m_colorSwatches(NULL) , m_selectionSettings(new UISelectionSettingsImpl) - , m_centerOnZoom(get_config_bool("Editor", "CenterOnZoom", false)) , m_showSpriteEditorScrollbars(get_config_bool("Options", "ShowScrollbars", true)) , m_grabAlpha(get_config_bool("Options", "GrabAlpha", false)) , m_autoSelectLayer(get_config_bool("Options", "AutoSelectLayer", false)) @@ -94,7 +93,6 @@ UISettingsImpl::UISettingsImpl() UISettingsImpl::~UISettingsImpl() { - set_config_bool("Editor", "CenterOnZoom", m_centerOnZoom); set_config_bool("Options", "ShowScrollbars", m_showSpriteEditorScrollbars); set_config_bool("Options", "GrabAlpha", m_grabAlpha); set_config_bool("Options", "AutoSelectLayer", m_autoSelectLayer); @@ -110,11 +108,6 @@ UISettingsImpl::~UISettingsImpl() ////////////////////////////////////////////////////////////////////// // General settings -bool UISettingsImpl::getCenterOnZoom() -{ - return m_centerOnZoom; -} - bool UISettingsImpl::getShowSpriteEditorScrollbars() { return m_showSpriteEditorScrollbars; @@ -160,11 +153,6 @@ app::ColorSwatches* UISettingsImpl::getColorSwatches() return m_colorSwatches; } -void UISettingsImpl::setCenterOnZoom(bool state) -{ - m_centerOnZoom = state; -} - void UISettingsImpl::setShowSpriteEditorScrollbars(bool state) { m_showSpriteEditorScrollbars = state; diff --git a/src/app/settings/ui_settings_impl.h b/src/app/settings/ui_settings_impl.h index 68f04ae9b..df1ec4976 100644 --- a/src/app/settings/ui_settings_impl.h +++ b/src/app/settings/ui_settings_impl.h @@ -30,7 +30,6 @@ namespace app { ~UISettingsImpl(); // ISettings implementation - bool getCenterOnZoom() override; bool getShowSpriteEditorScrollbars() override; RightClickMode getRightClickMode() override; bool getGrabAlpha() override; @@ -40,7 +39,6 @@ namespace app { tools::Tool* getCurrentTool() override; app::ColorSwatches* getColorSwatches() override; - void setCenterOnZoom(bool state) override; void setShowSpriteEditorScrollbars(bool state) override; void setRightClickMode(RightClickMode mode) override; void setGrabAlpha(bool state) override; @@ -69,7 +67,6 @@ namespace app { app::ColorSwatches* m_colorSwatches; std::vector m_colorSwatchesStore; base::UniquePtr m_selectionSettings; - bool m_centerOnZoom; bool m_showSpriteEditorScrollbars; bool m_grabAlpha; bool m_autoSelectLayer;