Fix build with GCC.
This commit is contained in:
		
							parent
							
								
									45b875f1a1
								
							
						
					
					
						commit
						b14b69272a
					
				
					 8 changed files with 3 additions and 12 deletions
				
			
		|  | @ -389,7 +389,6 @@ void ActivateBotCommand( | |||
| 
 | ||||
| 	case ButtonType::SwitchInlineSame: | ||||
| 	case ButtonType::SwitchInline: { | ||||
| 		const auto session = &item->history()->session(); | ||||
| 		if (const auto bot = item->getMessageBot()) { | ||||
| 			const auto fastSwitchDone = [&] { | ||||
| 				const auto samePeer = (button->type | ||||
|  |  | |||
|  | @ -984,7 +984,6 @@ void StickerSetBox::Inner::visibleTopBottomUpdated( | |||
| 			} | ||||
| 		} | ||||
| 	}; | ||||
| 	const auto count = int(_elements.size()); | ||||
| 	const auto rowsTop = st::stickersPadding.top(); | ||||
| 	const auto singleHeight = _singleSize.height(); | ||||
| 	const auto rowsBottom = rowsTop + _rowsCount * singleHeight; | ||||
|  |  | |||
|  | @ -1204,7 +1204,6 @@ void EmojiListWidget::refreshRecent() { | |||
| } | ||||
| 
 | ||||
| void EmojiListWidget::refreshCustom() { | ||||
| 	auto searchFromIndex = 0; | ||||
| 	auto old = base::take(_custom); | ||||
| 	const auto owner = &controller()->session().data(); | ||||
| 	const auto &order = owner->stickers().emojiSetsOrder(); | ||||
|  | @ -1501,7 +1500,6 @@ std::unique_ptr<Ui::RippleAnimation> EmojiListWidget::createButtonRipple( | |||
| 	Expects(section >= kEmojiSectionCount | ||||
| 		&& section < kEmojiSectionCount + _custom.size()); | ||||
| 
 | ||||
| 	const auto set = section - kEmojiSectionCount; | ||||
| 	auto maskSize = QSize( | ||||
| 		st::stickerPanRemoveSet.rippleAreaSize, | ||||
| 		st::stickerPanRemoveSet.rippleAreaSize); | ||||
|  |  | |||
|  | @ -199,8 +199,6 @@ void StickersListFooter::validatePremiumIcon() const { | |||
| } | ||||
| 
 | ||||
| void StickersListFooter::clearHeavyData() { | ||||
| 	const auto count = int(_icons.size()); | ||||
| 	const auto iconsX = qRound(_iconState.x.current()); | ||||
| 	enumerateIcons([&](const IconInfo &info) { | ||||
| 		auto &icon = _icons[info.index]; | ||||
| 		icon.webm = nullptr; | ||||
|  | @ -960,7 +958,6 @@ void StickersListFooter::refreshIcons( | |||
| } | ||||
| 
 | ||||
| void StickersListFooter::refreshScrollableDimensions() { | ||||
| 	const auto shift = int(base::SafeRound(_iconState.x.current())); | ||||
| 	const auto &last = iconInfo(_icons.size() - 1); | ||||
| 	_iconState.max = std::max( | ||||
| 		last.left + last.width + _iconsRight - width(), | ||||
|  | @ -1004,7 +1001,6 @@ void StickersListFooter::refreshSubiconsGeometry() { | |||
| 	if (_subiconsWidth < widthMax) { | ||||
| 		_subiconsWidth = ((_subiconsWidth - half) / single) * single + half; | ||||
| 	} | ||||
| 	const auto &last = subiconInfo(int(Section::Symbols)); | ||||
| 	_subiconState.max = std::max( | ||||
| 		widthMax - _subiconsWidth, | ||||
| 		0); | ||||
|  |  | |||
|  | @ -135,7 +135,7 @@ int64_t EmojiGenerator::Impl::seek(int64_t offset, int whence) { | |||
| 		switch (whence) { | ||||
| 		case SEEK_SET: return offset; | ||||
| 		case SEEK_CUR: return _deviceOffset + offset; | ||||
| 		case SEEK_END: return _bytes.size() + offset; | ||||
| 		case SEEK_END: return int64_t(_bytes.size()) + offset; | ||||
| 		} | ||||
| 		return int64_t(-1); | ||||
| 	}(); | ||||
|  |  | |||
|  | @ -246,7 +246,6 @@ QRect MediaGift::buttonRect() const { | |||
| } | ||||
| 
 | ||||
| QRect MediaGift::stickerRect() const { | ||||
| 	const auto &padding = st::msgServiceGiftBoxButtonPadding; | ||||
| 	const auto &size = st::msgServiceGiftBoxStickerSize; | ||||
| 	const auto top = st::msgServiceGiftBoxStickerTop; | ||||
| 	return QRect(QPoint((width() - size.width()) / 2, top), size); | ||||
|  |  | |||
|  | @ -197,7 +197,7 @@ if [ "$DeployLinux" == "1" ]; then | |||
|   Files+=("tlinux/$LinuxUpdateFile" "tlinux/$LinuxSetupFile") | ||||
| fi | ||||
| cd $DeployPath | ||||
| rsync -avR --progress ${Files[@]} "$FullScriptPath/../../../DesktopPrivate/remote/files" | ||||
| rsync -avR --no-g --progress ${Files[@]} "$FullScriptPath/../../../DesktopPrivate/remote/files" | ||||
| 
 | ||||
| echo "Version $AppVersionStrFull was deployed!" | ||||
| cd $FullExecPath | ||||
|  |  | |||
|  | @ -1 +1 @@ | |||
| Subproject commit 6294dd74d2dcac11de9cf9c37b7405d90d008236 | ||||
| Subproject commit 2f21e92bbe5c2f6350b22f70d2dc4b0fdda832a9 | ||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 John Preston
						John Preston