Skip to content

Commit 31bce36

Browse files
levlamlevlam
committed
Remove redundant RichText::.
1 parent 0b45c4f commit 31bce36

1 file changed

Lines changed: 61 additions & 62 deletions

File tree

‎td/telegram/WebPageBlock.cpp‎

Lines changed: 61 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -177,76 +177,76 @@ class RichText {
177177
}
178178
case telegram_api::textBold::ID: {
179179
auto rich_text = telegram_api::move_object_as<telegram_api::textBold>(rich_text_ptr);
180-
type = RichText::Type::Bold;
180+
type = Type::Bold;
181181
texts.emplace_back(std::move(rich_text->text_), documents);
182182
break;
183183
}
184184
case telegram_api::textItalic::ID: {
185185
auto rich_text = telegram_api::move_object_as<telegram_api::textItalic>(rich_text_ptr);
186-
type = RichText::Type::Italic;
186+
type = Type::Italic;
187187
texts.emplace_back(std::move(rich_text->text_), documents);
188188
break;
189189
}
190190
case telegram_api::textUnderline::ID: {
191191
auto rich_text = telegram_api::move_object_as<telegram_api::textUnderline>(rich_text_ptr);
192-
type = RichText::Type::Underline;
192+
type = Type::Underline;
193193
texts.emplace_back(std::move(rich_text->text_), documents);
194194
break;
195195
}
196196
case telegram_api::textStrike::ID: {
197197
auto rich_text = telegram_api::move_object_as<telegram_api::textStrike>(rich_text_ptr);
198-
type = RichText::Type::Strikethrough;
198+
type = Type::Strikethrough;
199199
texts.emplace_back(std::move(rich_text->text_), documents);
200200
break;
201201
}
202202
case telegram_api::textFixed::ID: {
203203
auto rich_text = telegram_api::move_object_as<telegram_api::textFixed>(rich_text_ptr);
204-
type = RichText::Type::Fixed;
204+
type = Type::Fixed;
205205
texts.emplace_back(std::move(rich_text->text_), documents);
206206
break;
207207
}
208208
case telegram_api::textUrl::ID: {
209209
auto rich_text = telegram_api::move_object_as<telegram_api::textUrl>(rich_text_ptr);
210-
type = RichText::Type::Url;
210+
type = Type::Url;
211211
content = std::move(rich_text->url_);
212212
texts.emplace_back(std::move(rich_text->text_), documents);
213213
web_page_id = WebPageId(rich_text->webpage_id_);
214214
break;
215215
}
216216
case telegram_api::textEmail::ID: {
217217
auto rich_text = telegram_api::move_object_as<telegram_api::textEmail>(rich_text_ptr);
218-
type = RichText::Type::EmailAddress;
218+
type = Type::EmailAddress;
219219
content = std::move(rich_text->email_);
220220
texts.emplace_back(std::move(rich_text->text_), documents);
221221
break;
222222
}
223223
case telegram_api::textConcat::ID: {
224224
auto rich_text = telegram_api::move_object_as<telegram_api::textConcat>(rich_text_ptr);
225-
type = RichText::Type::Concatenation;
225+
type = Type::Concatenation;
226226
texts = get_rich_texts(std::move(rich_text->texts_), documents);
227227
break;
228228
}
229229
case telegram_api::textSubscript::ID: {
230230
auto rich_text = telegram_api::move_object_as<telegram_api::textSubscript>(rich_text_ptr);
231-
type = RichText::Type::Subscript;
231+
type = Type::Subscript;
232232
texts.emplace_back(std::move(rich_text->text_), documents);
233233
break;
234234
}
235235
case telegram_api::textSuperscript::ID: {
236236
auto rich_text = telegram_api::move_object_as<telegram_api::textSuperscript>(rich_text_ptr);
237-
type = RichText::Type::Superscript;
237+
type = Type::Superscript;
238238
texts.emplace_back(std::move(rich_text->text_), documents);
239239
break;
240240
}
241241
case telegram_api::textMarked::ID: {
242242
auto rich_text = telegram_api::move_object_as<telegram_api::textMarked>(rich_text_ptr);
243-
type = RichText::Type::Marked;
243+
type = Type::Marked;
244244
texts.emplace_back(std::move(rich_text->text_), documents);
245245
break;
246246
}
247247
case telegram_api::textPhone::ID: {
248248
auto rich_text = telegram_api::move_object_as<telegram_api::textPhone>(rich_text_ptr);
249-
type = RichText::Type::PhoneNumber;
249+
type = Type::PhoneNumber;
250250
content = std::move(rich_text->phone_);
251251
texts.emplace_back(std::move(rich_text->text_), documents);
252252
break;
@@ -255,7 +255,7 @@ class RichText {
255255
auto rich_text = telegram_api::move_object_as<telegram_api::textImage>(rich_text_ptr);
256256
auto it = documents.find(rich_text->document_id_);
257257
if (it != documents.end()) {
258-
type = RichText::Type::Icon;
258+
type = Type::Icon;
259259
document_file_id = it->second;
260260
Dimensions dimensions = get_dimensions(rich_text->w_, rich_text->h_, "textImage");
261261
content = PSTRING() << (dimensions.width * static_cast<uint32>(65536) + dimensions.height);
@@ -266,81 +266,81 @@ class RichText {
266266
}
267267
case telegram_api::textAnchor::ID: {
268268
auto rich_text = telegram_api::move_object_as<telegram_api::textAnchor>(rich_text_ptr);
269-
type = RichText::Type::Anchor;
269+
type = Type::Anchor;
270270
content = std::move(rich_text->name_);
271271
texts.emplace_back(std::move(rich_text->text_), documents);
272272
break;
273273
}
274274
case telegram_api::textMath::ID: {
275275
auto rich_text = telegram_api::move_object_as<telegram_api::textMath>(rich_text_ptr);
276-
type = RichText::Type::Math;
276+
type = Type::Math;
277277
content = std::move(rich_text->source_);
278278
break;
279279
}
280280
case telegram_api::textCustomEmoji::ID: {
281281
auto rich_text = telegram_api::move_object_as<telegram_api::textCustomEmoji>(rich_text_ptr);
282-
type = RichText::Type::CustomEmoji;
282+
type = Type::CustomEmoji;
283283
custom_emoji_id = CustomEmojiId(rich_text->document_id_);
284284
content = std::move(rich_text->alt_);
285285
break;
286286
}
287287
case telegram_api::textSpoiler::ID: {
288288
auto rich_text = telegram_api::move_object_as<telegram_api::textSpoiler>(rich_text_ptr);
289-
type = RichText::Type::Spoiler;
289+
type = Type::Spoiler;
290290
texts.emplace_back(std::move(rich_text->text_), documents);
291291
break;
292292
}
293293
case telegram_api::textMention::ID: {
294294
auto rich_text = telegram_api::move_object_as<telegram_api::textMention>(rich_text_ptr);
295-
type = RichText::Type::Mention;
295+
type = Type::Mention;
296296
texts.emplace_back(std::move(rich_text->text_), documents);
297297
break;
298298
}
299299
case telegram_api::textHashtag::ID: {
300300
auto rich_text = telegram_api::move_object_as<telegram_api::textHashtag>(rich_text_ptr);
301-
type = RichText::Type::Hashtag;
301+
type = Type::Hashtag;
302302
texts.emplace_back(std::move(rich_text->text_), documents);
303303
break;
304304
}
305305
case telegram_api::textBotCommand::ID: {
306306
auto rich_text = telegram_api::move_object_as<telegram_api::textBotCommand>(rich_text_ptr);
307-
type = RichText::Type::BotCommand;
307+
type = Type::BotCommand;
308308
texts.emplace_back(std::move(rich_text->text_), documents);
309309
break;
310310
}
311311
case telegram_api::textCashtag::ID: {
312312
auto rich_text = telegram_api::move_object_as<telegram_api::textCashtag>(rich_text_ptr);
313-
type = RichText::Type::Cashtag;
313+
type = Type::Cashtag;
314314
texts.emplace_back(std::move(rich_text->text_), documents);
315315
break;
316316
}
317317
case telegram_api::textAutoUrl::ID: {
318318
auto rich_text = telegram_api::move_object_as<telegram_api::textAutoUrl>(rich_text_ptr);
319-
type = RichText::Type::AutoUrl;
319+
type = Type::AutoUrl;
320320
texts.emplace_back(std::move(rich_text->text_), documents);
321321
break;
322322
}
323323
case telegram_api::textAutoEmail::ID: {
324324
auto rich_text = telegram_api::move_object_as<telegram_api::textAutoEmail>(rich_text_ptr);
325-
type = RichText::Type::AutoEmailAddress;
325+
type = Type::AutoEmailAddress;
326326
texts.emplace_back(std::move(rich_text->text_), documents);
327327
break;
328328
}
329329
case telegram_api::textAutoPhone::ID: {
330330
auto rich_text = telegram_api::move_object_as<telegram_api::textAutoPhone>(rich_text_ptr);
331-
type = RichText::Type::AutoPhoneNumber;
331+
type = Type::AutoPhoneNumber;
332332
texts.emplace_back(std::move(rich_text->text_), documents);
333333
break;
334334
}
335335
case telegram_api::textBankCard::ID: {
336336
auto rich_text = telegram_api::move_object_as<telegram_api::textBankCard>(rich_text_ptr);
337-
type = RichText::Type::BankCardNumber;
337+
type = Type::BankCardNumber;
338338
texts.emplace_back(std::move(rich_text->text_), documents);
339339
break;
340340
}
341341
case telegram_api::textMentionName::ID: {
342342
auto rich_text = telegram_api::move_object_as<telegram_api::textMentionName>(rich_text_ptr);
343-
type = RichText::Type::MentionName;
343+
type = Type::MentionName;
344344
texts.emplace_back(std::move(rich_text->text_), documents);
345345
user_id = UserId(rich_text->user_id_);
346346
if (!user_id.is_valid()) {
@@ -357,21 +357,21 @@ class RichText {
357357
if (!formatted_date.is_valid()) {
358358
break;
359359
}
360-
type = RichText::Type::FormattedDate;
360+
type = Type::FormattedDate;
361361
texts.emplace_back(std::move(rich_text->text_), documents);
362362
date = std::move(formatted_date);
363363
break;
364364
}
365365
case telegram_api::textDiff::ID: {
366366
auto rich_text = telegram_api::move_object_as<telegram_api::textDiff>(rich_text_ptr);
367-
type = RichText::Type::Diff;
367+
type = Type::Diff;
368368
texts.emplace_back(std::move(rich_text->text_), documents);
369369
texts.emplace_back(std::move(rich_text->old_text_), documents);
370370
break;
371371
}
372372
case telegram_api::textButton::ID: {
373373
auto rich_text = telegram_api::move_object_as<telegram_api::textButton>(rich_text_ptr);
374-
type = RichText::Type::Button;
374+
type = Type::Button;
375375
texts.emplace_back(std::move(rich_text->text_), documents);
376376
button_style = RichButtonStyle(std::move(rich_text->style_));
377377
button = make_unique<InlineKeyboardButton>(telegram_api::make_object<telegram_api::keyboardInlineButton>(
@@ -645,7 +645,7 @@ class RichText {
645645
}
646646

647647
void append_file_ids(const Td *td, vector<FileId> &file_ids) const {
648-
if (type == RichText::Type::Icon) {
648+
if (type == Type::Icon) {
649649
CHECK(document_file_id.is_valid());
650650
Document(Document::Type::General, document_file_id).append_file_ids(td, file_ids);
651651
} else {
@@ -678,8 +678,7 @@ class RichText {
678678
string get_full_text() const {
679679
string result;
680680
for_each_rich_text(true, [&](const RichText *text) {
681-
if (text->type == RichText::Type::Plain || text->type == RichText::Type::Math ||
682-
text->type == RichText::Type::CustomEmoji) {
681+
if (text->type == Type::Plain || text->type == Type::Math || text->type == Type::CustomEmoji) {
683682
result += text->content;
684683
}
685684
});
@@ -827,22 +826,22 @@ class RichText {
827826
td_api::object_ptr<td_api::RichText> get_rich_text_object(GetWebPageBlockObjectContext *context,
828827
bool allow_null = false) const {
829828
switch (type) {
830-
case RichText::Type::Plain:
829+
case Type::Plain:
831830
if (allow_null && content.empty()) {
832831
return nullptr;
833832
}
834833
return td_api::make_object<td_api::richTextPlain>(content);
835-
case RichText::Type::Bold:
834+
case Type::Bold:
836835
return td_api::make_object<td_api::richTextBold>(texts[0].get_rich_text_object(context));
837-
case RichText::Type::Italic:
836+
case Type::Italic:
838837
return td_api::make_object<td_api::richTextItalic>(texts[0].get_rich_text_object(context));
839-
case RichText::Type::Underline:
838+
case Type::Underline:
840839
return td_api::make_object<td_api::richTextUnderline>(texts[0].get_rich_text_object(context));
841-
case RichText::Type::Strikethrough:
840+
case Type::Strikethrough:
842841
return td_api::make_object<td_api::richTextStrikethrough>(texts[0].get_rich_text_object(context));
843-
case RichText::Type::Fixed:
842+
case Type::Fixed:
844843
return td_api::make_object<td_api::richTextFixed>(texts[0].get_rich_text_object(context));
845-
case RichText::Type::Url:
844+
case Type::Url:
846845
if (begins_with(content, context->base_url_) && content[context->base_url_.size()] == '#') {
847846
if (context->is_first_pass_) {
848847
context->has_anchor_urls_ = true;
@@ -879,26 +878,26 @@ class RichText {
879878
}
880879
return td_api::make_object<td_api::richTextUrl>(texts[0].get_rich_text_object(context), content,
881880
web_page_id.is_valid());
882-
case RichText::Type::EmailAddress:
881+
case Type::EmailAddress:
883882
return td_api::make_object<td_api::richTextEmailAddress>(texts[0].get_rich_text_object(context), content);
884-
case RichText::Type::Concatenation:
883+
case Type::Concatenation:
885884
return td_api::make_object<td_api::richTexts>(get_rich_texts_object(texts, context));
886-
case RichText::Type::Subscript:
885+
case Type::Subscript:
887886
return td_api::make_object<td_api::richTextSubscript>(texts[0].get_rich_text_object(context));
888-
case RichText::Type::Superscript:
887+
case Type::Superscript:
889888
return td_api::make_object<td_api::richTextSuperscript>(texts[0].get_rich_text_object(context));
890-
case RichText::Type::Marked:
889+
case Type::Marked:
891890
return td_api::make_object<td_api::richTextMarked>(texts[0].get_rich_text_object(context));
892-
case RichText::Type::PhoneNumber:
891+
case Type::PhoneNumber:
893892
return td_api::make_object<td_api::richTextPhoneNumber>(texts[0].get_rich_text_object(context), content);
894-
case RichText::Type::Icon: {
893+
case Type::Icon: {
895894
auto dimensions = to_integer<uint32>(content);
896895
auto width = static_cast<int32>(dimensions / 65536);
897896
auto height = static_cast<int32>(dimensions % 65536);
898897
return td_api::make_object<td_api::richTextIcon>(
899898
context->td_->documents_manager_->get_document_object(document_file_id, PhotoFormat::Jpeg), width, height);
900899
}
901-
case RichText::Type::Anchor: {
900+
case Type::Anchor: {
902901
if (context->is_first_pass_) {
903902
context->anchors_.emplace(Slice(content), texts[0].empty() ? nullptr : &texts[0]);
904903
}
@@ -907,51 +906,51 @@ class RichText {
907906
}
908907
return td_api::make_object<td_api::richTextReference>(content, texts[0].get_rich_text_object(context));
909908
}
910-
case RichText::Type::Math:
909+
case Type::Math:
911910
return td_api::make_object<td_api::richTextMathematicalExpression>(content);
912-
case RichText::Type::CustomEmoji:
911+
case Type::CustomEmoji:
913912
return td_api::make_object<td_api::richTextCustomEmoji>(custom_emoji_id.get(), content);
914-
case RichText::Type::Spoiler:
913+
case Type::Spoiler:
915914
return td_api::make_object<td_api::richTextSpoiler>(texts[0].get_rich_text_object(context));
916-
case RichText::Type::Mention:
915+
case Type::Mention:
917916
return td_api::make_object<td_api::richTextMention>(texts[0].get_rich_text_object(context),
918917
trim_first(texts[0].get_full_text(), '@'));
919-
case RichText::Type::Hashtag:
918+
case Type::Hashtag:
920919
return td_api::make_object<td_api::richTextHashtag>(texts[0].get_rich_text_object(context),
921920
trim_first(texts[0].get_full_text(), '#'));
922-
case RichText::Type::Cashtag:
921+
case Type::Cashtag:
923922
return td_api::make_object<td_api::richTextCashtag>(texts[0].get_rich_text_object(context),
924923
trim_first(texts[0].get_full_text(), '$'));
925-
case RichText::Type::BotCommand:
924+
case Type::BotCommand:
926925
if (context->skip_bot_commands_) {
927926
return texts[0].get_rich_text_object(context);
928927
}
929928
return td_api::make_object<td_api::richTextBotCommand>(texts[0].get_rich_text_object(context),
930929
trim_first(texts[0].get_full_text(), '/'));
931-
case RichText::Type::AutoUrl:
930+
case Type::AutoUrl:
932931
return td_api::make_object<td_api::richTextUrl>(texts[0].get_rich_text_object(context),
933932
texts[0].get_full_text(), false);
934-
case RichText::Type::AutoEmailAddress:
933+
case Type::AutoEmailAddress:
935934
return td_api::make_object<td_api::richTextEmailAddress>(texts[0].get_rich_text_object(context),
936935
texts[0].get_full_text());
937-
case RichText::Type::AutoPhoneNumber:
936+
case Type::AutoPhoneNumber:
938937
return td_api::make_object<td_api::richTextPhoneNumber>(texts[0].get_rich_text_object(context),
939938
texts[0].get_full_text());
940-
case RichText::Type::FormattedDate:
939+
case Type::FormattedDate:
941940
return td_api::make_object<td_api::richTextDateTime>(texts[0].get_rich_text_object(context), date.get_date(),
942941
date.get_date_time_formatting_type_object());
943-
case RichText::Type::BankCardNumber:
942+
case Type::BankCardNumber:
944943
return td_api::make_object<td_api::richTextBankCardNumber>(texts[0].get_rich_text_object(context),
945944
texts[0].get_full_text());
946-
case RichText::Type::MentionName:
945+
case Type::MentionName:
947946
return td_api::make_object<td_api::richTextMentionName>(
948947
texts[0].get_rich_text_object(context),
949948
context->td_->user_manager_->get_user_id_object(user_id, "richTextMentionName"));
950-
case RichText::Type::Diff:
949+
case Type::Diff:
951950
CHECK(texts.size() == 2u);
952951
return td_api::make_object<td_api::richTextDiff>(texts[0].get_rich_text_object(context),
953952
texts[1].get_rich_text_object(context));
954-
case RichText::Type::Button: {
953+
case Type::Button: {
955954
CHECK(button != nullptr);
956955
auto button_object = button->get_inline_keyboard_button_object(context->td_->user_manager_.get());
957956
return td_api::make_object<td_api::richTextButton>(td_api::make_object<td_api::inlineButton>(

0 commit comments

Comments
 (0)