From 241526f1270d2443c4874c02afee2fe827988335 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 19 Mar 2019 19:45:46 +0400 Subject: [PATCH] Improve code style a bit. --- .../edit_peer_history_visibility_box.cpp | 50 +++---- .../peers/edit_peer_history_visibility_box.h | 5 +- .../boxes/peers/edit_peer_info_box.cpp | 129 +++++++++--------- .../boxes/peers/edit_peer_type_box.cpp | 38 +++--- .../boxes/peers/edit_peer_type_box.h | 7 +- 5 files changed, 114 insertions(+), 115 deletions(-) diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp index 5eb144e71..95d03a154 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp @@ -23,12 +23,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace { -void AddRoundButton( - not_null container, - HistoryVisibility value, - LangKey groupTextKey, - LangKey groupAboutKey, - std::shared_ptr> historyVisibility) { +void AddRadioButton( + not_null container, + HistoryVisibility value, + LangKey groupTextKey, + LangKey groupAboutKey, + std::shared_ptr> historyVisibility) { container->add(object_ptr( container, st::editPeerHistoryVisibilityTopSkip)); @@ -48,11 +48,10 @@ void AddRoundButton( } void FillContent( - not_null parent, - not_null peer, - std::shared_ptr> historyVisibility, - std::optional savedValue = std::nullopt) { - + not_null parent, + not_null peer, + std::shared_ptr> historyVisibility, + std::optional savedValue = std::nullopt) { const auto canEdit = [&] { if (const auto chat = peer->asChat()) { return chat->canEditPreHistoryHidden(); @@ -75,21 +74,22 @@ void FillContent( historyVisibility->setValue(defaultValue); - const auto result = parent->add(object_ptr>( - parent, - object_ptr(parent), - st::editPeerHistoryVisibilityMargins)); + const auto result = parent->add( + object_ptr>( + parent, + object_ptr(parent), + st::editPeerHistoryVisibilityMargins)); const auto container = result->entity(); - Expects(historyVisibility != nullptr); + Assert(historyVisibility != nullptr); - AddRoundButton( + AddRadioButton( container, HistoryVisibility::Visible, lng_manage_history_visibility_shown, lng_manage_history_visibility_shown_about, historyVisibility); - AddRoundButton( + AddRadioButton( container, HistoryVisibility::Hidden, lng_manage_history_visibility_hidden, @@ -102,10 +102,10 @@ void FillContent( } // namespace EditPeerHistoryVisibilityBox::EditPeerHistoryVisibilityBox( - QWidget*, - not_null peer, - FnMut savedCallback, - std::optional historyVisibilitySavedValue) + QWidget*, + not_null peer, + FnMut savedCallback, + std::optional historyVisibilitySavedValue) : _peer(peer) , _savedCallback(std::move(savedCallback)) , _historyVisibilitySavedValue(historyVisibilitySavedValue) @@ -130,6 +130,10 @@ void EditPeerHistoryVisibilityBox::prepare() { void EditPeerHistoryVisibilityBox::setupContent() { const auto content = Ui::CreateChild(this); - FillContent(content, _peer, _historyVisibility, _historyVisibilitySavedValue); + FillContent( + content, + _peer, + _historyVisibility, + _historyVisibilitySavedValue); setDimensionsToContent(st::boxWidth, content); } diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.h index 6c16f77f2..1cfc923d4 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.h +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.h @@ -31,12 +31,11 @@ enum class HistoryVisibility { class EditPeerHistoryVisibilityBox : public BoxContent { public: - EditPeerHistoryVisibilityBox( QWidget*, not_null peer, FnMut savedCallback, - std::optional historyVisibilitySavedValue = std::nullopt); + std::optional historyVisibilitySavedValue = {}); protected: void prepare() override; @@ -48,6 +47,6 @@ private: FnMut _savedCallback; std::optional _historyVisibilitySavedValue; - std::shared_ptr> _historyVisibility = nullptr; + std::shared_ptr> _historyVisibility; }; diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index 9af937ab5..944e7a254 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -492,40 +492,37 @@ void Controller::showEditPeerTypeBox(std::optional error) { _usernameSavedValue = publicLink; refreshHistoryVisibility(); }; - Ui::show(Box( - _peer, - boxCallback, - _privacySavedValue, - _usernameSavedValue, - error - ), LayerOption::KeepOther); + Ui::show( + Box( + _peer, + boxCallback, + _privacySavedValue, + _usernameSavedValue, + error), + LayerOption::KeepOther); } void Controller::fillPrivacyTypeButton() { Expects(_controls.buttonsLayout != nullptr); + // Create Privacy Button. _privacySavedValue = (_peer->isChannel() && _peer->asChannel()->isPublic()) ? Privacy::Public : Privacy::Private; - const auto buttonCallback = [=] { - showEditPeerTypeBox(); - }; - AddButtonWithText( _controls.buttonsLayout, - std::move(Lang::Viewer((_peer->isChat() || _peer->isMegagroup()) + Lang::Viewer((_peer->isChat() || _peer->isMegagroup()) ? lng_manage_peer_group_type - : lng_manage_peer_channel_type)), - + : lng_manage_peer_channel_type), _updadePrivacyType.events( ) | rpl::map([](Privacy flag) { - return lang(Privacy::Public == flag - ? lng_manage_public_peer_title - : lng_manage_private_peer_title); - }), - buttonCallback); + return lang(Privacy::Public == flag + ? lng_manage_public_peer_title + : lng_manage_private_peer_title); + }), + [=] { showEditPeerTypeBox(); }); _updadePrivacyType.fire(std::move(_privacySavedValue.value())); } @@ -533,13 +530,13 @@ void Controller::fillPrivacyTypeButton() { void Controller::fillInviteLinkButton() { Expects(_controls.buttonsLayout != nullptr); - const auto boxCallback = [=](Privacy checked, QString publicLink) {}; + const auto boxCallback = [=](Privacy checked, QString publicLink) { + }; const auto buttonCallback = [=] { - Ui::show(Box( - _peer, - boxCallback - ), LayerOption::KeepOther); + Ui::show( + Box(_peer, boxCallback), + LayerOption::KeepOther); }; AddButtonWithText( @@ -591,21 +588,22 @@ void Controller::fillHistoryVisibilityButton() { _historyVisibilitySavedValue = checked; }; const auto buttonCallback = [=] { - Ui::show(Box( - _peer, - boxCallback, - _historyVisibilitySavedValue - ), LayerOption::KeepOther); + Ui::show( + Box( + _peer, + boxCallback, + _historyVisibilitySavedValue), + LayerOption::KeepOther); }; AddButtonWithText( container, std::move(Lang::Viewer(lng_manage_history_visibility_title)), updateHistoryVisibility->events( ) | rpl::map([](HistoryVisibility flag) { - return lang(HistoryVisibility::Visible == flag - ? lng_manage_history_visibility_shown - : lng_manage_history_visibility_hidden); - }), + return lang((HistoryVisibility::Visible == flag) + ? lng_manage_history_visibility_shown + : lng_manage_history_visibility_hidden); + }), buttonCallback); updateHistoryVisibility->fire( @@ -618,6 +616,7 @@ void Controller::fillHistoryVisibilityButton() { void Controller::fillManageSection() { Expects(_controls.buttonsLayout != nullptr); + const auto navigation = App::wnd()->controller(); const auto chat = _peer->asChat(); @@ -648,7 +647,6 @@ void Controller::fillManageSection() { : chat->canEditPreHistoryHidden(); }(); - const auto canEditPermissions = [=] { return isChannel ? channel->canEditPermissions() @@ -705,7 +703,8 @@ void Controller::fillManageSection() { || canEditSignatures || canEditInviteLink || canEditUsername) { - AddSkip(_controls.buttonsLayout, + AddSkip( + _controls.buttonsLayout, st::editPeerTopButtonsLayoutSkip, st::editPeerTopButtonsLayoutSkipCustomBottom); } @@ -726,10 +725,10 @@ void Controller::fillManageSection() { Info::Profile::AdminsCountValue(_peer) | ToPositiveNumberString(), [=] { - ParticipantsBoxController::Start( - navigation, - _peer, - ParticipantsBoxController::Role::Admins); + ParticipantsBoxController::Start( + navigation, + _peer, + ParticipantsBoxController::Role::Admins); }, st::infoIconAdministrators); } @@ -740,11 +739,11 @@ void Controller::fillManageSection() { Info::Profile::MembersCountValue(_peer) | ToPositiveNumberString(), [=] { - ParticipantsBoxController::Start( - navigation, - _peer, - ParticipantsBoxController::Role::Members); - }, + ParticipantsBoxController::Start( + navigation, + _peer, + ParticipantsBoxController::Role::Members); + }, st::infoIconMembers); } if (canViewKicked) { @@ -754,11 +753,11 @@ void Controller::fillManageSection() { Info::Profile::KickedCountValue(channel) | ToPositiveNumberString(), [=] { - ParticipantsBoxController::Start( - navigation, - _peer, - ParticipantsBoxController::Role::Kicked); - }, + ParticipantsBoxController::Start( + navigation, + _peer, + ParticipantsBoxController::Role::Kicked); + }, st::infoIconBlacklist); } if (hasRecentActions) { @@ -767,8 +766,8 @@ void Controller::fillManageSection() { Lang::Viewer(lng_manage_peer_recent_actions), rpl::single(QString()), //Empty count. [=] { - navigation->showSection(AdminLog::SectionMemento(channel)); - }, + navigation->showSection(AdminLog::SectionMemento(channel)); + }, st::infoIconRecentActions); } @@ -784,9 +783,9 @@ void Controller::fillManageSection() { if (canDeleteChannel) { AddButtonDelete( _controls.buttonsLayout, - std::move(Lang::Viewer(_isGroup + Lang::Viewer(_isGroup ? lng_profile_delete_group - : lng_profile_delete_channel)), + : lng_profile_delete_channel), [=]{ deleteWithConfirmation(); } ); } @@ -868,9 +867,8 @@ bool Controller::validateDescription(Saving &to) const { } bool Controller::validateHistoryVisibility(Saving &to) const { - if (!_controls.historyVisibilityWrap) return true; - - if (!_controls.historyVisibilityWrap->toggled() + if (!_controls.historyVisibilityWrap + || !_controls.historyVisibilityWrap->toggled() || (_privacySavedValue == Privacy::Public)) { return true; } @@ -895,12 +893,12 @@ void Controller::save() { } if (const auto saving = validate()) { _savingData = *saving; - pushSaveStage([this] { saveUsername(); }); - pushSaveStage([this] { saveTitle(); }); - pushSaveStage([this] { saveDescription(); }); - pushSaveStage([this] { saveHistoryVisibility(); }); - pushSaveStage([this] { saveSignatures(); }); - pushSaveStage([this] { savePhoto(); }); + pushSaveStage([=] { saveUsername(); }); + pushSaveStage([=] { saveTitle(); }); + pushSaveStage([=] { saveDescription(); }); + pushSaveStage([=] { saveHistoryVisibility(); }); + pushSaveStage([=] { saveSignatures(); }); + pushSaveStage([=] { savePhoto(); }); continueSave(); } } @@ -1136,9 +1134,9 @@ void Controller::deleteWithConfirmation() { } void Controller::deleteChannel() { - const auto channel = _peer->asChannel(); - Assert(channel != nullptr); + Expects(_peer->isChannel()); + const auto channel = _peer->asChannel(); const auto chat = channel->migrateFrom(); Ui::hideLayer(); @@ -1229,7 +1227,8 @@ bool EditPeerInfoBox::Available(not_null peer) { || channel->canViewBanned() || channel->canEditInformation() || channel->canEditPermissions() - || (channel->hasAdminRights() || channel->amCreator()); + || channel->hasAdminRights() + || channel->amCreator(); } else { return false; } diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp index a2103c230..285fe802c 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp @@ -60,8 +60,8 @@ public: LangKey getTitle() { return _isInviteLink - ? lng_profile_invite_link_section - : _isGroup + ? lng_profile_invite_link_section + : _isGroup ? lng_manage_peer_group_type : lng_manage_peer_channel_type; } @@ -84,7 +84,6 @@ public: } private: - struct Controls { std::shared_ptr> privacy; Ui::SlideWrap *usernameWrap = nullptr; @@ -165,7 +164,8 @@ Controller::Controller( , _privacySavedValue(privacySavedValue) , _usernameSavedValue(usernameSavedValue) , _isGroup(_peer->isChat() || _peer->isMegagroup()) -, _isInviteLink(!_privacySavedValue.has_value() && !_usernameSavedValue.has_value()) +, _isInviteLink(!_privacySavedValue.has_value() + && !_usernameSavedValue.has_value()) , _isAllowSave(!_usernameSavedValue.value_or(QString()).isEmpty()) , _wrap(container) , _checkUsernameTimer([=] { checkUsernameAvailability(); }) { @@ -194,14 +194,13 @@ void Controller::createContent() { } } - void Controller::addRoundButton( - not_null container, - Privacy value, - LangKey groupTextKey, - LangKey channelTextKey, - LangKey groupAboutKey, - LangKey channelAboutKey) { + not_null container, + Privacy value, + LangKey groupTextKey, + LangKey channelTextKey, + LangKey groupAboutKey, + LangKey channelAboutKey) { container->add(object_ptr>( container, _controls.privacy, @@ -221,9 +220,8 @@ void Controller::addRoundButton( }; void Controller::fillPrivaciesButtons( - not_null parent, - std::optional savedValue) { - + not_null parent, + std::optional savedValue) { const auto canEditUsername = [&] { if (const auto chat = _peer->asChat()) { return chat->canEditUsername(); @@ -695,12 +693,12 @@ bool Controller::inviteLinkShown() { } // namespace EditPeerTypeBox::EditPeerTypeBox( - QWidget*, - not_null peer, - FnMut savedCallback, - std::optional privacySaved, - std::optional usernameSaved, - std::optional usernameError) + QWidget*, + not_null peer, + FnMut savedCallback, + std::optional privacySaved, + std::optional usernameSaved, + std::optional usernameError) : _peer(peer) , _savedCallback(std::move(savedCallback)) , _privacySavedValue(privacySaved) diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.h index 06f9a00f5..e399f99ad 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.h +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.h @@ -39,7 +39,6 @@ enum class UsernameState { class EditPeerTypeBox : public BoxContent { public: - EditPeerTypeBox( QWidget*, not_null p, @@ -56,9 +55,9 @@ private: not_null _peer; FnMut _savedCallback; - std::optional _privacySavedValue = std::nullopt; - std::optional _usernameSavedValue = std::nullopt; - std::optional _usernameError = std::nullopt; + std::optional _privacySavedValue; + std::optional _usernameSavedValue; + std::optional _usernameError; rpl::event_stream<> _focusRequests;