From 941b306f7a645890ccb095bd4cae28b91b202fb4 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Mon, 20 Nov 2017 22:27:21 +0200 Subject: [PATCH] Suppress warnings for unhandled enum values --- Telegram/SourceFiles/app.cpp | 1 + Telegram/SourceFiles/profile/profile_block_shared_media.cpp | 1 + Telegram/SourceFiles/settings.h | 4 ++++ .../SourceFiles/settings/settings_chat_settings_widget.cpp | 1 + Telegram/SourceFiles/settings/settings_scale_widget.cpp | 2 ++ Telegram/SourceFiles/ui/style/style_core_icon.cpp | 1 + Telegram/SourceFiles/ui/text/text.cpp | 1 + Telegram/SourceFiles/ui/text/text_entity.cpp | 1 + 8 files changed, 12 insertions(+) diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index 3d4402b11..6cc03e552 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -1468,6 +1468,7 @@ namespace { return nullptr; } } break; + case PeerData::NotLoaded: break; } return i.value(); } diff --git a/Telegram/SourceFiles/profile/profile_block_shared_media.cpp b/Telegram/SourceFiles/profile/profile_block_shared_media.cpp index 98955b293..2aa7a718c 100644 --- a/Telegram/SourceFiles/profile/profile_block_shared_media.cpp +++ b/Telegram/SourceFiles/profile/profile_block_shared_media.cpp @@ -43,6 +43,7 @@ QString getButtonText(MediaOverviewType type, int count) { case OverviewFiles: return lng_profile_files(lt_count, count); case OverviewVoiceFiles: return lng_profile_audios(lt_count, count); case OverviewLinks: return lng_profile_shared_links(lt_count, count); + case OverviewChatPhotos: case OverviewCount: return QString(); // temp } return QString(); } diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h index e2de77ff3..d5f724251 100644 --- a/Telegram/SourceFiles/settings.h +++ b/Telegram/SourceFiles/settings.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + void InitFromCommandLine(int argc, char *argv[]); extern bool gDebug; @@ -144,6 +146,8 @@ T convertScale(T v) { case dbisOneAndQuarter: return qRound(float64(v) * 1.25 - 0.01); case dbisOneAndHalf: return qRound(float64(v) * 1.5 - 0.01); case dbisTwo: return v * 2; + case dbisAuto: case dbisOne: return v; + case dbisScaleCount: assert(false); // temp } return v; } diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp index b6124ba7a..264e07a51 100644 --- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp @@ -91,6 +91,7 @@ void DownloadPathState::paintEvent(QPaintEvent *e) { case State::Clearing: return lang(lng_download_path_clearing); case State::Cleared: return lang(lng_download_path_cleared); case State::ClearFailed: return lang(lng_download_path_clear_failed); + case State::Empty: case State::Exists: assert(false); // temp } return QString(); })(); diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.cpp b/Telegram/SourceFiles/settings/settings_scale_widget.cpp index 698b76e7a..8cac93601 100644 --- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_scale_widget.cpp @@ -39,6 +39,7 @@ QString scaleLabel(DBIScale scale) { case dbisOneAndQuarter: return qsl("125%"); case dbisOneAndHalf: return qsl("150%"); case dbisTwo: return qsl("200%"); + case dbisAuto: case dbisScaleCount: assert(false); // temp } return QString(); } @@ -74,6 +75,7 @@ void ScaleWidget::onAutoChanged() { case dbisOneAndQuarter: newScale = dbisOne; break; case dbisOneAndHalf: newScale = dbisOneAndQuarter; break; case dbisTwo: newScale = dbisOneAndHalf; break; + case dbisAuto: case dbisScaleCount: assert(false); // temp } } } diff --git a/Telegram/SourceFiles/ui/style/style_core_icon.cpp b/Telegram/SourceFiles/ui/style/style_core_icon.cpp index 5a7fb16a0..a70305190 100644 --- a/Telegram/SourceFiles/ui/style/style_core_icon.cpp +++ b/Telegram/SourceFiles/ui/style/style_core_icon.cpp @@ -96,6 +96,7 @@ QSize readGeneratedSize(const IconMask *mask, DBIScale scale) { case dbisOneAndQuarter: return QSize(pxAdjust(width, 5), pxAdjust(height, 5)); case dbisOneAndHalf: return QSize(pxAdjust(width, 6), pxAdjust(height, 6)); case dbisTwo: return QSize(width * 2, height * 2); + case dbisAuto: case dbisScaleCount: assert(false); // temp } } else { Unexpected("Bad data in generated icon!"); diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp index 18a3b7b3f..02d06e676 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -595,6 +595,7 @@ public: auto &link = links[lnkIndex - maxLnkIndex - 1]; ClickHandlerPtr handler; switch (link.type) { + case EntityInTextInvalid: case EntityInTextBold: case EntityInTextItalic: assert(false); // temp case EntityInTextCustomUrl: handler = MakeShared(link.data); break; case EntityInTextEmail: case EntityInTextUrl: handler = MakeShared(link.data, link.displayStatus == LinkDisplayedFull); break; diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp index cdb8c81b6..df84ad72f 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.cpp +++ b/Telegram/SourceFiles/ui/text/text_entity.cpp @@ -1514,6 +1514,7 @@ MTPVector EntitiesToMTP(const EntitiesInText &entities, Conver auto offset = MTP_int(entity.offset()); auto length = MTP_int(entity.length()); switch (entity.type()) { + case EntityInTextInvalid: assert(false); // temp case EntityInTextUrl: v.push_back(MTP_messageEntityUrl(offset, length)); break; case EntityInTextCustomUrl: v.push_back(MTP_messageEntityTextUrl(offset, length, MTP_string(entity.data()))); break; case EntityInTextEmail: v.push_back(MTP_messageEntityEmail(offset, length)); break;