Version 4.14.7: Fix build with GCC.
This commit is contained in:
		
							parent
							
								
									37478d951a
								
							
						
					
					
						commit
						d55dd7dffd
					
				
					 5 changed files with 1 additions and 15 deletions
				
			
		| 
						 | 
					@ -59,7 +59,6 @@ void CreateRadiobuttonLock(
 | 
				
			||||||
		const auto &icon = st::messagePrivacyLock;
 | 
							const auto &icon = st::messagePrivacyLock;
 | 
				
			||||||
		const auto size = st::defaultRadio.diameter;
 | 
							const auto size = st::defaultRadio.diameter;
 | 
				
			||||||
		const auto image = icon.instance(st::checkboxFg->c);
 | 
							const auto image = icon.instance(st::checkboxFg->c);
 | 
				
			||||||
		const auto dimensions = image.size();
 | 
					 | 
				
			||||||
		p.drawImage(QRectF(
 | 
							p.drawImage(QRectF(
 | 
				
			||||||
			(size - icon.width()) / 2.,
 | 
								(size - icon.width()) / 2.,
 | 
				
			||||||
			(size - icon.height()) / 2.,
 | 
								(size - icon.height()) / 2.,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -82,7 +82,6 @@ public:
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	[[nodiscard]] static LastseenStatus FromLegacy(int32 value) {
 | 
						[[nodiscard]] static LastseenStatus FromLegacy(int32 value) {
 | 
				
			||||||
		auto result = LastseenStatus();
 | 
					 | 
				
			||||||
		if (value == -2) {
 | 
							if (value == -2) {
 | 
				
			||||||
			return LastseenStatus::Recently();
 | 
								return LastseenStatus::Recently();
 | 
				
			||||||
		} else if (value == -3) {
 | 
							} else if (value == -3) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -99,7 +99,6 @@ TextWithEntities PremiumRequiredBox::subtitle() {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ClickHandlerPtr PremiumRequiredBox::createViewLink() {
 | 
					ClickHandlerPtr PremiumRequiredBox::createViewLink() {
 | 
				
			||||||
	const auto itemId = _parent->data()->fullId();
 | 
					 | 
				
			||||||
	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 | 
						return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 | 
				
			||||||
		const auto my = context.other.value<ClickHandlerContext>();
 | 
							const auto my = context.other.value<ClickHandlerContext>();
 | 
				
			||||||
		if (const auto controller = my.sessionWindow.get()) {
 | 
							if (const auto controller = my.sessionWindow.get()) {
 | 
				
			||||||
| 
						 | 
					@ -112,8 +111,6 @@ void PremiumRequiredBox::draw(
 | 
				
			||||||
		Painter &p,
 | 
							Painter &p,
 | 
				
			||||||
		const PaintContext &context,
 | 
							const PaintContext &context,
 | 
				
			||||||
		const QRect &geometry) {
 | 
							const QRect &geometry) {
 | 
				
			||||||
	const auto padding = (geometry.width() - st::premiumRequiredCircle) / 2;
 | 
					 | 
				
			||||||
	const auto size = geometry.width() - 2 * padding;
 | 
					 | 
				
			||||||
	p.setBrush(context.st->msgServiceBg()); // ?
 | 
						p.setBrush(context.st->msgServiceBg()); // ?
 | 
				
			||||||
	p.setPen(Qt::NoPen);
 | 
						p.setPen(Qt::NoPen);
 | 
				
			||||||
	p.drawEllipse(geometry);
 | 
						p.drawEllipse(geometry);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -187,7 +187,6 @@ void ShowOrPremiumBox(
 | 
				
			||||||
		box.get(),
 | 
							box.get(),
 | 
				
			||||||
		Premium::ButtonGradientStops());
 | 
							Premium::ButtonGradientStops());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	const auto &st = st::premiumPreviewBox.button;
 | 
					 | 
				
			||||||
	premium->resize(st::showOrShowButton.width, st::showOrShowButton.height);
 | 
						premium->resize(st::showOrShowButton.width, st::showOrShowButton.height);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	const auto label = CreateChild<FlatLabel>(
 | 
						const auto label = CreateChild<FlatLabel>(
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -520,8 +520,6 @@ WhenAction::WhenAction(
 | 
				
			||||||
	std::move(
 | 
						std::move(
 | 
				
			||||||
		content
 | 
							content
 | 
				
			||||||
	) | rpl::start_with_next([=](WhoReadContent &&content) {
 | 
						) | rpl::start_with_next([=](WhoReadContent &&content) {
 | 
				
			||||||
		const auto changed = (_content.participants != content.participants)
 | 
					 | 
				
			||||||
			|| (_content.state != content.state);
 | 
					 | 
				
			||||||
		_content = content;
 | 
							_content = content;
 | 
				
			||||||
		refreshText();
 | 
							refreshText();
 | 
				
			||||||
		refreshDimensions();
 | 
							refreshDimensions();
 | 
				
			||||||
| 
						 | 
					@ -630,12 +628,6 @@ void WhenAction::paint(Painter &p) {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void WhenAction::refreshText() {
 | 
					void WhenAction::refreshText() {
 | 
				
			||||||
	const auto usersCount = int(_content.participants.size());
 | 
					 | 
				
			||||||
	const auto onlySeenCount = ranges::count(
 | 
					 | 
				
			||||||
		_content.participants,
 | 
					 | 
				
			||||||
		QString(),
 | 
					 | 
				
			||||||
		&WhoReadParticipant::customEntityData);
 | 
					 | 
				
			||||||
	const auto count = std::max(_content.fullReactionsCount, usersCount);
 | 
					 | 
				
			||||||
	_text.setMarkedText(
 | 
						_text.setMarkedText(
 | 
				
			||||||
		st::whenReadStyle,
 | 
							st::whenReadStyle,
 | 
				
			||||||
		{ ((_content.state == WhoReadState::Unknown)
 | 
							{ ((_content.state == WhoReadState::Unknown)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue