From 10be4b1132439738ed0ea54a91e082feb8ced32a Mon Sep 17 00:00:00 2001 From: cartoone Date: Tue, 18 Jun 2024 15:45:09 +0200 Subject: [PATCH] change name of function beacause code to late in night is bad idee --- apps/global_preferences.h | 4 ++-- apps/settings/sub_menu/code_options_controller.cpp | 4 ++-- escher/src/text_area.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/global_preferences.h b/apps/global_preferences.h index dc87d74abb..d7ec32cd74 100644 --- a/apps/global_preferences.h +++ b/apps/global_preferences.h @@ -36,8 +36,8 @@ class GlobalPreferences { void setAutocomplete(bool autocomple) { m_autoComplete = autocomple; } bool syntaxhighlighting() const { return m_syntaxhighlighting; } void setSyntaxhighlighting(bool syntaxhighlight) { m_syntaxhighlighting = syntaxhighlight; } - bool clearalphalockshift() const { return m_clearalphalockshift; } - void setclearalphalockshift(bool clearalphalockshift) { m_clearalphalockshift = clearalphalockshift; } + bool clearshift() const { return m_clearalphalockshift; } + void setclearshift(bool clearalphalockshift) { m_clearalphalockshift = clearalphalockshift; } int brightnessLevel() const { return m_brightnessLevel; } void setBrightnessLevel(int brightnessLevel); const KDFont * font() const { return m_font; } diff --git a/apps/settings/sub_menu/code_options_controller.cpp b/apps/settings/sub_menu/code_options_controller.cpp index 4195e9625f..db595213a6 100644 --- a/apps/settings/sub_menu/code_options_controller.cpp +++ b/apps/settings/sub_menu/code_options_controller.cpp @@ -28,7 +28,7 @@ bool CodeOptionsController::handleEvent(Ion::Events::Event event) { m_selectableTableView.reloadCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); break; case 3: - GlobalPreferences::sharedGlobalPreferences()->setclearalphalockshift(!GlobalPreferences::sharedGlobalPreferences()->clearalphalockshift()); + GlobalPreferences::sharedGlobalPreferences()->setclearshift(!GlobalPreferences::sharedGlobalPreferences()->clearshift()); m_selectableTableView.reloadCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); break; default: @@ -89,7 +89,7 @@ void CodeOptionsController::willDisplayCellForIndex(HighlightCell * cell, int in else if (thisLabel == I18n::Message::Clearshiftlock) { MessageTableCellWithSwitch * mySwitchCell = (MessageTableCellWithSwitch *)cell; SwitchView * mySwitch = (SwitchView *)mySwitchCell->accessoryView(); - mySwitch->setState(GlobalPreferences::sharedGlobalPreferences()->clearalphalockshift()); + mySwitch->setState(GlobalPreferences::sharedGlobalPreferences()->clearshift()); } #endif } diff --git a/escher/src/text_area.cpp b/escher/src/text_area.cpp index 00aa549bc6..1223b4ce95 100644 --- a/escher/src/text_area.cpp +++ b/escher/src/text_area.cpp @@ -250,7 +250,7 @@ bool TextArea::handleEvent(Ion::Events::Event event) { contentView()->resetSelection(); contentView()->moveCursorGeo(0, event == Ion::Events::Up ? -step : step); } else if (event == Ion::Events::Clear) { - if (GlobalPreferences::sharedGlobalPreferences()->clearalphalockshift()) { + if (GlobalPreferences::sharedGlobalPreferences()->clearshift()){ if (!contentView()->selectionIsEmpty()) { deleteSelection(); return true;