From c4fe2f86eaca82f874634c081f1aff3493777dbc Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Wed, 20 Dec 2017 04:09:49 +0200 Subject: [PATCH] Add explicit typecasting for some constants --- Telegram/SourceFiles/boxes/stickers_box.cpp | 6 +++++- Telegram/SourceFiles/facades.h | 14 +++++++------- Telegram/SourceFiles/media/media_audio.cpp | 4 ++-- .../SourceFiles/media/media_clip_ffmpeg.cpp | 2 +- .../SourceFiles/media/media_clip_qtgif.cpp | 2 +- .../SourceFiles/media/media_clip_reader.cpp | 2 +- .../media/player/media_player_cover.cpp | 4 ++-- .../media/player/media_player_widget.cpp | 4 ++-- .../media/view/media_clip_controller.cpp | 4 ++-- .../SourceFiles/storage/file_download.cpp | 2 +- Telegram/SourceFiles/ui/animation.h | 19 ++++++++++--------- .../ui/effects/send_action_animations.h | 2 +- 12 files changed, 35 insertions(+), 30 deletions(-) diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp index bbf5afd17..a1b0cb504 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.cpp +++ b/Telegram/SourceFiles/boxes/stickers_box.cpp @@ -485,7 +485,11 @@ bool StickersBox::installFail(quint64 setId, const RPCError &error) { void StickersBox::preloadArchivedSets() { if (!_tabs) return; if (!_archivedRequestId) { - _archivedRequestId = MTP::send(MTPmessages_GetArchivedStickers(MTP_flags(0), MTP_long(0), MTP_int(kArchivedLimitFirstRequest)), rpcDone(&StickersBox::getArchivedDone, 0ULL)); + _archivedRequestId = + MTP::send(MTPmessages_GetArchivedStickers(MTP_flags(0), + MTP_long(0), + MTP_int(kArchivedLimitFirstRequest)), + rpcDone(&StickersBox::getArchivedDone, Q_UINT64_C(0))); } } diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h index 6472d49f5..dc27836cc 100644 --- a/Telegram/SourceFiles/facades.h +++ b/Telegram/SourceFiles/facades.h @@ -242,13 +242,13 @@ enum Flags { namespace Stickers { constexpr auto DefaultSetId = 0; // for backward compatibility -constexpr auto CustomSetId = 0xFFFFFFFFFFFFFFFFULL; -constexpr auto RecentSetId = 0xFFFFFFFFFFFFFFFEULL; // for emoji/stickers panel, should not appear in Sets -constexpr auto NoneSetId = 0xFFFFFFFFFFFFFFFDULL; // for emoji/stickers panel, should not appear in Sets -constexpr auto CloudRecentSetId = 0xFFFFFFFFFFFFFFFCULL; // for cloud-stored recent stickers -constexpr auto FeaturedSetId = 0xFFFFFFFFFFFFFFFBULL; // for emoji/stickers panel, should not appear in Sets -constexpr auto FavedSetId = 0xFFFFFFFFFFFFFFFAULL; // for cloud-stored faved stickers -constexpr auto MegagroupSetId = 0xFFFFFFFFFFFFFFEFULL; // for setting up megagroup sticker set +constexpr auto CustomSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFFF); +constexpr auto RecentSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFFE); // for emoji/stickers panel, should not appear in Sets +constexpr auto NoneSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFFD); // for emoji/stickers panel, should not appear in Sets +constexpr auto CloudRecentSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFFC); // for cloud-stored recent stickers +constexpr auto FeaturedSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFFB); // for emoji/stickers panel, should not appear in Sets +constexpr auto FavedSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFFA); // for cloud-stored faved stickers +constexpr auto MegagroupSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFEF); // for setting up megagroup sticker set struct Set { Set(quint64 id, quint64 access, const QString &title, const QString &shortName, qint32 count, qint32 hash, MTPDstickerSet::Flags flags) : id(id) diff --git a/Telegram/SourceFiles/media/media_audio.cpp b/Telegram/SourceFiles/media/media_audio.cpp index 1d38bba9b..a3eba9794 100644 --- a/Telegram/SourceFiles/media/media_audio.cpp +++ b/Telegram/SourceFiles/media/media_audio.cpp @@ -317,7 +317,7 @@ void Mixer::Track::reattach(AudioMsgId::Type type) { alSourceQueueBuffers(stream.source, 1, stream.buffers + i); } - alSourcei(stream.source, AL_SAMPLE_OFFSET, qMax(state.position - bufferedPosition, 0LL)); + alSourcei(stream.source, AL_SAMPLE_OFFSET, qMax(state.position - bufferedPosition, Q_INT64_C(0))); if (!IsStopped(state.state) && state.state != State::PausedAtEnd) { alSourcef(stream.source, AL_GAIN, ComputeVolume(type)); alSourcePlay(stream.source); @@ -830,7 +830,7 @@ void Mixer::resume(const AudioMsgId &audio, bool fast) { Audio::AttachToDevice(); if (track->state.state == State::PausedAtEnd) { if (track->isStreamCreated()) { - alSourcei(track->stream.source, AL_SAMPLE_OFFSET, qMax(track->state.position - track->bufferedPosition, 0LL)); + alSourcei(track->stream.source, AL_SAMPLE_OFFSET, qMax(track->state.position - track->bufferedPosition, Q_INT64_C(0))); if (!checkCurrentALError(type)) return; } } diff --git a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp index c1667402b..9ee203e38 100644 --- a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp +++ b/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp @@ -211,7 +211,7 @@ TimeMs FFMpegReaderImplementation::frameRealTime() const { } TimeMs FFMpegReaderImplementation::framePresentationTime() const { - return qMax(_frameTime + _frameTimeCorrection, 0LL); + return qMax(_frameTime + _frameTimeCorrection, Q_INT64_C(0)); } TimeMs FFMpegReaderImplementation::durationMs() const { diff --git a/Telegram/SourceFiles/media/media_clip_qtgif.cpp b/Telegram/SourceFiles/media/media_clip_qtgif.cpp index ad700d8c6..8b2296fff 100644 --- a/Telegram/SourceFiles/media/media_clip_qtgif.cpp +++ b/Telegram/SourceFiles/media/media_clip_qtgif.cpp @@ -47,7 +47,7 @@ TimeMs QtGifReaderImplementation::frameRealTime() const { } TimeMs QtGifReaderImplementation::framePresentationTime() const { - return qMax(_frameTime, 0LL); + return qMax(_frameTime, Q_INT64_C(0)); } ReaderImplementation::ReadResult QtGifReaderImplementation::readNextFrame() { diff --git a/Telegram/SourceFiles/media/media_clip_reader.cpp b/Telegram/SourceFiles/media/media_clip_reader.cpp index 78b804092..e7831f515 100644 --- a/Telegram/SourceFiles/media/media_clip_reader.cpp +++ b/Telegram/SourceFiles/media/media_clip_reader.cpp @@ -775,7 +775,7 @@ void Manager::process() { _processingInThread = thread(); bool checkAllReaders = false; - auto ms = getms(), minms = ms + 86400 * 1000LL; + auto ms = getms(), minms = ms + 86400 * Q_INT64_C(1000); { QMutexLocker lock(&_readerPointersMutex); for (auto it = _readerPointers.begin(), e = _readerPointers.end(); it != e; ++it) { diff --git a/Telegram/SourceFiles/media/player/media_player_cover.cpp b/Telegram/SourceFiles/media/player/media_player_cover.cpp index 15a589e55..c22a35c38 100644 --- a/Telegram/SourceFiles/media/player/media_player_cover.cpp +++ b/Telegram/SourceFiles/media/player/media_player_cover.cpp @@ -154,7 +154,7 @@ void CoverWidget::setCloseCallback(ButtonCallback &&callback) { void CoverWidget::handleSeekProgress(double progress) { if (!_lastDurationMs) return; - auto positionMs = snap(static_cast(progress * _lastDurationMs), 0LL, _lastDurationMs); + auto positionMs = snap(static_cast(progress * _lastDurationMs), Q_INT64_C(0), _lastDurationMs); if (_seekPositionMs != positionMs) { _seekPositionMs = positionMs; updateTimeLabel(); @@ -165,7 +165,7 @@ void CoverWidget::handleSeekProgress(double progress) { void CoverWidget::handleSeekFinished(double progress) { if (!_lastDurationMs) return; - auto positionMs = snap(static_cast(progress * _lastDurationMs), 0LL, _lastDurationMs); + auto positionMs = snap(static_cast(progress * _lastDurationMs), Q_INT64_C(0), _lastDurationMs); _seekPositionMs = -1; auto type = AudioMsgId::Type::Song; diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp index aefe70db8..9933be875 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.cpp +++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp @@ -236,7 +236,7 @@ Widget::~Widget() = default; void Widget::handleSeekProgress(double progress) { if (!_lastDurationMs) return; - auto positionMs = snap(static_cast(progress * _lastDurationMs), 0LL, _lastDurationMs); + auto positionMs = snap(static_cast(progress * _lastDurationMs), Q_INT64_C(0), _lastDurationMs); if (_seekPositionMs != positionMs) { _seekPositionMs = positionMs; updateTimeLabel(); @@ -248,7 +248,7 @@ void Widget::handleSeekProgress(double progress) { void Widget::handleSeekFinished(double progress) { if (!_lastDurationMs) return; - auto positionMs = snap(static_cast(progress * _lastDurationMs), 0LL, _lastDurationMs); + auto positionMs = snap(static_cast(progress * _lastDurationMs), Q_INT64_C(0), _lastDurationMs); _seekPositionMs = -1; auto state = mixer()->currentState(_type); diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_controller.cpp index d93daa833..b286e71f7 100644 --- a/Telegram/SourceFiles/media/view/media_clip_controller.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_controller.cpp @@ -70,7 +70,7 @@ Controller::Controller(QWidget *parent) : TWidget(parent) void Controller::handleSeekProgress(double progress) { if (!_lastDurationMs) return; - auto positionMs = snap(static_cast(progress * _lastDurationMs), 0LL, _lastDurationMs); + auto positionMs = snap(static_cast(progress * _lastDurationMs), Q_INT64_C(0), _lastDurationMs); if (_seekPositionMs != positionMs) { _seekPositionMs = positionMs; refreshTimeTexts(); @@ -81,7 +81,7 @@ void Controller::handleSeekProgress(double progress) { void Controller::handleSeekFinished(double progress) { if (!_lastDurationMs) return; - auto positionMs = snap(static_cast(progress * _lastDurationMs), 0LL, _lastDurationMs); + auto positionMs = snap(static_cast(progress * _lastDurationMs), Q_INT64_C(0), _lastDurationMs); _seekPositionMs = -1; emit seekFinished(positionMs); refreshTimeTexts(); diff --git a/Telegram/SourceFiles/storage/file_download.cpp b/Telegram/SourceFiles/storage/file_download.cpp index cf1a36105..7e4e4977b 100644 --- a/Telegram/SourceFiles/storage/file_download.cpp +++ b/Telegram/SourceFiles/storage/file_download.cpp @@ -1001,7 +1001,7 @@ public: if (!redirect.isEmpty()) _url = redirect; QNetworkRequest req(_url); - QByteArray rangeHeaderValue = "bytes=" + QByteArray::number(_already) + "-"; + QByteArray rangeHeaderValue = "bytes=" + QByteArray::number(static_cast(_already)) + "-"; req.setRawHeader("Range", rangeHeaderValue); _reply = manager.get(req); return _reply; diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h index a55c647e7..b0beec638 100644 --- a/Telegram/SourceFiles/ui/animation.h +++ b/Telegram/SourceFiles/ui/animation.h @@ -23,6 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/basic_types.h" #include #include +#include namespace Media { namespace Clip { @@ -280,21 +281,21 @@ FORCE_INLINE Shifted operator*(ShiftedMultiplier multiplier, Shifted shifted) { FORCE_INLINE Shifted shifted(quint32 components) { auto wide = static_cast(components); - return (wide & 0x00000000000000FFULL) - | ((wide & 0x000000000000FF00ULL) << 8) - | ((wide & 0x0000000000FF0000ULL) << 16) - | ((wide & 0x00000000FF000000ULL) << 24); + return (wide & Q_UINT64_C(0x00000000000000FF)) + | ((wide & Q_UINT64_C(0x000000000000FF00)) << 8) + | ((wide & Q_UINT64_C(0x0000000000FF0000)) << 16) + | ((wide & Q_UINT64_C(0x00000000FF000000)) << 24); } FORCE_INLINE quint32 unshifted(Shifted components) { - return static_cast((components.value & 0x000000000000FF00ULL) >> 8) - | static_cast((components.value & 0x00000000FF000000ULL) >> 16) - | static_cast((components.value & 0x0000FF0000000000ULL) >> 24) - | static_cast((components.value & 0xFF00000000000000ULL) >> 32); + return static_cast((components.value & Q_UINT64_C(0x000000000000FF00)) >> 8) + | static_cast((components.value & Q_UINT64_C(0x00000000FF000000)) >> 16) + | static_cast((components.value & Q_UINT64_C(0x0000FF0000000000)) >> 24) + | static_cast((components.value & Q_UINT64_C(0xFF00000000000000)) >> 32); } FORCE_INLINE Shifted reshifted(Shifted components) { - return (components.value >> 8) & 0x00FF00FF00FF00FFULL; + return (components.value >> 8) & Q_UINT64_C(0x00FF00FF00FF00FF); } FORCE_INLINE Shifted shifted(QColor color) { diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.h b/Telegram/SourceFiles/ui/effects/send_action_animations.h index c41e8cbcb..1cc187033 100644 --- a/Telegram/SourceFiles/ui/effects/send_action_animations.h +++ b/Telegram/SourceFiles/ui/effects/send_action_animations.h @@ -58,7 +58,7 @@ public: virtual int width() const = 0; void paint(Painter &p, style::color color, int x, int y, int outerWidth, TimeMs ms) { - paintFrame(p, color, x, y, outerWidth, qMax(ms - _started, 0LL) % _period); + paintFrame(p, color, x, y, outerWidth, qMax(ms - _started, Q_INT64_C(0)) % _period); } virtual ~Impl() = default;