From 2256b4b8eab5944a246ae4a36b9158461ce95676 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 28 Mar 2022 12:24:36 +0300 Subject: [PATCH] Moved number parsing to Ui::TimePart class. --- ui/widgets/time_input.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ui/widgets/time_input.cpp b/ui/widgets/time_input.cpp index e7c3178..2cf825e 100644 --- a/ui/widgets/time_input.cpp +++ b/ui/widgets/time_input.cpp @@ -55,8 +55,10 @@ public: void setMaxValue(int value); void setWheelStep(int value); - rpl::producer<> erasePrevious() const; - rpl::producer putNext() const; + [[nodiscard]] rpl::producer<> erasePrevious() const; + [[nodiscard]] rpl::producer putNext() const; + + [[nodiscard]] std::optional number(); protected: void keyPressEvent(QKeyEvent *e) override; @@ -77,8 +79,8 @@ private: }; -std::optional Number(not_null field) { - const auto text = field->getLastText(); +std::optional TimePart::number() { + const auto text = getLastText(); auto view = QStringView(text); while (view.size() > 1 && view.at(0) == '0') { view = base::StringViewMid(view, 1); @@ -121,7 +123,7 @@ void TimePart::keyPressEvent(QKeyEvent *e) { void TimePart::wheelEvent(QWheelEvent *e) { const auto direction = WheelDirection(e); - const auto now = Number(this); + const auto now = number(); if (!now.has_value()) { return; } @@ -307,11 +309,11 @@ bool TimeInput::setFocusFast() { } std::optional TimeInput::hour() const { - return Number(_hour); + return _hour->number(); } std::optional TimeInput::minute() const { - return Number(_minute); + return _minute->number(); } QString TimeInput::valueCurrent() const {