2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-03 07:56:03 +00:00

Replace gsl::not_null<T*> with just not_null<T*>.

This commit is contained in:
John Preston
2017-08-17 11:31:24 +03:00
parent cc4023d26a
commit b3da99c302
148 changed files with 966 additions and 963 deletions

View File

@@ -35,56 +35,56 @@ public:
Restricted,
Kicked,
};
static void Start(gsl::not_null<ChannelData*> channel, Role role);
static void Start(not_null<ChannelData*> channel, Role role);
struct Additional {
std::map<gsl::not_null<UserData*>, MTPChannelAdminRights> adminRights;
std::set<gsl::not_null<UserData*>> adminCanEdit;
std::map<gsl::not_null<UserData*>, gsl::not_null<UserData*>> adminPromotedBy;
std::map<gsl::not_null<UserData*>, MTPChannelBannedRights> restrictedRights;
std::set<gsl::not_null<UserData*>> kicked;
std::map<gsl::not_null<UserData*>, gsl::not_null<UserData*>> restrictedBy;
std::set<gsl::not_null<UserData*>> external;
std::set<gsl::not_null<UserData*>> infoNotLoaded;
std::map<not_null<UserData*>, MTPChannelAdminRights> adminRights;
std::set<not_null<UserData*>> adminCanEdit;
std::map<not_null<UserData*>, not_null<UserData*>> adminPromotedBy;
std::map<not_null<UserData*>, MTPChannelBannedRights> restrictedRights;
std::set<not_null<UserData*>> kicked;
std::map<not_null<UserData*>, not_null<UserData*>> restrictedBy;
std::set<not_null<UserData*>> external;
std::set<not_null<UserData*>> infoNotLoaded;
UserData *creator = nullptr;
};
ParticipantsBoxController(gsl::not_null<ChannelData*> channel, Role role);
ParticipantsBoxController(not_null<ChannelData*> channel, Role role);
void addNewItem();
void prepare() override;
void rowClicked(gsl::not_null<PeerListRow*> row) override;
void rowActionClicked(gsl::not_null<PeerListRow*> row) override;
void rowClicked(not_null<PeerListRow*> row) override;
void rowActionClicked(not_null<PeerListRow*> row) override;
void loadMoreRows() override;
void peerListSearchAddRow(gsl::not_null<PeerData*> peer) override;
std::unique_ptr<PeerListRow> createSearchRow(gsl::not_null<PeerData*> peer) override;
void peerListSearchAddRow(not_null<PeerData*> peer) override;
std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData*> peer) override;
// Callback(gsl::not_null<UserData*>)
// Callback(not_null<UserData*>)
template <typename Callback>
static void HandleParticipant(const MTPChannelParticipant &participant, Role role, gsl::not_null<Additional*> additional, Callback callback);
static void HandleParticipant(const MTPChannelParticipant &participant, Role role, not_null<Additional*> additional, Callback callback);
protected:
virtual std::unique_ptr<PeerListRow> createRow(gsl::not_null<UserData*> user) const;
virtual std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const;
private:
static std::unique_ptr<PeerListSearchController> CreateSearchController(gsl::not_null<ChannelData*> channel, Role role, gsl::not_null<Additional*> additional);
static std::unique_ptr<PeerListSearchController> CreateSearchController(not_null<ChannelData*> channel, Role role, not_null<Additional*> additional);
void showAdmin(gsl::not_null<UserData*> user);
void editAdminDone(gsl::not_null<UserData*> user, const MTPChannelAdminRights &rights);
void showRestricted(gsl::not_null<UserData*> user);
void editRestrictedDone(gsl::not_null<UserData*> user, const MTPChannelBannedRights &rights);
void removeKicked(gsl::not_null<PeerListRow*> row, gsl::not_null<UserData*> user);
void kickMember(gsl::not_null<UserData*> user);
void kickMemberSure(gsl::not_null<UserData*> user);
bool appendRow(gsl::not_null<UserData*> user);
bool prependRow(gsl::not_null<UserData*> user);
bool removeRow(gsl::not_null<UserData*> user);
void refreshCustomStatus(gsl::not_null<PeerListRow*> row) const;
void showAdmin(not_null<UserData*> user);
void editAdminDone(not_null<UserData*> user, const MTPChannelAdminRights &rights);
void showRestricted(not_null<UserData*> user);
void editRestrictedDone(not_null<UserData*> user, const MTPChannelBannedRights &rights);
void removeKicked(not_null<PeerListRow*> row, not_null<UserData*> user);
void kickMember(not_null<UserData*> user);
void kickMemberSure(not_null<UserData*> user);
bool appendRow(not_null<UserData*> user);
bool prependRow(not_null<UserData*> user);
bool removeRow(not_null<UserData*> user);
void refreshCustomStatus(not_null<PeerListRow*> row) const;
bool feedMegagroupLastParticipants();
gsl::not_null<ChannelData*> _channel;
not_null<ChannelData*> _channel;
Role _role = Role::Admins;
int _offset = 0;
mtpRequestId _loadRequestId = 0;
@@ -101,7 +101,7 @@ public:
using Role = ParticipantsBoxController::Role;
using Additional = ParticipantsBoxController::Additional;
ParticipantsBoxSearchController(gsl::not_null<ChannelData*> channel, Role role, gsl::not_null<Additional*> additional);
ParticipantsBoxSearchController(not_null<ChannelData*> channel, Role role, not_null<Additional*> additional);
void searchQuery(const QString &query) override;
bool isLoading() override;
@@ -121,9 +121,9 @@ private:
bool searchInCache();
void searchDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result, int requestedCount);
gsl::not_null<ChannelData*> _channel;
not_null<ChannelData*> _channel;
Role _role = Role::Restricted;
gsl::not_null<Additional*> _additional;
not_null<Additional*> _additional;
base::Timer _timer;
QString _query;
@@ -141,35 +141,35 @@ public:
using Role = ParticipantsBoxController::Role;
using Additional = ParticipantsBoxController::Additional;
using AdminDoneCallback = base::lambda<void(gsl::not_null<UserData*> user, const MTPChannelAdminRights &adminRights)>;
using BannedDoneCallback = base::lambda<void(gsl::not_null<UserData*> user, const MTPChannelBannedRights &bannedRights)>;
AddParticipantBoxController(gsl::not_null<ChannelData*> channel, Role role, AdminDoneCallback adminDoneCallback, BannedDoneCallback bannedDoneCallback);
using AdminDoneCallback = base::lambda<void(not_null<UserData*> user, const MTPChannelAdminRights &adminRights)>;
using BannedDoneCallback = base::lambda<void(not_null<UserData*> user, const MTPChannelBannedRights &bannedRights)>;
AddParticipantBoxController(not_null<ChannelData*> channel, Role role, AdminDoneCallback adminDoneCallback, BannedDoneCallback bannedDoneCallback);
void prepare() override;
void rowClicked(gsl::not_null<PeerListRow*> row) override;
void rowClicked(not_null<PeerListRow*> row) override;
void loadMoreRows() override;
std::unique_ptr<PeerListRow> createSearchRow(gsl::not_null<PeerData*> peer) override;
std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData*> peer) override;
// Callback(gsl::not_null<UserData*>)
// Callback(not_null<UserData*>)
template <typename Callback>
static void HandleParticipant(const MTPChannelParticipant &participant, gsl::not_null<Additional*> additional, Callback callback);
static void HandleParticipant(const MTPChannelParticipant &participant, not_null<Additional*> additional, Callback callback);
private:
template <typename Callback>
bool checkInfoLoaded(gsl::not_null<UserData*> user, Callback callback);
bool checkInfoLoaded(not_null<UserData*> user, Callback callback);
void showAdmin(gsl::not_null<UserData*> user, bool sure = false);
void editAdminDone(gsl::not_null<UserData*> user, const MTPChannelAdminRights &rights);
void showRestricted(gsl::not_null<UserData*> user, bool sure = false);
void editRestrictedDone(gsl::not_null<UserData*> user, const MTPChannelBannedRights &rights);
void kickUser(gsl::not_null<UserData*> user, bool sure = false);
void restrictUserSure(gsl::not_null<UserData*> user, const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights);
bool appendRow(gsl::not_null<UserData*> user);
bool prependRow(gsl::not_null<UserData*> user);
std::unique_ptr<PeerListRow> createRow(gsl::not_null<UserData*> user) const;
void showAdmin(not_null<UserData*> user, bool sure = false);
void editAdminDone(not_null<UserData*> user, const MTPChannelAdminRights &rights);
void showRestricted(not_null<UserData*> user, bool sure = false);
void editRestrictedDone(not_null<UserData*> user, const MTPChannelBannedRights &rights);
void kickUser(not_null<UserData*> user, bool sure = false);
void restrictUserSure(not_null<UserData*> user, const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights);
bool appendRow(not_null<UserData*> user);
bool prependRow(not_null<UserData*> user);
std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const;
gsl::not_null<ChannelData*> _channel;
not_null<ChannelData*> _channel;
Role _role = Role::Admins;
int _offset = 0;
mtpRequestId _loadRequestId = 0;
@@ -187,7 +187,7 @@ public:
using Role = ParticipantsBoxController::Role;
using Additional = ParticipantsBoxController::Additional;
AddParticipantBoxSearchController(gsl::not_null<ChannelData*> channel, gsl::not_null<Additional*> additional);
AddParticipantBoxSearchController(not_null<ChannelData*> channel, not_null<Additional*> additional);
void searchQuery(const QString &query) override;
bool isLoading() override;
@@ -212,8 +212,8 @@ private:
void addChatsContacts();
void requestGlobal();
gsl::not_null<ChannelData*> _channel;
gsl::not_null<Additional*> _additional;
not_null<ChannelData*> _channel;
not_null<Additional*> _additional;
base::Timer _timer;
QString _query;