diff --git a/Telegram/SourceFiles/api/api_suggest_post.cpp b/Telegram/SourceFiles/api/api_suggest_post.cpp index da195bd856..1aa8921826 100644 --- a/Telegram/SourceFiles/api/api_suggest_post.cpp +++ b/Telegram/SourceFiles/api/api_suggest_post.cpp @@ -83,7 +83,6 @@ void ConfirmApproval( not_null item, TimeId scheduleDate = 0, Fn accepted = nullptr) { - using Flag = MTPmessages_ToggleSuggestedPostApproval::Flag; const auto suggestion = item->Get(); if (!suggestion || suggestion->accepted diff --git a/Telegram/SourceFiles/core/credits_amount.h b/Telegram/SourceFiles/core/credits_amount.h index 12b26239c4..c32d43a1d6 100644 --- a/Telegram/SourceFiles/core/credits_amount.h +++ b/Telegram/SourceFiles/core/credits_amount.h @@ -101,9 +101,21 @@ public: return result; } - friend inline constexpr auto operator<=>(CreditsAmount, CreditsAmount) - = default; - friend inline constexpr bool operator==(CreditsAmount, CreditsAmount) +// AppleClang :/ +// friend inline auto operator<=>(CreditsAmount, CreditsAmount) +// = default; + friend inline constexpr auto operator<=>( + CreditsAmount a, + CreditsAmount b) { + if (const auto r1 = (int(a._ton) <=> int(b._ton)); r1 != 0) { + return r1; + } else if (auto r2 = (a._whole <=> b._whole); r2 != 0) { + return r2; + } + return (a._nano <=> b._nano); + } + + friend inline bool operator==(CreditsAmount, CreditsAmount) = default; [[nodiscard]] CreditsAmount abs() const { diff --git a/Telegram/SourceFiles/history/view/media/history_view_todo_list.cpp b/Telegram/SourceFiles/history/view/media/history_view_todo_list.cpp index a41b10e1a9..ff2003dfdb 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_todo_list.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_todo_list.cpp @@ -256,7 +256,6 @@ void TodoList::updateTexts() { })); } if (_flags != _todolist->flags() || _subtitle.isEmpty()) { - using Flag = PollData::Flag; _flags = _todolist->flags(); _subtitle.setText( st::msgDateTextStyle, diff --git a/Telegram/SourceFiles/ui/controls/ton_common.cpp b/Telegram/SourceFiles/ui/controls/ton_common.cpp index ce36200bad..4f66b4b786 100644 --- a/Telegram/SourceFiles/ui/controls/ton_common.cpp +++ b/Telegram/SourceFiles/ui/controls/ton_common.cpp @@ -81,7 +81,7 @@ std::optional ParseAmountNano(QString trimmed) { auto digitsCount = 0; for (auto i = 0; i != result.text.size();) { const auto ch = result.text[i]; - const auto atSeparator = result.text.midRef(i).startsWith(separator); + const auto atSeparator = QStringView(result.text).mid(i).startsWith(separator); if (ch >= '0' && ch <= '9' && digitsCount < kMaxDigitsCount) { ++i; ++digitsCount;