rpl::type_erased() -> rpl::type_erased.
This commit is contained in:
@@ -1040,7 +1040,7 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
|
||||
st::infoTopBarScale);
|
||||
_back->setDuration(0);
|
||||
_back->toggleOn(isLayer
|
||||
? _backEnabled.value() | rpl::type_erased()
|
||||
? _backEnabled.value() | rpl::type_erased
|
||||
: rpl::single(true));
|
||||
_back->entity()->addClickHandler([=] {
|
||||
controller->showBackFromStack();
|
||||
|
||||
@@ -952,7 +952,7 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
|
||||
st::infoTopBarScale);
|
||||
_back->setDuration(0);
|
||||
_back->toggleOn(isLayer
|
||||
? _backEnabled.value() | rpl::type_erased()
|
||||
? _backEnabled.value() | rpl::type_erased
|
||||
: rpl::single(true));
|
||||
_back->entity()->addClickHandler([=] {
|
||||
controller->showBackFromStack();
|
||||
|
||||
@@ -307,7 +307,7 @@ void CreateGiveawayBox(
|
||||
return rpl::combine(
|
||||
state->typeValue.value(),
|
||||
state->toAwardAmountChanged.events_starting_with(
|
||||
rpl::empty_value()) | rpl::type_erased()
|
||||
rpl::empty_value()) | rpl::type_erased
|
||||
) | rpl::map([=](GiveawayType type, auto) {
|
||||
return (type == GiveawayType::Credits) || !isSpecificUsers();
|
||||
});
|
||||
@@ -323,7 +323,7 @@ void CreateGiveawayBox(
|
||||
tr::lng_giveaway_award()),
|
||||
rpl::conditional(
|
||||
isPrepaidCredits
|
||||
? rpl::single(true) | rpl::type_erased()
|
||||
? rpl::single(true) | rpl::type_erased
|
||||
: state->typeValue.value() | rpl::map(
|
||||
rpl::mappers::_1 == GiveawayType::Credits),
|
||||
(peer->isMegagroup()
|
||||
@@ -1144,20 +1144,20 @@ void CreateGiveawayBox(
|
||||
Ui::AddSkip(additionalWrap);
|
||||
|
||||
auto monthsValue = prepaid
|
||||
? (rpl::single(prepaid->months) | rpl::type_erased())
|
||||
? (rpl::single(prepaid->months) | rpl::type_erased)
|
||||
: state->chosenMonths.value();
|
||||
const auto usersCountByType = [=](GiveawayType type) {
|
||||
if (!isSpecificUsers()) {
|
||||
return state->sliderValue.value() | rpl::type_erased();
|
||||
return state->sliderValue.value() | rpl::type_erased;
|
||||
}
|
||||
return state->toAwardAmountChanged.events_starting_with_copy(
|
||||
rpl::empty
|
||||
) | rpl::map([=] {
|
||||
return int(state->selectedToAward.size());
|
||||
}) | rpl::type_erased();
|
||||
}) | rpl::type_erased;
|
||||
};
|
||||
auto usersCountValue = prepaid
|
||||
? (rpl::single(prepaid->quantity) | rpl::type_erased())
|
||||
? (rpl::single(prepaid->quantity) | rpl::type_erased)
|
||||
: state->typeValue.value(
|
||||
) | rpl::map(usersCountByType) | rpl::flatten_latest();
|
||||
|
||||
@@ -1354,7 +1354,7 @@ void CreateGiveawayBox(
|
||||
tr::lng_giveaway_start(),
|
||||
tr::lng_giveaway_award()),
|
||||
(prepaid && prepaid->boosts)
|
||||
? rpl::single(prepaid->boosts) | rpl::type_erased()
|
||||
? rpl::single(prepaid->boosts) | rpl::type_erased
|
||||
: rpl::conditional(
|
||||
state->typeValue.value(
|
||||
) | rpl::map(rpl::mappers::_1 == GiveawayType::Credits),
|
||||
|
||||
@@ -393,7 +393,7 @@ void InnerWidget::fill() {
|
||||
);
|
||||
|
||||
auto creditsStateValue = bot
|
||||
? rpl::single(Data::CreditsEarnStatistics()) | rpl::type_erased()
|
||||
? rpl::single(Data::CreditsEarnStatistics()) | rpl::type_erased
|
||||
: rpl::single(creditsData) | rpl::then(
|
||||
_stateUpdated.events(
|
||||
) | rpl::map([this] { return _state.creditsEarn; })
|
||||
|
||||
@@ -100,7 +100,7 @@ rpl::producer<bool> Provider::hasSelectRestrictionChanges() {
|
||||
: Data::PeerFlagValue(
|
||||
channel,
|
||||
ChannelDataFlag::NoForwards
|
||||
) | rpl::type_erased();
|
||||
) | rpl::type_erased;
|
||||
|
||||
auto rights = chat
|
||||
? chat->adminRightsValue()
|
||||
|
||||
@@ -1151,7 +1151,7 @@ rpl::producer<not_null<DocumentData*>> GiftStickerValue(
|
||||
packs.load();
|
||||
if (const auto result = packs.lookup(months)) {
|
||||
return result->sticker()
|
||||
? (rpl::single(not_null(result)) | rpl::type_erased())
|
||||
? (rpl::single(not_null(result)) | rpl::type_erased)
|
||||
: rpl::never<not_null<DocumentData*>>();
|
||||
}
|
||||
return packs.updated(
|
||||
@@ -1161,9 +1161,9 @@ rpl::producer<not_null<DocumentData*>> GiftStickerValue(
|
||||
return document && document->sticker();
|
||||
}) | rpl::take(1) | rpl::map([=](DocumentData *document) {
|
||||
return not_null(document);
|
||||
}) | rpl::type_erased();
|
||||
}) | rpl::type_erased;
|
||||
}, [&](GiftTypeStars data) {
|
||||
return rpl::single(data.info.document) | rpl::type_erased();
|
||||
return rpl::single(data.info.document) | rpl::type_erased;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -2174,7 +2174,7 @@ void DetailsFiller::addReportReaction(
|
||||
Info::Profile::IsContactValue(user),
|
||||
forceHidden->value(),
|
||||
!rpl::mappers::_1 && !rpl::mappers::_2
|
||||
) | rpl::type_erased()
|
||||
) | rpl::type_erased
|
||||
: (forceHidden->value() | rpl::map(!rpl::mappers::_1));
|
||||
const auto sent = [=] {
|
||||
*forceHidden = true;
|
||||
|
||||
@@ -1856,7 +1856,7 @@ void TopBar::setupButtons(
|
||||
_back->QWidget::show();
|
||||
_back->setDuration(0);
|
||||
_back->toggleOn(isLayer || isSide
|
||||
? (_backToggles.value() | rpl::type_erased())
|
||||
? (_backToggles.value() | rpl::type_erased)
|
||||
: rpl::single(wrap == Wrap::Narrow));
|
||||
_back->entity()->clicks() | rpl::to_empty | rpl::start_to_stream(
|
||||
_backClicks,
|
||||
|
||||
@@ -65,9 +65,9 @@ auto PlainPrimaryUsernameValue(not_null<PeerData*> peer) {
|
||||
peer
|
||||
) | rpl::map([=](std::vector<TextWithEntities> usernames) {
|
||||
if (!usernames.empty()) {
|
||||
return rpl::single(usernames.front().text) | rpl::type_erased();
|
||||
return rpl::single(usernames.front().text) | rpl::type_erased;
|
||||
} else {
|
||||
return PlainUsernameValue(peer) | rpl::type_erased();
|
||||
return PlainUsernameValue(peer) | rpl::type_erased;
|
||||
}
|
||||
}) | rpl::flatten_latest();
|
||||
}
|
||||
@@ -161,7 +161,7 @@ rpl::producer<TextWithEntities> UsernameValue(
|
||||
bool primary) {
|
||||
return (primary
|
||||
? PlainPrimaryUsernameValue(peer)
|
||||
: (PlainUsernameValue(peer) | rpl::type_erased())
|
||||
: (PlainUsernameValue(peer) | rpl::type_erased)
|
||||
) | rpl::map([](QString &&username) {
|
||||
return username.isEmpty()
|
||||
? QString()
|
||||
@@ -260,7 +260,7 @@ rpl::producer<LinkWithUrl> LinkValue(
|
||||
MsgId rootId) {
|
||||
return (primary
|
||||
? PlainPrimaryUsernameValue(peer)
|
||||
: PlainUsernameValue(peer) | rpl::type_erased()
|
||||
: PlainUsernameValue(peer) | rpl::type_erased
|
||||
) | rpl::map([=](QString &&username) {
|
||||
if (username.isEmpty()) {
|
||||
if (const auto topic
|
||||
|
||||
@@ -44,7 +44,7 @@ void SetupSavedMusic(
|
||||
1
|
||||
) | rpl::map([=](const Data::SavedMusicSlice &data) {
|
||||
return data.size() ? data[0].get() : nullptr;
|
||||
}) | rpl::type_erased()
|
||||
}) | rpl::type_erased
|
||||
: rpl::single<HistoryItem*>((HistoryItem*)(nullptr));
|
||||
|
||||
const auto divider = container->add(
|
||||
|
||||
Reference in New Issue
Block a user