diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 6fc03f49a0..9e80e885a5 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -44,7 +44,7 @@ ApiWrap::ApiWrap(QObject *parent) : QObject(parent) void ApiWrap::init() { } -void ApiWrap::requestMessageData(ChannelData *channel, MsgId msgId, const RequestMessageDataCallback &callback) { +void ApiWrap::requestMessageData(ChannelData *channel, MsgId msgId, RequestMessageDataCallback callback) { MessageDataRequest &req(channel ? _channelMessageDataRequests[channel][msgId] : _messageDataRequests[msgId]); if (callback) { req.callbacks.append(callback); diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index 8f04f3653d..d0a6ce88fa 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -41,8 +41,8 @@ public: ApiWrap(QObject *parent); void init(); - using RequestMessageDataCallback = base::lambda_copy; - void requestMessageData(ChannelData *channel, MsgId msgId, const RequestMessageDataCallback &callback); + using RequestMessageDataCallback = base::lambda; + void requestMessageData(ChannelData *channel, MsgId msgId, RequestMessageDataCallback callback); void requestFullPeer(PeerData *peer); void requestPeer(PeerData *peer); diff --git a/Telegram/SourceFiles/boxes/abstractbox.cpp b/Telegram/SourceFiles/boxes/abstractbox.cpp index ed68413dcf..be39bf448e 100644 --- a/Telegram/SourceFiles/boxes/abstractbox.cpp +++ b/Telegram/SourceFiles/boxes/abstractbox.cpp @@ -33,11 +33,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org BoxLayerTitleShadow::BoxLayerTitleShadow(QWidget *parent) : Ui::PlainShadow(parent, st::boxLayerTitleShadow) { } -QPointer BoxContent::addButton(const QString &text, base::lambda &&clickCallback) { +QPointer BoxContent::addButton(const QString &text, base::lambda clickCallback) { return addButton(text, std::move(clickCallback), st::defaultBoxButton); } -QPointer BoxContent::addLeftButton(const QString &text, base::lambda &&clickCallback) { +QPointer BoxContent::addLeftButton(const QString &text, base::lambda clickCallback) { return getDelegate()->addLeftButton(text, std::move(clickCallback), st::defaultBoxButton); } @@ -310,7 +310,7 @@ void AbstractBox::clearButtons() { _leftButton.destroy(); } -QPointer AbstractBox::addButton(const QString &text, base::lambda &&clickCallback, const style::RoundButton &st) { +QPointer AbstractBox::addButton(const QString &text, base::lambda clickCallback, const style::RoundButton &st) { _buttons.push_back(object_ptr(this, text, st)); auto result = QPointer(_buttons.back()); result->setClickedCallback(std::move(clickCallback)); @@ -319,7 +319,7 @@ QPointer AbstractBox::addButton(const QString &text, base::lamb return result; } -QPointer AbstractBox::addLeftButton(const QString &text, base::lambda &&clickCallback, const style::RoundButton &st) { +QPointer AbstractBox::addLeftButton(const QString &text, base::lambda clickCallback, const style::RoundButton &st) { _leftButton = object_ptr(this, text, st); auto result = QPointer(_leftButton); result->setClickedCallback(std::move(clickCallback)); diff --git a/Telegram/SourceFiles/boxes/abstractbox.h b/Telegram/SourceFiles/boxes/abstractbox.h index 6e5150b02d..19aa652187 100644 --- a/Telegram/SourceFiles/boxes/abstractbox.h +++ b/Telegram/SourceFiles/boxes/abstractbox.h @@ -43,8 +43,8 @@ public: virtual void setTitle(const QString &title, const QString &additional) = 0; virtual void clearButtons() = 0; - virtual QPointer addButton(const QString &text, base::lambda &&clickCallback, const style::RoundButton &st) = 0; - virtual QPointer addLeftButton(const QString &text, base::lambda &&clickCallback, const style::RoundButton &st) = 0; + virtual QPointer addButton(const QString &text, base::lambda clickCallback, const style::RoundButton &st) = 0; + virtual QPointer addLeftButton(const QString &text, base::lambda clickCallback, const style::RoundButton &st) = 0; virtual void updateButtonsPositions() = 0; virtual void setDimensions(int newWidth, int maxHeight) = 0; @@ -98,9 +98,9 @@ protected: void clearButtons() { getDelegate()->clearButtons(); } - QPointer addButton(const QString &text, base::lambda &&clickCallback); - QPointer addLeftButton(const QString &text, base::lambda &&clickCallback); - QPointer addButton(const QString &text, base::lambda &&clickCallback, const style::RoundButton &st) { + QPointer addButton(const QString &text, base::lambda clickCallback); + QPointer addLeftButton(const QString &text, base::lambda clickCallback); + QPointer addButton(const QString &text, base::lambda clickCallback, const style::RoundButton &st) { return getDelegate()->addButton(text, std::move(clickCallback), st); } void updateButtonsGeometry() { @@ -187,8 +187,8 @@ public: void setTitle(const QString &title, const QString &additional) override; void clearButtons() override; - QPointer addButton(const QString &text, base::lambda &&clickCallback, const style::RoundButton &st) override; - QPointer addLeftButton(const QString &text, base::lambda &&clickCallback, const style::RoundButton &st) override; + QPointer addButton(const QString &text, base::lambda clickCallback, const style::RoundButton &st) override; + QPointer addLeftButton(const QString &text, base::lambda clickCallback, const style::RoundButton &st) override; void updateButtonsPositions() override; void setDimensions(int newWidth, int maxHeight) override; diff --git a/Telegram/SourceFiles/boxes/addcontactbox.cpp b/Telegram/SourceFiles/boxes/addcontactbox.cpp index 1cafda2b70..d11d58c9aa 100644 --- a/Telegram/SourceFiles/boxes/addcontactbox.cpp +++ b/Telegram/SourceFiles/boxes/addcontactbox.cpp @@ -1111,7 +1111,7 @@ void EditChannelBox::onSaveSignDone(const MTPUpdates &updates) { closeBox(); } -RevokePublicLinkBox::RevokePublicLinkBox(QWidget*, base::lambda &&revokeCallback) +RevokePublicLinkBox::RevokePublicLinkBox(QWidget*, base::lambda revokeCallback) : _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom()) , _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke))) , _aboutRevoke(this, lang(lng_channels_too_much_public_about), Ui::FlatLabel::InitType::Simple, st::aboutRevokePublicLabel) diff --git a/Telegram/SourceFiles/boxes/addcontactbox.h b/Telegram/SourceFiles/boxes/addcontactbox.h index 768299b7b8..df12901c21 100644 --- a/Telegram/SourceFiles/boxes/addcontactbox.h +++ b/Telegram/SourceFiles/boxes/addcontactbox.h @@ -278,7 +278,7 @@ private: class RevokePublicLinkBox : public BoxContent, public RPCSender { public: - RevokePublicLinkBox(QWidget*, base::lambda &&revokeCallback); + RevokePublicLinkBox(QWidget*, base::lambda revokeCallback); protected: void prepare() override; diff --git a/Telegram/SourceFiles/boxes/backgroundbox.h b/Telegram/SourceFiles/boxes/backgroundbox.h index aa23c3fa44..9758a0f280 100644 --- a/Telegram/SourceFiles/boxes/backgroundbox.h +++ b/Telegram/SourceFiles/boxes/backgroundbox.h @@ -46,7 +46,7 @@ class BackgroundBox::Inner : public TWidget, public RPCSender, private base::Sub public: Inner(QWidget *parent); - void setBackgroundChosenCallback(base::lambda &&callback) { + void setBackgroundChosenCallback(base::lambda callback) { _backgroundChosenCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/boxes/confirmbox.cpp b/Telegram/SourceFiles/boxes/confirmbox.cpp index f2f8d58518..44c0bb2109 100644 --- a/Telegram/SourceFiles/boxes/confirmbox.cpp +++ b/Telegram/SourceFiles/boxes/confirmbox.cpp @@ -41,7 +41,7 @@ TextParseOptions _confirmBoxTextOptions = { Qt::LayoutDirectionAuto, // dir }; -ConfirmBox::ConfirmBox(QWidget*, const QString &text, base::lambda &&confirmedCallback, base::lambda &&cancelledCallback) +ConfirmBox::ConfirmBox(QWidget*, const QString &text, base::lambda confirmedCallback, base::lambda cancelledCallback) : _confirmText(lang(lng_box_ok)) , _cancelText(lang(lng_cancel)) , _confirmStyle(st::defaultBoxButton) @@ -51,7 +51,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, base::lambda &&con init(text); } -ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, base::lambda &&confirmedCallback, base::lambda &&cancelledCallback) +ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, base::lambda confirmedCallback, base::lambda cancelledCallback) : _confirmText(confirmText) , _cancelText(lang(lng_cancel)) , _confirmStyle(st::defaultBoxButton) @@ -61,7 +61,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText init(text); } -ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, base::lambda &&confirmedCallback, base::lambda &&cancelledCallback) +ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, base::lambda confirmedCallback, base::lambda cancelledCallback) : _confirmText(confirmText) , _cancelText(lang(lng_cancel)) , _confirmStyle(confirmStyle) @@ -71,7 +71,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText init(text); } -ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, base::lambda &&confirmedCallback, base::lambda &&cancelledCallback) +ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, base::lambda confirmedCallback, base::lambda cancelledCallback) : _confirmText(confirmText) , _cancelText(cancelText) , _confirmStyle(st::defaultBoxButton) @@ -81,7 +81,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText init(text); } -ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, base::lambda &&confirmedCallback, base::lambda &&cancelledCallback) +ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, base::lambda confirmedCallback, base::lambda cancelledCallback) : _confirmText(confirmText) , _cancelText(cancelText) , _confirmStyle(st::defaultBoxButton) @@ -91,7 +91,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText init(text); } -ConfirmBox::ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, base::lambda_copy &&closedCallback) +ConfirmBox::ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, base::lambda closedCallback) : _confirmText(doneText) , _confirmStyle(st::defaultBoxButton) , _informative(true) @@ -101,7 +101,7 @@ ConfirmBox::ConfirmBox(const InformBoxTag &, const QString &text, const QString init(text); } -base::lambda ConfirmBox::generateInformCallback(const base::lambda_copy &closedCallback) { +base::lambda ConfirmBox::generateInformCallback(base::lambda closedCallback) { auto callback = closedCallback; return base::lambda_guarded(this, [this, callback] { closeBox(); @@ -212,10 +212,10 @@ void ConfirmBox::paintEvent(QPaintEvent *e) { _text.drawLeftElided(p, st::boxPadding.left(), st::boxPadding.top(), _textWidth, width(), 16, style::al_left); } -InformBox::InformBox(QWidget*, const QString &text, base::lambda_copy &&closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, lang(lng_box_ok), std::move(closedCallback)) { +InformBox::InformBox(QWidget*, const QString &text, base::lambda closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, lang(lng_box_ok), std::move(closedCallback)) { } -InformBox::InformBox(QWidget*, const QString &text, const QString &doneText, base::lambda_copy &&closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) { +InformBox::InformBox(QWidget*, const QString &text, const QString &doneText, base::lambda closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) { } MaxInviteBox::MaxInviteBox(QWidget*, const QString &link) diff --git a/Telegram/SourceFiles/boxes/confirmbox.h b/Telegram/SourceFiles/boxes/confirmbox.h index 113fc198ac..f0214b8a3f 100644 --- a/Telegram/SourceFiles/boxes/confirmbox.h +++ b/Telegram/SourceFiles/boxes/confirmbox.h @@ -30,11 +30,11 @@ class FlatLabel; class InformBox; class ConfirmBox : public BoxContent, public ClickHandlerHost { public: - ConfirmBox(QWidget*, const QString &text, base::lambda &&confirmedCallback = base::lambda(), base::lambda &&cancelledCallback = base::lambda()); - ConfirmBox(QWidget*, const QString &text, const QString &confirmText, base::lambda &&confirmedCallback = base::lambda(), base::lambda &&cancelledCallback = base::lambda()); - ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, base::lambda &&confirmedCallback = base::lambda(), base::lambda &&cancelledCallback = base::lambda()); - ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, base::lambda &&confirmedCallback = base::lambda(), base::lambda &&cancelledCallback = base::lambda()); - ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, base::lambda &&confirmedCallback = base::lambda(), base::lambda &&cancelledCallback = base::lambda()); + ConfirmBox(QWidget*, const QString &text, base::lambda confirmedCallback = base::lambda(), base::lambda cancelledCallback = base::lambda()); + ConfirmBox(QWidget*, const QString &text, const QString &confirmText, base::lambda confirmedCallback = base::lambda(), base::lambda cancelledCallback = base::lambda()); + ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, base::lambda confirmedCallback = base::lambda(), base::lambda cancelledCallback = base::lambda()); + ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, base::lambda confirmedCallback = base::lambda(), base::lambda cancelledCallback = base::lambda()); + ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, base::lambda confirmedCallback = base::lambda(), base::lambda cancelledCallback = base::lambda()); void updateLink(); @@ -62,8 +62,8 @@ protected: private: struct InformBoxTag { }; - ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, base::lambda_copy &&closedCallback); - base::lambda generateInformCallback(const base::lambda_copy &closedCallback); + ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, base::lambda closedCallback); + base::lambda generateInformCallback(base::lambda closedCallback); friend class InformBox; void confirmed(); @@ -93,8 +93,8 @@ private: class InformBox : public ConfirmBox { public: - InformBox(QWidget*, const QString &text, base::lambda_copy &&closedCallback = base::lambda_copy()); - InformBox(QWidget*, const QString &text, const QString &doneText, base::lambda_copy &&closedCallback = base::lambda_copy()); + InformBox(QWidget*, const QString &text, base::lambda closedCallback = base::lambda()); + InformBox(QWidget*, const QString &text, const QString &doneText, base::lambda closedCallback = base::lambda()); }; diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp index f83257556f..1643b7e4b0 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.cpp +++ b/Telegram/SourceFiles/boxes/contactsbox.cpp @@ -528,7 +528,7 @@ bool ContactsBox::creationFail(const RPCError &error) { ContactsBox::Inner::ContactData::ContactData() = default; -ContactsBox::Inner::ContactData::ContactData(PeerData *peer, const base::lambda_copy &updateCallback) +ContactsBox::Inner::ContactData::ContactData(PeerData *peer, base::lambda updateCallback) : checkbox(std::make_unique(st::contactsPhotoCheckbox, updateCallback, PaintUserpicCallback(peer))) { } @@ -1471,7 +1471,7 @@ void ContactsBox::Inner::peerUnselected(PeerData *peer) { changePeerCheckState(data, peer, false, ChangeStateWay::SkipCallback); } -void ContactsBox::Inner::setPeerSelectedChangedCallback(base::lambda &&callback) { +void ContactsBox::Inner::setPeerSelectedChangedCallback(base::lambda callback) { _peerSelectedChangedCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/boxes/contactsbox.h b/Telegram/SourceFiles/boxes/contactsbox.h index b96392faea..471574b4d5 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.h +++ b/Telegram/SourceFiles/boxes/contactsbox.h @@ -152,7 +152,7 @@ public: Inner(QWidget *parent, ChatData *chat, MembersFilter membersFilter); Inner(QWidget *parent, UserData *bot); - void setPeerSelectedChangedCallback(base::lambda &&callback); + void setPeerSelectedChangedCallback(base::lambda callback); void peerUnselected(PeerData *peer); void updateFilter(QString filter = QString()); @@ -164,7 +164,7 @@ public: QVector selected(); QVector selectedInputs(); bool allAdmins() const; - void setAllAdminsChangedCallback(base::lambda &&allAdminsChangedCallback) { + void setAllAdminsChangedCallback(base::lambda allAdminsChangedCallback) { _allAdminsChangedCallback = std::move(allAdminsChangedCallback); } @@ -218,7 +218,7 @@ protected: private: struct ContactData { ContactData(); - ContactData(PeerData *peer, const base::lambda_copy &updateCallback); + ContactData(PeerData *peer, base::lambda updateCallback); ~ContactData(); std::unique_ptr checkbox; diff --git a/Telegram/SourceFiles/boxes/editcolorbox.h b/Telegram/SourceFiles/boxes/editcolorbox.h index 3dfc2c0b26..54bbfd3972 100644 --- a/Telegram/SourceFiles/boxes/editcolorbox.h +++ b/Telegram/SourceFiles/boxes/editcolorbox.h @@ -28,11 +28,11 @@ class EditColorBox : public BoxContent { public: EditColorBox(QWidget*, const QString &title, QColor current = QColor(255, 255, 255)); - void setSaveCallback(base::lambda &&callback) { + void setSaveCallback(base::lambda callback) { _saveCallback = std::move(callback); } - void setCancelCallback(base::lambda &&callback) { + void setCancelCallback(base::lambda callback) { _cancelCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h index ea8c805e2a..b90c6bdd14 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.h +++ b/Telegram/SourceFiles/boxes/send_files_box.h @@ -37,10 +37,10 @@ public: SendFilesBox(QWidget*, const QStringList &files, CompressConfirm compressed); SendFilesBox(QWidget*, const QString &phone, const QString &firstname, const QString &lastname); - void setConfirmedCallback(base::lambda &&callback) { + void setConfirmedCallback(base::lambda callback) { _confirmedCallback = std::move(callback); } - void setCancelledCallback(base::lambda &&callback) { + void setCancelledCallback(base::lambda callback) { _cancelledCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/boxes/sharebox.cpp b/Telegram/SourceFiles/boxes/sharebox.cpp index 792fbcaca3..b3f781044c 100644 --- a/Telegram/SourceFiles/boxes/sharebox.cpp +++ b/Telegram/SourceFiles/boxes/sharebox.cpp @@ -513,7 +513,7 @@ void ShareBox::Inner::paintChat(Painter &p, TimeMs ms, Chat *chat, int index) { chat->name.drawLeftElided(p, x + nameLeft, y + nameTop, nameWidth, outerWidth, 2, style::al_top, 0, -1, 0, true); } -ShareBox::Inner::Chat::Chat(PeerData *peer, const base::lambda_copy &updateCallback) +ShareBox::Inner::Chat::Chat(PeerData *peer, base::lambda updateCallback) : peer(peer) , checkbox(st::sharePhotoCheckbox, updateCallback, PaintUserpicCallback(peer)) , name(st::sharePhotoCheckbox.imageRadius * 2) { @@ -649,7 +649,7 @@ void ShareBox::Inner::peerUnselected(PeerData *peer) { changePeerCheckState(chat, false, ChangeStateWay::SkipCallback); } -void ShareBox::Inner::setPeerSelectedChangedCallback(base::lambda &&callback) { +void ShareBox::Inner::setPeerSelectedChangedCallback(base::lambda callback) { _peerSelectedChangedCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/boxes/sharebox.h b/Telegram/SourceFiles/boxes/sharebox.h index d0a396e811..72bc70df6f 100644 --- a/Telegram/SourceFiles/boxes/sharebox.h +++ b/Telegram/SourceFiles/boxes/sharebox.h @@ -114,7 +114,7 @@ class ShareBox::Inner : public TWidget, public RPCSender, private base::Subscrib public: Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallback); - void setPeerSelectedChangedCallback(base::lambda &&callback); + void setPeerSelectedChangedCallback(base::lambda callback); void peerUnselected(PeerData *peer); QVector selected() const; @@ -153,7 +153,7 @@ private: int displayedChatsCount() const; struct Chat { - Chat(PeerData *peer, const base::lambda_copy &updateCallback); + Chat(PeerData *peer, base::lambda updateCallback); PeerData *peer; Ui::RoundImageCheckbox checkbox; diff --git a/Telegram/SourceFiles/boxes/stickers_box.h b/Telegram/SourceFiles/boxes/stickers_box.h index 0dba9fd8b9..bcd359f023 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.h +++ b/Telegram/SourceFiles/boxes/stickers_box.h @@ -163,10 +163,10 @@ public: void setFullOrder(const Stickers::Order &order); void setRemovedSets(const Stickers::Order &removed); - void setInstallSetCallback(base::lambda &&callback) { + void setInstallSetCallback(base::lambda callback) { _installSetCallback = std::move(callback); } - void setLoadMoreCallback(base::lambda &&callback) { + void setLoadMoreCallback(base::lambda callback) { _loadMoreCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/core/click_handler.h b/Telegram/SourceFiles/core/click_handler.h index 4ecbf08e8d..734c98c797 100644 --- a/Telegram/SourceFiles/core/click_handler.h +++ b/Telegram/SourceFiles/core/click_handler.h @@ -180,7 +180,7 @@ protected: class LambdaClickHandler : public ClickHandler { public: - LambdaClickHandler(base::lambda &&handler) : _handler(std::move(handler)) { + LambdaClickHandler(base::lambda handler) : _handler(std::move(handler)) { } void onClick(Qt::MouseButton button) const override final { if (button == Qt::LeftButton && _handler) { diff --git a/Telegram/SourceFiles/core/lambda.h b/Telegram/SourceFiles/core/lambda.h index 81674a0061..ce2be188d7 100644 --- a/Telegram/SourceFiles/core/lambda.h +++ b/Telegram/SourceFiles/core/lambda.h @@ -23,415 +23,454 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include namespace base { -namespace internal { - - template - struct lambda_wrap_helper_base { - using construct_copy_other_type = void(*)(void *, const void *); // dst, src - using construct_move_other_type = void(*)(void *, void *); // dst, src - using call_type = Return(*)(const void *, Args...); - using destruct_type = void(*)(const void *); - - lambda_wrap_helper_base() = delete; - lambda_wrap_helper_base(const lambda_wrap_helper_base &other) = delete; - lambda_wrap_helper_base &operator=(const lambda_wrap_helper_base &other) = delete; - - lambda_wrap_helper_base( - construct_copy_other_type construct_copy_other, - construct_move_other_type construct_move_other, - call_type call, - destruct_type destruct) - : construct_copy_other(construct_copy_other) - , construct_move_other(construct_move_other) - , call(call) - , destruct(destruct) { - } - - const construct_copy_other_type construct_copy_other; - const construct_move_other_type construct_move_other; - const call_type call; - const destruct_type destruct; - - static constexpr size_t kFullStorageSize = 24U + sizeof(void*); - static constexpr size_t kStorageSize = kFullStorageSize - sizeof(void*); - using alignment = uint64; - - template - using IsLarge = std::integral_constant) <= kStorageSize)>; - - protected: - static void bad_construct_copy(void *lambda, const void *source) { - t_assert(!"base::lambda bad_construct_copy() called!"); - } - - }; - - template - struct lambda_wrap_empty : public lambda_wrap_helper_base { - static void construct_copy_other_method(void *lambda, const void *source) { - } - static void construct_move_other_method(void *lambda, void *source) { - } - static Return call_method(const void *lambda, Args... args) { - t_assert(!"base::lambda empty call_method() called!"); - return Return(); - } - static void destruct_method(const void *lambda) { - } - lambda_wrap_empty() : lambda_wrap_helper_base( - &lambda_wrap_empty::construct_copy_other_method, - &lambda_wrap_empty::construct_move_other_method, - &lambda_wrap_empty::call_method, - &lambda_wrap_empty::destruct_method) { - } - - static const lambda_wrap_empty instance; - - }; - - template - const lambda_wrap_empty lambda_wrap_empty::instance = {}; - - template struct lambda_wrap_helper_move_impl; - - template - struct lambda_wrap_helper_move_impl : public lambda_wrap_helper_base { - using JustLambda = std::decay_t; - using LambdaPtr = std::unique_ptr; - using Parent = lambda_wrap_helper_base; - static void construct_move_other_method(void *lambda, void *source) { - auto source_lambda = static_cast(source); - new (lambda) LambdaPtr(std::move(*source_lambda)); - } - static void construct_move_lambda_method(void *lambda, void *source) { - auto source_lambda = static_cast(source); - new (lambda) LambdaPtr(std::make_unique(static_cast(*source_lambda))); - } - static Return call_method(const void *lambda, Args... args) { - return (**static_cast(lambda))(std::forward(args)...); - } - static void destruct_method(const void *lambda) { - static_cast(lambda)->~LambdaPtr(); - } - lambda_wrap_helper_move_impl() : Parent( - &Parent::bad_construct_copy, - &lambda_wrap_helper_move_impl::construct_move_other_method, - &lambda_wrap_helper_move_impl::call_method, - &lambda_wrap_helper_move_impl::destruct_method) { - } - - protected: - lambda_wrap_helper_move_impl( - typename Parent::construct_copy_other_type construct_copy_other - ) : Parent( - construct_copy_other, - &lambda_wrap_helper_move_impl::construct_move_other_method, - &lambda_wrap_helper_move_impl::call_method, - &lambda_wrap_helper_move_impl::destruct_method) { - } - - }; - - template - struct lambda_wrap_helper_move_impl : public lambda_wrap_helper_base { - using JustLambda = std::decay_t; - using Parent = lambda_wrap_helper_base; - static void construct_move_other_method(void *lambda, void *source) { - auto source_lambda = static_cast(source); - new (lambda) JustLambda(static_cast(*source_lambda)); - } - static void construct_move_lambda_method(void *lambda, void *source) { - static_assert(alignof(JustLambda) <= alignof(typename Parent::alignment), "Bad lambda alignment."); - auto space = sizeof(JustLambda); - auto aligned = std::align(alignof(JustLambda), space, lambda, space); - t_assert(aligned == lambda); - auto source_lambda = static_cast(source); - new (lambda) JustLambda(static_cast(*source_lambda)); - } - static Return call_method(const void *lambda, Args... args) { - return (*static_cast(lambda))(std::forward(args)...); - } - static void destruct_method(const void *lambda) { - static_cast(lambda)->~JustLambda(); - } - lambda_wrap_helper_move_impl() : Parent( - &Parent::bad_construct_copy, - &lambda_wrap_helper_move_impl::construct_move_other_method, - &lambda_wrap_helper_move_impl::call_method, - &lambda_wrap_helper_move_impl::destruct_method) { - } - - protected: - lambda_wrap_helper_move_impl( - typename Parent::construct_copy_other_type construct_copy_other - ) : Parent( - construct_copy_other, - &lambda_wrap_helper_move_impl::construct_move_other_method, - &lambda_wrap_helper_move_impl::call_method, - &lambda_wrap_helper_move_impl::destruct_method) { - } - - }; - - template - struct lambda_wrap_helper_move : public lambda_wrap_helper_move_impl::template IsLarge - , Return, Args...> { - static const lambda_wrap_helper_move instance; - }; - - template - const lambda_wrap_helper_move lambda_wrap_helper_move::instance = {}; - - template struct lambda_wrap_helper_copy_impl; - - template - struct lambda_wrap_helper_copy_impl : public lambda_wrap_helper_move_impl { - using JustLambda = std::decay_t; - using LambdaPtr = std::unique_ptr; - using Parent = lambda_wrap_helper_move_impl; - static void construct_copy_other_method(void *lambda, const void *source) { - auto source_lambda = static_cast(source); - new (lambda) LambdaPtr(std::make_unique(*source_lambda->get())); - } - static void construct_copy_lambda_method(void *lambda, const void *source) { - auto source_lambda = static_cast(source); - new (lambda) LambdaPtr(std::make_unique(static_cast(*source_lambda))); - } - lambda_wrap_helper_copy_impl() : Parent(&lambda_wrap_helper_copy_impl::construct_copy_other_method) { - } - - }; - - template - struct lambda_wrap_helper_copy_impl : public lambda_wrap_helper_move_impl { - using JustLambda = std::decay_t; - using Parent = lambda_wrap_helper_move_impl; - static void construct_copy_other_method(void *lambda, const void *source) { - auto source_lambda = static_cast(source); - new (lambda) JustLambda(static_cast(*source_lambda)); - } - static void construct_copy_lambda_method(void *lambda, const void *source) { - static_assert(alignof(JustLambda) <= alignof(typename Parent::alignment), "Bad lambda alignment."); - auto space = sizeof(JustLambda); - auto aligned = std::align(alignof(JustLambda), space, lambda, space); - t_assert(aligned == lambda); - auto source_lambda = static_cast(source); - new (lambda) JustLambda(static_cast(*source_lambda)); - } - lambda_wrap_helper_copy_impl() : Parent(&lambda_wrap_helper_copy_impl::construct_copy_other_method) { - } - - }; - - template - struct lambda_wrap_helper_copy : public lambda_wrap_helper_copy_impl::template IsLarge - , Return, Args...> { - static const lambda_wrap_helper_copy instance; - }; - - template - const lambda_wrap_helper_copy lambda_wrap_helper_copy::instance = {}; - -} // namespace internal +template class lambda_once; template class lambda; -template class lambda_copy; - -template -class lambda { - using BaseHelper = internal::lambda_wrap_helper_base; - using EmptyHelper = internal::lambda_wrap_empty; - - template - using IsUnique = std::is_same>; - template - using IsWrap = std::is_same, std::decay_t>; - template - using IsOther = std::enable_if_t::value && !IsWrap::value>; - template - using IsRvalue = std::enable_if_t::value>; - -public: - using return_type = Return; - - lambda() : helper_(&EmptyHelper::instance) { - } - - lambda(const lambda &other) = delete; - lambda &operator=(const lambda &other) = delete; - - lambda(lambda &&other) : helper_(other.helper_) { - helper_->construct_move_other(storage_, other.storage_); - } - lambda &operator=(lambda &&other) { - auto temp = std::move(other); - helper_->destruct(storage_); - helper_ = temp.helper_; - helper_->construct_move_other(storage_, temp.storage_); - return *this; - } - - void swap(lambda &other) { - if (this != &other) std::swap(*this, other); - } - - template , typename = IsRvalue> - lambda(Lambda &&other) : helper_(&internal::lambda_wrap_helper_move::instance) { - internal::lambda_wrap_helper_move::construct_move_lambda_method(storage_, &other); - } - - template , typename = IsRvalue> - lambda &operator=(Lambda &&other) { - auto temp = std::move(other); - helper_->destruct(storage_); - helper_ = &internal::lambda_wrap_helper_move::instance; - internal::lambda_wrap_helper_move::construct_move_lambda_method(storage_, &temp); - return *this; - } - - inline Return operator()(Args... args) const { - return helper_->call(storage_, std::forward(args)...); - } - - explicit operator bool() const { - return (helper_ != &EmptyHelper::instance); - } - - ~lambda() { - helper_->destruct(storage_); - } - -protected: - struct Private { - }; - lambda(const BaseHelper *helper, const Private &) : helper_(helper) { - } - - using alignment = typename BaseHelper::alignment; - static_assert(BaseHelper::kStorageSize % sizeof(alignment) == 0, "Bad storage size."); - alignas(typename BaseHelper::alignment) alignment storage_[BaseHelper::kStorageSize / sizeof(alignment)]; - const BaseHelper *helper_; - -}; - -template -class lambda_copy : public lambda { - using BaseHelper = internal::lambda_wrap_helper_base; - using Parent = lambda; - - template - using IsOther = std::enable_if_t>::value>; - template - using IsRvalue = std::enable_if_t::value>; - template - using IsNotRvalue = std::enable_if_t::value>; - -public: - lambda_copy() = default; - - lambda_copy(const lambda_copy &other) : Parent(other.helper_, typename Parent::Private()) { - this->helper_->construct_copy_other(this->storage_, other.storage_); - } - lambda_copy &operator=(const lambda_copy &other) { - auto temp = other; - temp.swap(*this); - return *this; - } - - lambda_copy(lambda_copy &&other) = default; - lambda_copy &operator=(lambda_copy &&other) = default; - - void swap(lambda_copy &other) { - if (this != &other) std::swap(*this, other); - } - - lambda_copy clone() const { - return *this; - } - - template > - lambda_copy(const Lambda &other) : Parent(&internal::lambda_wrap_helper_copy::instance, typename Parent::Private()) { - internal::lambda_wrap_helper_copy::construct_copy_lambda_method(this->storage_, &other); - } - - template , typename = IsRvalue> - lambda_copy(Lambda &&other) : Parent(&internal::lambda_wrap_helper_copy::instance, typename Parent::Private()) { - internal::lambda_wrap_helper_copy::construct_move_lambda_method(this->storage_, &other); - } - - template > - lambda_copy &operator=(const Lambda &other) { - auto temp = other; - this->helper_->destruct(this->storage_); - this->helper_ = &internal::lambda_wrap_helper_copy::instance; - internal::lambda_wrap_helper_copy::construct_copy_lambda_method(this->storage_, &other); - return *this; - } - - template , typename = IsRvalue> - lambda_copy &operator=(Lambda &&other) { - auto temp = std::move(other); - this->helper_->destruct(this->storage_); - this->helper_ = &internal::lambda_wrap_helper_copy::instance; - internal::lambda_wrap_helper_copy::construct_move_lambda_method(this->storage_, &other); - return *this; - } - -}; // Get lambda type from a lambda template parameter. -namespace internal { +namespace lambda_internal { template -struct lambda_type_resolver; +struct type_resolver; template -struct lambda_type_resolver { +struct type_resolver { using type = lambda; static constexpr auto is_mutable = false; }; template -struct lambda_type_resolver { +struct type_resolver { using type = lambda; static constexpr auto is_mutable = true; }; -template -struct lambda_type_helper { - using type = typename lambda_type_resolver::type; +template +struct type_helper { + using type = typename type_resolver::type; + static constexpr auto is_mutable = type_resolver::is_mutable; }; -} // namespace internal +} // namespace lambda_internal -template -using lambda_type = typename internal::lambda_type_helper::type; +template +using lambda_type = typename lambda_internal::type_helper>::type; + +template +constexpr bool lambda_is_mutable = lambda_internal::type_helper>::is_mutable; + +namespace lambda_internal { + +constexpr auto kFullStorageSize = 32U; +static_assert(kFullStorageSize % sizeof(void*) == 0, "Invalid pointer size!"); + +constexpr auto kStorageSize = kFullStorageSize - sizeof(void*); +using alignment = std::max_align_t; + +template +constexpr bool is_large = (sizeof(std::decay_t) > kStorageSize); + +inline void bad_construct_copy(void *lambda, const void *source) { + t_assert(!"base::lambda bad_construct_copy() called!"); +} + +template +Return bad_const_call(const void *lambda, Args...) { + t_assert(!"base::lambda bad_const_call() called!"); + return Return(); +} + +template +struct vtable_base { + using construct_copy_other_type = void(*)(void *, const void *); // dst, src + using construct_move_other_type = void(*)(void *, void *); // dst, src + using const_call_type = Return(*)(const void *, Args...); + using call_type = Return(*)(void *, Args...); + using destruct_type = void(*)(const void *); + + vtable_base() = delete; + vtable_base(const vtable_base &other) = delete; + vtable_base &operator=(const vtable_base &other) = delete; + + vtable_base( + construct_copy_other_type construct_copy_other, + construct_move_other_type construct_move_other, + const_call_type const_call, + call_type call, + destruct_type destruct) + : construct_copy_other(construct_copy_other) + , construct_move_other(construct_move_other) + , const_call(const_call) + , call(call) + , destruct(destruct) { + } + + const construct_copy_other_type construct_copy_other; + const construct_move_other_type construct_move_other; + const const_call_type const_call; + const call_type call; + const destruct_type destruct; + +}; + +template struct vtable_once_impl; + +template +struct vtable_once_impl : public vtable_base { + using JustLambda = std::decay_t; + using LambdaPtr = std::unique_ptr; + using Parent = vtable_base; + static void construct_move_other_method(void *storage, void *source) { + auto source_lambda_ptr = static_cast(source); + new (storage) LambdaPtr(std::move(*source_lambda_ptr)); + } + static Return call_method(void *storage, Args... args) { + return (**static_cast(storage))(std::forward(args)...); + } + static void destruct_method(const void *storage) { + static_cast(storage)->~LambdaPtr(); + } + vtable_once_impl() : Parent( + &bad_construct_copy, + &vtable_once_impl::construct_move_other_method, + &bad_const_call, + &vtable_once_impl::call_method, + &vtable_once_impl::destruct_method) { + } + + // Used directly. + static void construct_move_lambda_method(void *storage, void *source) { + auto source_lambda = static_cast(source); + new (storage) LambdaPtr(std::make_unique(static_cast(*source_lambda))); + } + +protected: + vtable_once_impl( + typename Parent::construct_copy_other_type construct_copy_other, + typename Parent::const_call_type const_call + ) : Parent( + construct_copy_other, + &vtable_once_impl::construct_move_other_method, + const_call, + &vtable_once_impl::call_method, + &vtable_once_impl::destruct_method) { + } + +}; + +template +struct vtable_once_impl : public vtable_base { + using JustLambda = std::decay_t; + using Parent = vtable_base; + static void construct_move_other_method(void *storage, void *source) { + auto source_lambda = static_cast(source); + new (storage) JustLambda(static_cast(*source_lambda)); + } + static Return call_method(void *storage, Args... args) { + return (*static_cast(storage))(std::forward(args)...); + } + static void destruct_method(const void *storage) { + static_cast(storage)->~JustLambda(); + } + vtable_once_impl() : Parent( + &bad_construct_copy, + &vtable_once_impl::construct_move_other_method, + &bad_const_call, + &vtable_once_impl::call_method, + &vtable_once_impl::destruct_method) { + } + + // Used directly. + static void construct_move_lambda_method(void *storage, void *source) { + auto source_lambda = static_cast(source); + new (storage) JustLambda(static_cast(*source_lambda)); + } + +protected: + vtable_once_impl( + typename Parent::construct_copy_other_type construct_copy_other, + typename Parent::const_call_type const_call + ) : Parent( + construct_copy_other, + &vtable_once_impl::construct_move_other_method, + const_call, + &vtable_once_impl::call_method, + &vtable_once_impl::destruct_method) { + } + +}; + +template +struct vtable_once : public vtable_once_impl, Return, Args...> { + static const vtable_once instance; +}; + +template +const vtable_once vtable_once::instance = {}; + +template struct vtable_impl; + +template +struct vtable_impl : public vtable_once_impl { + using JustLambda = std::decay_t; + using LambdaPtr = std::unique_ptr; + using Parent = vtable_once_impl; + static void construct_copy_other_method(void *storage, const void *source) { + auto source_lambda = static_cast(source); + new (storage) LambdaPtr(std::make_unique(*source_lambda->get())); + } + static Return const_call_method(const void *storage, Args... args) { + auto lambda_ptr = static_cast(storage)->get(); + return (*static_cast(lambda_ptr))(std::forward(args)...); + } + vtable_impl() : Parent( + &vtable_impl::construct_copy_other_method, + &vtable_impl::const_call_method + ) { + } + +}; + +template +struct vtable_impl : public vtable_once_impl { + using JustLambda = std::decay_t; + using Parent = vtable_once_impl; + static void construct_copy_other_method(void *storage, const void *source) { + auto source_lambda = static_cast(source); + new (storage) JustLambda(static_cast(*source_lambda)); + } + static Return const_call_method(const void *storage, Args... args) { + static_assert(!lambda_is_mutable, "For mutable lambda use base::lambda_once wrapper"); + return (*static_cast(storage))(std::forward(args)...); + } + vtable_impl() : Parent( + &vtable_impl::construct_copy_other_method, + &vtable_impl::const_call_method + ) { + } + +}; + +template +struct vtable : public vtable_impl, Return, Args...> { + static const vtable instance; +}; + +template +const vtable vtable::instance = {}; + +} // namespace lambda_internal + +template +class lambda_once { + using VTable = lambda_internal::vtable_base; + +public: + using return_type = Return; + + lambda_once() { + data_.vtable = nullptr; + } + lambda_once(const lambda_once &other) = delete; + lambda_once &operator=(const lambda_once &other) = delete; + + // Move construct / assign from the same type. + lambda_once(lambda_once &&other) { + if ((data_.vtable = other.data_.vtable)) { + data_.vtable->construct_move_other(data_.storage, other.data_.storage); + } + } + lambda_once &operator=(lambda_once &&other) { + if (this != &other) { + if (data_.vtable) { + data_.vtable->destruct(data_.storage); + } + if ((data_.vtable = other.data_.vtable)) { + data_.vtable->construct_move_other(data_.storage, other.data_.storage); + data_.vtable->destruct(other.data_.storage); + other.data_.vtable = nullptr; + } + } + return *this; + } + + // Move construct / assign from a derived type. + lambda_once(lambda &&other) { + if ((data_.vtable = other.data_.vtable)) { + data_.vtable->construct_move_other(data_.storage, other.data_.storage); + data_.vtable->destruct(other.data_.storage); + other.data_.vtable = nullptr; + } + } + lambda_once &operator=(lambda &&other) { + if (this != &other) { + if (data_.vtable) { + data_.vtable->destruct(data_.storage); + } + if ((data_.vtable = other.data_.vtable)) { + data_.vtable->construct_move_other(data_.storage, other.data_.storage); + data_.vtable->destruct(other.data_.storage); + other.data_.vtable = nullptr; + } + } + return *this; + } + + // Copy construct / assign from a derived type. + lambda_once(const lambda &other) { + if ((data_.vtable = other.data_.vtable)) { + data_.vtable->construct_copy_other(data_.storage, other.data_.storage); + } + } + lambda_once &operator=(const lambda &other) { + if (this != &other) { + if (data_.vtable) { + data_.vtable->destruct(data_.storage); + } + if ((data_.vtable = other.data_.vtable)) { + data_.vtable->construct_copy_other(data_.storage, other.data_.storage); + } + } + return *this; + } + + // Copy / move construct / assign from an arbitrary type. + template + lambda_once(Lambda other) { + data_.vtable = &lambda_internal::vtable_once::instance; + lambda_internal::vtable_once::construct_move_lambda_method(data_.storage, &other); + } + template + lambda_once &operator=(Lambda other) { + if (data_.vtable) { + data_.vtable->destruct(data_.storage); + } + data_.vtable = &lambda_internal::vtable_once::instance; + lambda_internal::vtable_once::construct_move_lambda_method(data_.storage, &other); + return *this; + } + + void swap(lambda_once &other) { + if (this != &other) { + std::swap(*this, other); + } + } + + inline Return operator()(Args... args) { + t_assert(data_.vtable != nullptr); + return data_.vtable->call(data_.storage, std::forward(args)...); + } + + explicit operator bool() const { + return (data_.vtable != nullptr); + } + + ~lambda_once() { + if (data_.vtable) { + data_.vtable->destruct(data_.storage); + } + } + +protected: + struct Private { + }; + lambda_once(const VTable *vtable, const Private &) { + data_.vtable = vtable; + } + + struct Data { + char storage[lambda_internal::kStorageSize]; + const VTable *vtable; + }; + union { + lambda_internal::alignment alignment_; + char raw_[lambda_internal::kFullStorageSize]; + Data data_; + }; + +}; + +template +class lambda final : public lambda_once { + using Parent = lambda_once; + +public: + lambda() = default; + + // Move construct / assign from the same type. + lambda(lambda &&other) : Parent(std::move(other)) { + } + lambda &operator=(lambda &&other) { + Parent::operator=(std::move(other)); + return *this; + } + + // Copy construct / assign from the same type. + lambda(const lambda &other) : Parent(other) { + } + lambda &operator=(const lambda &other) { + Parent::operator=(other); + return *this; + } + + // Copy / move construct / assign from an arbitrary type. + template + lambda(Lambda other) : Parent(&lambda_internal::vtable::instance, typename Parent::Private()) { + lambda_internal::vtable::construct_move_lambda_method(this->data_.storage, &other); + } + template + lambda &operator=(Lambda other) { + if (this->data_.vtable) { + this->data_.vtable->destruct(this->data_.storage); + } + this->data_.vtable = &lambda_internal::vtable::instance; + lambda_internal::vtable::construct_move_lambda_method(this->data_.storage, &other); + return *this; + } + + inline Return operator()(Args... args) const { + t_assert(this->data_.vtable != nullptr); + return this->data_.vtable->const_call(this->data_.storage, std::forward(args)...); + } + + void swap(lambda &other) { + if (this != &other) { + std::swap(*this, other); + } + } + +}; // Guard lambda call by one or many QObject* weak pointers. -namespace internal { - -template -class lambda_guard_creator; +namespace lambda_internal { template -class lambda_guard_data { +class guard_data { public: using return_type = typename lambda_type::return_type; template - inline lambda_guard_data(PointersAndLambda&&... qobjectsAndLambda) : _lambda(init(_pointers, std::forward(qobjectsAndLambda)...)) { + inline guard_data(PointersAndLambda&&... qobjectsAndLambda) : _lambda(init(_pointers, std::forward(qobjectsAndLambda)...)) { } - inline lambda_guard_data(const lambda_guard_data &other) : _lambda(other._lambda) { + inline guard_data(const guard_data &other) : _lambda(other._lambda) { for (auto i = 0; i != N; ++i) { _pointers[i] = other._pointers[i]; } } + template + inline return_type operator()(Args&&... args) { + for (int i = 0; i != N; ++i) { + if (!_pointers[i]) { + return return_type(); + } + } + return _lambda(std::forward(args)...); + } + template inline return_type operator()(Args&&... args) const { for (int i = 0; i != N; ++i) { @@ -458,31 +497,36 @@ private: }; template -class lambda_guard { +class guard { public: using return_type = typename lambda_type::return_type; template - inline lambda_guard(PointersAndLambda&&... qobjectsAndLambda) : _data(std::make_unique>(std::forward(qobjectsAndLambda)...)) { + inline guard(PointersAndLambda&&... qobjectsAndLambda) : _data(std::make_unique>(std::forward(qobjectsAndLambda)...)) { static_assert(sizeof...(PointersAndLambda) == N + 1, "Wrong argument count!"); } - inline lambda_guard(const lambda_guard &&other) : _data(std::move(other._data)) { + inline guard(const guard &other) : _data(std::make_unique>(static_cast &>(*other._data))) { } - inline lambda_guard(lambda_guard &&other) : _data(std::move(other._data)) { + inline guard(guard &&other) : _data(std::move(other._data)) { } - inline lambda_guard &operator=(const lambda_guard &&other) { + inline guard &operator=(const guard &&other) { _data = std::move(other._data); return *this; } - inline lambda_guard &operator=(lambda_guard &&other) { + inline guard &operator=(guard &&other) { _data = std::move(other._data); return *this; } + template + inline return_type operator()(Args&&... args) { + return (*_data)(std::forward(args)...); + } + template inline return_type operator()(Args&&... args) const { return (*_data)(std::forward(args)...); @@ -492,51 +536,45 @@ public: return !_data; } - lambda_guard clone() const { - return lambda_guard(*this); - } - private: - inline lambda_guard(const lambda_guard &other) : _data(std::make_unique>(static_cast &>(*other._data))) { - } - - mutable std::unique_ptr> _data; + mutable std::unique_ptr> _data; }; template -struct lambda_guard_type; +struct guard_type; template -struct lambda_guard_type { - using type = typename lambda_guard_type::type; +struct guard_type { + using type = typename guard_type::type; }; template -struct lambda_guard_type { - using type = lambda_guard; +struct guard_type { + using type = guard; }; template -struct lambda_guard_type_helper { +struct guard_type_helper { static constexpr int N = sizeof...(PointersAndLambda); - using type = typename lambda_guard_type::type; + using type = typename guard_type::type; }; template -using lambda_guard_t = typename lambda_guard_type_helper::type; +using guard_t = typename guard_type_helper::type; template -struct lambda_type_helper> { - using type = typename lambda_type_helper::type; +struct type_helper> { + using type = typename type_helper::type; + static constexpr auto is_mutable = type_helper::is_mutable; }; -} // namespace internal +} // namespace lambda_internal template -inline internal::lambda_guard_t lambda_guarded(PointersAndLambda&&... qobjectsAndLambda) { +inline lambda_internal::guard_t lambda_guarded(PointersAndLambda&&... qobjectsAndLambda) { static_assert(sizeof...(PointersAndLambda) > 0, "Lambda should be passed here."); - return internal::lambda_guard_t(std::forward(qobjectsAndLambda)...); + return lambda_internal::guard_t(std::forward(qobjectsAndLambda)...); } // Pass lambda instead of a Qt void() slot. @@ -545,20 +583,20 @@ class lambda_slot_wrap : public QObject { Q_OBJECT public: - lambda_slot_wrap(QObject *parent, lambda &&lambda) : QObject(parent), _lambda(std::move(lambda)) { + lambda_slot_wrap(QObject *parent, lambda_once lambda) : QObject(parent), _lambda(std::move(lambda)) { } -public slots: - void action() { + public slots : + void action() { _lambda(); } private: - lambda _lambda; + lambda_once _lambda; }; -inline lambda_slot_wrap *lambda_slot(QObject *parent, lambda &&lambda) { +inline lambda_slot_wrap *lambda_slot(QObject *parent, lambda_once lambda) { return new lambda_slot_wrap(parent, std::move(lambda)); } @@ -566,21 +604,21 @@ class lambda_slot_once_wrap : public QObject { Q_OBJECT public: - lambda_slot_once_wrap(QObject *parent, lambda &&lambda) : QObject(parent), _lambda(std::move(lambda)) { + lambda_slot_once_wrap(QObject *parent, lambda_once lambda) : QObject(parent), _lambda(std::move(lambda)) { } -public slots : - void action() { + public slots : + void action() { _lambda(); delete this; } private: - lambda _lambda; + lambda_once _lambda; }; -inline lambda_slot_once_wrap *lambda_slot_once(QObject *parent, lambda &&lambda) { +inline lambda_slot_once_wrap *lambda_slot_once(QObject *parent, lambda_once lambda) { return new lambda_slot_once_wrap(parent, std::move(lambda)); } diff --git a/Telegram/SourceFiles/core/single_timer.cpp b/Telegram/SourceFiles/core/single_timer.cpp index 6f3f1e1670..53245db4ad 100644 --- a/Telegram/SourceFiles/core/single_timer.cpp +++ b/Telegram/SourceFiles/core/single_timer.cpp @@ -28,7 +28,7 @@ SingleTimer::SingleTimer(QObject *parent) : QTimer(parent) { Sandbox::connect(SIGNAL(adjustSingleTimers()), this, SLOT(adjust())); } -void SingleTimer::setTimeoutHandler(base::lambda &&handler) { +void SingleTimer::setTimeoutHandler(base::lambda handler) { if (_handler && !handler) { disconnect(this, SIGNAL(timeout()), this, SLOT(onTimeout())); } else if (handler && !_handler) { diff --git a/Telegram/SourceFiles/core/single_timer.h b/Telegram/SourceFiles/core/single_timer.h index b6cc945055..678c21b335 100644 --- a/Telegram/SourceFiles/core/single_timer.h +++ b/Telegram/SourceFiles/core/single_timer.h @@ -31,7 +31,7 @@ public: void setSingleShot(bool); // is not available void start(); // is not available - void setTimeoutHandler(base::lambda &&handler); + void setTimeoutHandler(base::lambda handler); public slots: void start(int msec); diff --git a/Telegram/SourceFiles/core/task_queue.cpp b/Telegram/SourceFiles/core/task_queue.cpp index 7a1c549743..f994537a73 100644 --- a/Telegram/SourceFiles/core/task_queue.cpp +++ b/Telegram/SourceFiles/core/task_queue.cpp @@ -195,7 +195,7 @@ TaskQueue *TaskQueue::TaskQueueList::TakeFirst(int list_index_) { void TaskQueue::TaskThreadPool::AddQueueTask(TaskQueue *queue, Task &&task) { QMutexLocker lock(&queues_mutex_); - queue->tasks_.push_back(new Task(std::move(task))); + queue->tasks_.push_back(std::move(task)); auto list_was_empty = queue_list_.Empty(kAllQueuesList); auto threads_count = threads_.size(); auto all_threads_processing = (threads_count == tasks_in_process_); @@ -258,7 +258,7 @@ void TaskQueue::TaskThreadPool::ThreadFunction() { bool serial_queue_destroyed = false; bool task_was_processed = false; while (true) { - std::unique_ptr task; + Task task; { QMutexLocker lock(&queues_mutex_); @@ -297,7 +297,7 @@ void TaskQueue::TaskThreadPool::ThreadFunction() { t_assert(!queue->tasks_.empty()); - task.reset(queue->tasks_.front()); + task = std::move(queue->tasks_.front()); queue->tasks_.pop_front(); if (queue->type_ == Type::Serial) { @@ -318,7 +318,7 @@ void TaskQueue::TaskThreadPool::ThreadFunction() { } } - (*task)(); + task(); } } @@ -336,15 +336,12 @@ TaskQueue::~TaskQueue() { thread_pool->RemoveQueue(this); } } - for (auto task : take(tasks_)) { - delete task; - } } void TaskQueue::Put(Task &&task) { if (type_ == Type::Main) { QMutexLocker lock(&tasks_mutex_); - tasks_.push_back(new Task(std::move(task))); + tasks_.push_back(std::move(task)); Sandbox::MainThreadTaskAdded(); } else { @@ -372,7 +369,7 @@ void TaskQueue::ProcessMainTasks(TimeMs max_time_spent) { // static } bool TaskQueue::ProcessOneMainTask() { // static - std::unique_ptr task; + Task task; { QMutexLocker lock(&Main().tasks_mutex_); auto &tasks = Main().tasks_; @@ -380,11 +377,11 @@ bool TaskQueue::ProcessOneMainTask() { // static return false; } - task.reset(tasks.front()); + task = std::move(tasks.front()); tasks.pop_front(); } - (*task)(); + task(); return true; } diff --git a/Telegram/SourceFiles/core/task_queue.h b/Telegram/SourceFiles/core/task_queue.h index 0d4c424550..d2e57baa9b 100644 --- a/Telegram/SourceFiles/core/task_queue.h +++ b/Telegram/SourceFiles/core/task_queue.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org namespace base { -using Task = lambda; +using Task = lambda_once; // An attempt to create/use a TaskQueue or one of the default queues // after the main() has returned leads to an undefined behaviour. @@ -69,7 +69,7 @@ private: const Type type_; const Priority priority_; - QList tasks_; // TODO: std::deque + std::deque tasks_; QMutex tasks_mutex_; // Only for the main queue. // Only for the other queues, not main. diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp index 08db611ca1..e1d41e1e9d 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp @@ -30,7 +30,7 @@ namespace Dialogs { RippleRow::RippleRow() = default; RippleRow::~RippleRow() = default; -void RippleRow::addRipple(QPoint origin, QSize size, base::lambda_copy &&updateCallback) { +void RippleRow::addRipple(QPoint origin, QSize size, base::lambda updateCallback) { if (!_ripple) { auto mask = Ui::RippleAnimation::rectMask(size); _ripple = std::make_unique(st::dialogsRipple, std::move(mask), std::move(updateCallback)); diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.h b/Telegram/SourceFiles/dialogs/dialogs_row.h index 187f9101ed..94b6073f1c 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_row.h +++ b/Telegram/SourceFiles/dialogs/dialogs_row.h @@ -39,7 +39,7 @@ public: RippleRow(); ~RippleRow(); - void addRipple(QPoint origin, QSize size, base::lambda_copy &&updateCallback); + void addRipple(QPoint origin, QSize size, base::lambda updateCallback); void stopLastRipple(); void paintRipple(Painter &p, int x, int y, int outerWidth, TimeMs ms, const QColor *colorOverride = nullptr) const; diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index eaf4edc74d..9d2bb539e0 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -1185,7 +1185,7 @@ void DialogsInner::contextMenuEvent(QContextMenuEvent *e) { } _menu = new Ui::PopupMenu(nullptr); - App::main()->fillPeerMenu(_menuPeer, [this](const QString &text, base::lambda &&callback) { + App::main()->fillPeerMenu(_menuPeer, [this](const QString &text, base::lambda callback) { return _menu->addAction(text, std::move(callback)); }, true); connect(_menu, SIGNAL(destroyed(QObject*)), this, SLOT(onMenuDestroyed(QObject*))); diff --git a/Telegram/SourceFiles/dialogswidget.h b/Telegram/SourceFiles/dialogswidget.h index b2c830bfad..84eff1d1fa 100644 --- a/Telegram/SourceFiles/dialogswidget.h +++ b/Telegram/SourceFiles/dialogswidget.h @@ -112,7 +112,7 @@ public: PeerData *updateFromParentDrag(QPoint globalPos); - void setLoadMoreCallback(base::lambda &&callback) { + void setLoadMoreCallback(base::lambda callback) { _loadMoreCallback = std::move(callback); } void setVisibleTopBottom(int visibleTop, int visibleBottom) override; diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index 0122809798..665a8b5746 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -38,7 +38,7 @@ Q_DECLARE_METATYPE(Ui::ShowWay); namespace App { namespace internal { -void CallDelayed(int duration, base::lambda &&lambda) { +void CallDelayed(int duration, base::lambda_once &&lambda) { QTimer::singleShot(duration, base::lambda_slot_once(App::app(), std::move(lambda)), SLOT(action())); } diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h index 6845106a21..55dd371f8b 100644 --- a/Telegram/SourceFiles/facades.h +++ b/Telegram/SourceFiles/facades.h @@ -35,12 +35,12 @@ class ItemBase; namespace App { namespace internal { -void CallDelayed(int duration, base::lambda &&lambda); +void CallDelayed(int duration, base::lambda_once &&lambda); } // namespace internal template -inline void CallDelayed(int duration, base::internal::lambda_guard &&guarded) { +inline void CallDelayed(int duration, base::lambda_internal::guard &&guarded) { return internal::CallDelayed(duration, [guarded = std::move(guarded)] { guarded(); }); } @@ -54,7 +54,15 @@ template inline base::lambda LambdaDelayed(int duration, PointersAndLambda&&... qobjectsAndLambda) { auto guarded = base::lambda_guarded(std::forward(qobjectsAndLambda)...); return [guarded = std::move(guarded), duration] { - CallDelayed(duration, guarded.clone()); + internal::CallDelayed(duration, [guarded] { guarded(); }); + }; +} + +template +inline base::lambda_once LambdaDelayedOnce(int duration, PointersAndLambda&&... qobjectsAndLambda) { + auto guarded = base::lambda_guarded(std::forward(qobjectsAndLambda)...); + return [guarded = std::move(guarded), duration]() mutable { + internal::CallDelayed(duration, [guarded = std::move(guarded)] { guarded(); }); }; } diff --git a/Telegram/SourceFiles/history/history_drag_area.h b/Telegram/SourceFiles/history/history_drag_area.h index d51ad7227e..875b41512f 100644 --- a/Telegram/SourceFiles/history/history_drag_area.h +++ b/Telegram/SourceFiles/history/history_drag_area.h @@ -37,7 +37,7 @@ public: void hideFast(); - void setDroppedCallback(base::lambda &&callback) { + void setDroppedCallback(base::lambda callback) { _droppedCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp index 4553851ca9..c60142788f 100644 --- a/Telegram/SourceFiles/intro/introwidget.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -722,11 +722,11 @@ void Widget::Step::showAnimated(Direction direction) { } } -void Widget::Step::setGoCallback(base::lambda &&callback) { +void Widget::Step::setGoCallback(base::lambda callback) { _goCallback = std::move(callback); } -void Widget::Step::setShowResetCallback(base::lambda &&callback) { +void Widget::Step::setShowResetCallback(base::lambda callback) { _showResetCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/intro/introwidget.h b/Telegram/SourceFiles/intro/introwidget.h index e8f11a9012..e6df6eda88 100644 --- a/Telegram/SourceFiles/intro/introwidget.h +++ b/Telegram/SourceFiles/intro/introwidget.h @@ -100,8 +100,8 @@ public: setFocus(); } - void setGoCallback(base::lambda &&callback); - void setShowResetCallback(base::lambda &&callback); + void setGoCallback(base::lambda callback); + void setShowResetCallback(base::lambda callback); void prepareShowAnimated(Step *after); void showAnimated(Direction direction); diff --git a/Telegram/SourceFiles/layerwidget.cpp b/Telegram/SourceFiles/layerwidget.cpp index 257cc93cc7..cc21384187 100644 --- a/Telegram/SourceFiles/layerwidget.cpp +++ b/Telegram/SourceFiles/layerwidget.cpp @@ -45,7 +45,7 @@ public: BackgroundWidget(QWidget *parent) : TWidget(parent) { } - void setDoneCallback(base::lambda &&callback) { + void setDoneCallback(base::lambda callback) { _doneCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/layerwidget.h b/Telegram/SourceFiles/layerwidget.h index a622c8cdb0..c0d44259aa 100644 --- a/Telegram/SourceFiles/layerwidget.h +++ b/Telegram/SourceFiles/layerwidget.h @@ -45,10 +45,10 @@ public: bool overlaps(const QRect &globalRect); - void setClosedCallback(base::lambda &&callback) { + void setClosedCallback(base::lambda callback) { _closedCallback = std::move(callback); } - void setResizedCallback(base::lambda &&callback) { + void setResizedCallback(base::lambda callback) { _resizedCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index c8570b0d4e..4cc1a11f53 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1970,7 +1970,7 @@ void MainWidget::scheduleViewIncrement(HistoryItem *item) { j.value().insert(item->id, true); } -void MainWidget::fillPeerMenu(PeerData *peer, base::lambda &&handler)> &&callback, bool pinToggle) { +void MainWidget::fillPeerMenu(PeerData *peer, base::lambda handler)> callback, bool pinToggle) { if (pinToggle) { auto isPinned = false; if (auto history = App::historyLoaded(peer)) { diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 0431dfd182..1fffa02270 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -367,7 +367,7 @@ public: void scheduleViewIncrement(HistoryItem *item); - void fillPeerMenu(PeerData *peer, base::lambda &&handler)> &&callback, bool pinToggle); + void fillPeerMenu(PeerData *peer, base::lambda handler)> callback, bool pinToggle); void gotRangeDifference(ChannelData *channel, const MTPupdates_ChannelDifference &diff); void onSelfParticipantUpdated(ChannelData *channel); diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp index d6a76b3a29..6b3b8333ec 100644 --- a/Telegram/SourceFiles/media/player/media_player_button.cpp +++ b/Telegram/SourceFiles/media/player/media_player_button.cpp @@ -45,7 +45,7 @@ QPainterPath interpolatePaths(QPointF (&from)[N], QPointF (&to)[N], float64 k) { } // namespace -PlayButtonLayout::PlayButtonLayout(const style::MediaPlayerButton &st, base::lambda &&callback) +PlayButtonLayout::PlayButtonLayout(const style::MediaPlayerButton &st, base::lambda callback) : _st(st) , _callback(std::move(callback)) { } diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h index 4f84414518..024fd823f1 100644 --- a/Telegram/SourceFiles/media/player/media_player_button.h +++ b/Telegram/SourceFiles/media/player/media_player_button.h @@ -33,7 +33,7 @@ public: Pause, Cancel, }; - PlayButtonLayout(const style::MediaPlayerButton &st, base::lambda &&callback); + PlayButtonLayout(const style::MediaPlayerButton &st, base::lambda callback); void setState(State state); void finishTransform(); diff --git a/Telegram/SourceFiles/media/player/media_player_panel.h b/Telegram/SourceFiles/media/player/media_player_panel.h index 7160fe2b87..a7c42927c5 100644 --- a/Telegram/SourceFiles/media/player/media_player_panel.h +++ b/Telegram/SourceFiles/media/player/media_player_panel.h @@ -48,7 +48,7 @@ public: void showFromOther(); void hideFromOther(); - using ButtonCallback = base::lambda_copy; + using ButtonCallback = base::lambda; void setPinCallback(ButtonCallback &&callback); void setCloseCallback(ButtonCallback &&callback); diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index 2cee37d004..53e443d8bb 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -1446,24 +1446,15 @@ void MediaView::initThemePreview() { } update(); }); - struct mutable_ready { - mutable_ready(decltype(ready) value) : value(std::move(value)) { - } - mutable decltype(ready) value; - }; - struct mutable_result { - mutable_result(std::unique_ptr value) : value(std::move(value)) { - } - mutable std::unique_ptr value; - }; + Window::Theme::CurrentData current; current.backgroundId = Window::Theme::Background()->id(); current.backgroundImage = Window::Theme::Background()->pixmap(); current.backgroundTiled = Window::Theme::Background()->tile(); - base::TaskQueue::Normal().Put([path, current, callback = mutable_ready(std::move(ready))]() { + base::TaskQueue::Normal().Put([ready = std::move(ready), path, current]() mutable { auto preview = Window::Theme::GeneratePreview(path, current); - base::TaskQueue::Main().Put([result = mutable_result(std::move(preview)), callback = std::move(callback.value)]() { - callback(std::move(result.value)); + base::TaskQueue::Main().Put([ready = std::move(ready), result = std::move(preview)]() mutable { + ready(std::move(result)); }); }); location.accessDisable(); diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp index fb7fe79c62..1b4b40dfb9 100644 --- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp +++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp @@ -87,8 +87,8 @@ public: void setUpdatesHandler(RPCDoneHandlerPtr onDone); void setGlobalFailHandler(RPCFailHandlerPtr onFail); - void setStateChangedHandler(base::lambda &&handler); - void setSessionResetHandler(base::lambda &&handler); + void setStateChangedHandler(base::lambda handler); + void setSessionResetHandler(base::lambda handler); void clearGlobalHandlers(); internal::Session *getSession(ShiftedDcId shiftedDcId); @@ -1173,11 +1173,11 @@ void Instance::Private::setGlobalFailHandler(RPCFailHandlerPtr onFail) { _globalHandler.onFail = onFail; } -void Instance::Private::setStateChangedHandler(base::lambda &&handler) { +void Instance::Private::setStateChangedHandler(base::lambda handler) { _stateChangedHandler = std::move(handler); } -void Instance::Private::setSessionResetHandler(base::lambda &&handler) { +void Instance::Private::setSessionResetHandler(base::lambda handler) { _sessionResetHandler = std::move(handler); } @@ -1298,11 +1298,11 @@ void Instance::setGlobalFailHandler(RPCFailHandlerPtr onFail) { _private->setGlobalFailHandler(onFail); } -void Instance::setStateChangedHandler(base::lambda &&handler) { +void Instance::setStateChangedHandler(base::lambda handler) { _private->setStateChangedHandler(std::move(handler)); } -void Instance::setSessionResetHandler(base::lambda &&handler) { +void Instance::setSessionResetHandler(base::lambda handler) { _private->setSessionResetHandler(std::move(handler)); } diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.h b/Telegram/SourceFiles/mtproto/mtp_instance.h index 5b4293ca8f..eb70bf3a5d 100644 --- a/Telegram/SourceFiles/mtproto/mtp_instance.h +++ b/Telegram/SourceFiles/mtproto/mtp_instance.h @@ -97,8 +97,8 @@ public: void setUpdatesHandler(RPCDoneHandlerPtr onDone); void setGlobalFailHandler(RPCFailHandlerPtr onFail); - void setStateChangedHandler(base::lambda &&handler); - void setSessionResetHandler(base::lambda &&handler); + void setStateChangedHandler(base::lambda handler); + void setSessionResetHandler(base::lambda handler); void clearGlobalHandlers(); void onStateChange(ShiftedDcId dcWithShift, int32 state); diff --git a/Telegram/SourceFiles/mtproto/rpc_sender.h b/Telegram/SourceFiles/mtproto/rpc_sender.h index d97e7e56ff..02ed576cd1 100644 --- a/Telegram/SourceFiles/mtproto/rpc_sender.h +++ b/Telegram/SourceFiles/mtproto/rpc_sender.h @@ -834,7 +834,7 @@ protected: using Parent = RPCHandlerImplementation; public: - RPCHandlerImplementation(Lambda &&handler) : _handler(std::move(handler)) { + RPCHandlerImplementation(Lambda handler) : _handler(std::move(handler)) { } protected: @@ -906,37 +906,37 @@ public: }; template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationBare(std::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationBareReq(std::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationPlain(std::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationReq(std::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationNo(std::move(lambda))); } template -inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda lambda) { return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationNoReq(std::move(lambda))); } -template ::value>> -RPCDoneHandlerPtr rpcDone(Lambda &&lambda) { +template +RPCDoneHandlerPtr rpcDone(Lambda lambda) { return rpcDone_lambda_wrap_helper(base::lambda_type(std::move(lambda))); } @@ -979,23 +979,23 @@ public: }; -inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda lambda) { return RPCFailHandlerPtr(new RPCFailHandlerImplementationPlain(std::move(lambda))); } -inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda lambda) { return RPCFailHandlerPtr(new RPCFailHandlerImplementationReq(std::move(lambda))); } -inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda lambda) { return RPCFailHandlerPtr(new RPCFailHandlerImplementationNo(std::move(lambda))); } -inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda &&lambda) { +inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda lambda) { return RPCFailHandlerPtr(new RPCFailHandlerImplementationNoReq(std::move(lambda))); } -template ::value>> -RPCFailHandlerPtr rpcFail(Lambda &&lambda) { +template +RPCFailHandlerPtr rpcFail(Lambda lambda) { return rpcFail_lambda_wrap_helper(base::lambda_type(std::move(lambda))); } diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index 3ed0374abb..93678e3925 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -156,7 +156,7 @@ public: private: void startAnimation(); - base::lambda_copy _updateCallback; + base::lambda _updateCallback; Ui::RoundCheckbox _check; Animation _pression; diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.h b/Telegram/SourceFiles/profile/profile_block_peer_list.h index d88a1beac1..73874de684 100644 --- a/Telegram/SourceFiles/profile/profile_block_peer_list.h +++ b/Telegram/SourceFiles/profile/profile_block_peer_list.h @@ -81,16 +81,16 @@ public: qSort(_items.begin(), _items.end(), std::move(predicate)); } - void setPreloadMoreCallback(base::lambda &&callback) { + void setPreloadMoreCallback(base::lambda callback) { _preloadMoreCallback = std::move(callback); } - void setSelectedCallback(base::lambda &&callback) { + void setSelectedCallback(base::lambda callback) { _selectedCallback = std::move(callback); } - void setRemovedCallback(base::lambda &&callback) { + void setRemovedCallback(base::lambda callback) { _removedCallback = std::move(callback); } - void setUpdateItemCallback(base::lambda &&callback) { + void setUpdateItemCallback(base::lambda callback) { _updateItemCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/settings/settings_layer.cpp b/Telegram/SourceFiles/settings/settings_layer.cpp index 018011e339..3ee2ed1dd4 100644 --- a/Telegram/SourceFiles/settings/settings_layer.cpp +++ b/Telegram/SourceFiles/settings/settings_layer.cpp @@ -54,7 +54,7 @@ Layer::Layer() connect(_scroll, SIGNAL(scrolled()), this, SLOT(onScroll())); } -void Layer::setCloseClickHandler(base::lambda &&callback) { +void Layer::setCloseClickHandler(base::lambda callback) { _fixedBarClose->setClickedCallback(std::move(callback)); } diff --git a/Telegram/SourceFiles/settings/settings_layer.h b/Telegram/SourceFiles/settings/settings_layer.h index f06705d230..7a36a14065 100644 --- a/Telegram/SourceFiles/settings/settings_layer.h +++ b/Telegram/SourceFiles/settings/settings_layer.h @@ -51,7 +51,7 @@ class Layer : public LayerWidget { public: Layer(); - void setCloseClickHandler(base::lambda &&callback); + void setCloseClickHandler(base::lambda callback); void resizeToWidth(int newWidth, int newContentLeft); protected: diff --git a/Telegram/SourceFiles/settings/settings_widget.cpp b/Telegram/SourceFiles/settings/settings_widget.cpp index 2a78d1647e..361624193c 100644 --- a/Telegram/SourceFiles/settings/settings_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_widget.cpp @@ -43,7 +43,7 @@ namespace Settings { namespace { QString SecretText; -QMap> Codes; +QMap> Codes; void fillCodes() { Codes.insert(qsl("debugmode"), []() { diff --git a/Telegram/SourceFiles/ui/abstract_button.h b/Telegram/SourceFiles/ui/abstract_button.h index c091915a5f..a436cfcfa9 100644 --- a/Telegram/SourceFiles/ui/abstract_button.h +++ b/Telegram/SourceFiles/ui/abstract_button.h @@ -52,7 +52,7 @@ public: void setAcceptBoth(bool acceptBoth = true); - void setClickedCallback(base::lambda &&callback) { + void setClickedCallback(base::lambda callback) { _clickedCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h index 4559fe1ab8..5daf405606 100644 --- a/Telegram/SourceFiles/ui/animation.h +++ b/Telegram/SourceFiles/ui/animation.h @@ -88,7 +88,7 @@ enum Notification { namespace anim { -using transition = base::lambda_copy; +using transition = base::lambda; extern transition linear; extern transition sineInOut; @@ -141,7 +141,7 @@ public: _from += delta; _cur += delta; } - value &update(float64 dt, const transition &func) { + value &update(float64 dt, transition func) { _cur = _from + func(_delta, dt); return *this; } @@ -590,7 +590,7 @@ public: static constexpr auto kLongAnimationDuration = 1000; template - void start(Lambda &&updateCallback, float64 from, float64 to, float64 duration, const anim::transition &transition = anim::linear) { + void start(Lambda &&updateCallback, float64 from, float64 to, float64 duration, anim::transition transition = anim::linear) { auto isLong = (duration >= kLongAnimationDuration); if (_data) { if (!isLong) { @@ -618,17 +618,12 @@ public: private: struct Data { - template ::value>> - Data(float64 from, Lambda &&updateCallback) + template + Data(float64 from, Lambda updateCallback) : value(from, from) , a_animation(animation(this, &Data::step)) , updateCallback(std::move(updateCallback)) { } - Data(float64 from, const base::lambda_copy &updateCallback) - : value(from, from) - , a_animation(animation(this, &Data::step)) - , updateCallback(base::lambda_copy(updateCallback)) { - } void step(float64 ms, bool timer) { auto dt = (ms >= duration) ? 1. : (ms / duration); if (dt >= 1) { diff --git a/Telegram/SourceFiles/ui/buttons/history_down_button.h b/Telegram/SourceFiles/ui/buttons/history_down_button.h index de9fa67718..5ddc299b4c 100644 --- a/Telegram/SourceFiles/ui/buttons/history_down_button.h +++ b/Telegram/SourceFiles/ui/buttons/history_down_button.h @@ -92,16 +92,16 @@ public: void setRecordActive(bool recordActive); void finishAnimation(); - void setRecordStartCallback(base::lambda &&callback) { + void setRecordStartCallback(base::lambda callback) { _recordStartCallback = std::move(callback); } - void setRecordUpdateCallback(base::lambda &&callback) { + void setRecordUpdateCallback(base::lambda callback) { _recordUpdateCallback = std::move(callback); } - void setRecordStopCallback(base::lambda &&callback) { + void setRecordStopCallback(base::lambda callback) { _recordStopCallback = std::move(callback); } - void setRecordAnimationCallback(base::lambda &&callback) { + void setRecordAnimationCallback(base::lambda callback) { _recordAnimationCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp index 7cfe979ec6..0e50b6c059 100644 --- a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp @@ -195,7 +195,7 @@ void RippleAnimation::paint(QPainter &p, int x, int y, int outerWidth, TimeMs ms clearFinished(); } -QImage RippleAnimation::maskByDrawer(QSize size, bool filled, base::lambda &&drawer) { +QImage RippleAnimation::maskByDrawer(QSize size, bool filled, base::lambda drawer) { auto result = QImage(size * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied); result.setDevicePixelRatio(cRetinaFactor()); result.fill(filled ? QColor(255, 255, 255) : Qt::transparent); diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.h b/Telegram/SourceFiles/ui/effects/ripple_animation.h index aa04775b17..44137a1713 100644 --- a/Telegram/SourceFiles/ui/effects/ripple_animation.h +++ b/Telegram/SourceFiles/ui/effects/ripple_animation.h @@ -26,7 +26,7 @@ namespace Ui { class RippleAnimation { public: - using UpdateCallback = base::lambda_copy; + using UpdateCallback = base::lambda; // White upon transparent mask, like colorizeImage(black-white-mask, white). RippleAnimation(const style::RippleAnimation &st, QImage mask, const UpdateCallback &update); @@ -43,7 +43,7 @@ public: return _ripples.isEmpty(); } - static QImage maskByDrawer(QSize size, bool filled, base::lambda &&drawer); + static QImage maskByDrawer(QSize size, bool filled, base::lambda drawer); static QImage rectMask(QSize size); static QImage roundRectMask(QSize size, int radius); static QImage ellipseMask(QSize size); diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp index 0e7b472185..69aa93e900 100644 --- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp +++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp @@ -59,7 +59,7 @@ void prepareCheckCaches(const style::RoundCheckbox *st, bool displayInactive, QP } // namespace -RoundCheckbox::RoundCheckbox(const style::RoundCheckbox &st, const base::lambda_copy &updateCallback) +RoundCheckbox::RoundCheckbox(const style::RoundCheckbox &st, base::lambda updateCallback) : _st(st) , _updateCallback(updateCallback) { } @@ -232,7 +232,7 @@ void RoundCheckbox::prepareInactiveCache() { _inactiveCacheFg = App::pixmapFromImageInPlace(std::move(cacheFg)); } -RoundImageCheckbox::RoundImageCheckbox(const style::RoundImageCheckbox &st, const base::lambda_copy &updateCallback, PaintRoundImage &&paintRoundImage) +RoundImageCheckbox::RoundImageCheckbox(const style::RoundImageCheckbox &st, base::lambda updateCallback, PaintRoundImage &&paintRoundImage) : _st(st) , _updateCallback(updateCallback) , _paintRoundImage(std::move(paintRoundImage)) diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.h b/Telegram/SourceFiles/ui/effects/round_checkbox.h index 06e7999fd4..d1efde4631 100644 --- a/Telegram/SourceFiles/ui/effects/round_checkbox.h +++ b/Telegram/SourceFiles/ui/effects/round_checkbox.h @@ -26,7 +26,7 @@ namespace Ui { class RoundCheckbox { public: - RoundCheckbox(const style::RoundCheckbox &st, const base::lambda_copy &updateCallback); + RoundCheckbox(const style::RoundCheckbox &st, base::lambda updateCallback); void paint(Painter &p, TimeMs ms, int x, int y, int outerWidth, float64 masterScale = 1.); @@ -54,7 +54,7 @@ private: QRect cacheDestRect(int x, int y, float64 scale) const; const style::RoundCheckbox &_st; - base::lambda_copy _updateCallback; + base::lambda _updateCallback; bool _checked = false; std::vector _icons; @@ -70,7 +70,7 @@ private: class RoundImageCheckbox { public: using PaintRoundImage = base::lambda; - RoundImageCheckbox(const style::RoundImageCheckbox &st, const base::lambda_copy &updateCallback, PaintRoundImage &&paintRoundImage); + RoundImageCheckbox(const style::RoundImageCheckbox &st, base::lambda updateCallback, PaintRoundImage &&paintRoundImage); void paint(Painter &p, TimeMs ms, int x, int y, int outerWidth); float64 checkedAnimationRatio() const; @@ -89,7 +89,7 @@ private: void prepareWideCache(); const style::RoundImageCheckbox &_st; - base::lambda_copy _updateCallback; + base::lambda _updateCallback; PaintRoundImage _paintRoundImage; QPixmap _wideCache; diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp index 95394ccbe8..f0dd4026ed 100644 --- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp +++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp @@ -120,7 +120,7 @@ void FadeAnimation::updateCallback() { WidgetFadeWrap::WidgetFadeWrap(QWidget *parent , object_ptr entity , int duration -, base::lambda &&updateCallback) : TWidget(parent) +, base::lambda updateCallback) : TWidget(parent) , _entity(std::move(entity)) , _duration(duration) , _updateCallback(std::move(updateCallback)) diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h index 1084febd46..1ab6e3a92c 100644 --- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h +++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h @@ -78,7 +78,7 @@ public: WidgetFadeWrap(QWidget *parent , object_ptr entity , int duration = st::widgetFadeDuration - , base::lambda &&updateCallback = base::lambda()); + , base::lambda updateCallback = base::lambda()); void showAnimated() { _animation.fadeIn(_duration); @@ -140,7 +140,7 @@ public: WidgetFadeWrap(QWidget *parent , object_ptr entity , int duration = st::widgetFadeDuration - , base::lambda &&updateCallback = base::lambda()) : WidgetFadeWrap(parent + , base::lambda updateCallback = base::lambda()) : WidgetFadeWrap(parent , std::move(entity) , duration , std::move(updateCallback)) { diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp index 3db8e0f65b..5faf7b647a 100644 --- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp +++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp @@ -26,7 +26,7 @@ namespace Ui { WidgetSlideWrap::WidgetSlideWrap(QWidget *parent , object_ptr entity , style::margins entityPadding -, base::lambda &&updateCallback +, base::lambda updateCallback , int duration) : TWidget(parent) , _entity(std::move(entity)) , _padding(entityPadding) diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h index c29501bbd7..0b12fd405a 100644 --- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h +++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h @@ -33,7 +33,7 @@ public: WidgetSlideWrap(QWidget *parent , object_ptr entity , style::margins entityPadding - , base::lambda &&updateCallback + , base::lambda updateCallback , int duration = st::widgetSlideDuration); void slideUp(); @@ -78,7 +78,7 @@ public: WidgetSlideWrap(QWidget *parent , object_ptr entity , style::margins entityPadding - , base::lambda &&updateCallback + , base::lambda updateCallback , int duration = st::widgetSlideDuration) : WidgetSlideWrap(parent , std::move(entity) , entityPadding diff --git a/Telegram/SourceFiles/ui/filedialog.cpp b/Telegram/SourceFiles/ui/filedialog.cpp index d249f363db..88c24a5f3a 100644 --- a/Telegram/SourceFiles/ui/filedialog.cpp +++ b/Telegram/SourceFiles/ui/filedialog.cpp @@ -394,7 +394,7 @@ base::Observable &QueryDone() { return QueryDoneObservable; } -void askOpenPath(const QString &caption, const QString &filter, base::lambda &&callback, base::lambda &&failed) { +void askOpenPath(const QString &caption, const QString &filter, base::lambda callback, base::lambda failed) { base::TaskQueue::Main().Put([caption, filter, callback = std::move(callback), failed = std::move(failed)] { auto file = QString(); auto remoteContent = QByteArray(); @@ -413,7 +413,7 @@ void askOpenPath(const QString &caption, const QString &filter, base::lambda &&callback, base::lambda &&failed) { +void askOpenPaths(const QString &caption, const QString &filter, base::lambda callback, base::lambda failed) { base::TaskQueue::Main().Put([caption, filter, callback = std::move(callback), failed = std::move(failed)] { auto files = QStringList(); auto remoteContent = QByteArray(); @@ -431,7 +431,7 @@ void askOpenPaths(const QString &caption, const QString &filter, base::lambda &&callback, base::lambda &&failed) { +void askWritePath(const QString &caption, const QString &filter, const QString &initialPath, base::lambda callback, base::lambda failed) { base::TaskQueue::Main().Put([caption, filter, initialPath, callback = std::move(callback), failed = std::move(failed)] { auto file = QString(); if (filedialogGetSaveFile(file, caption, filter, initialPath)) { @@ -444,7 +444,7 @@ void askWritePath(const QString &caption, const QString &filter, const QString & }); } -void askFolder(const QString &caption, base::lambda &&callback, base::lambda &&failed) { +void askFolder(const QString &caption, base::lambda callback, base::lambda failed) { base::TaskQueue::Main().Put([caption, callback = std::move(callback), failed = std::move(failed)] { auto folder = QString(); if (filedialogGetDir(folder, caption) && !folder.isEmpty()) { diff --git a/Telegram/SourceFiles/ui/filedialog.h b/Telegram/SourceFiles/ui/filedialog.h index 045266cb7a..b315c74b0a 100644 --- a/Telegram/SourceFiles/ui/filedialog.h +++ b/Telegram/SourceFiles/ui/filedialog.h @@ -69,9 +69,9 @@ struct OpenResult { QStringList paths; QByteArray remoteContent; }; -void askOpenPath(const QString &caption, const QString &filter, base::lambda &&callback, base::lambda &&failed = base::lambda()); -void askOpenPaths(const QString &caption, const QString &filter, base::lambda &&callback, base::lambda &&failed = base::lambda()); -void askWritePath(const QString &caption, const QString &filter, const QString &initialPath, base::lambda &&callback, base::lambda &&failed = base::lambda()); -void askFolder(const QString &caption, base::lambda &&callback, base::lambda &&failed = base::lambda()); +void askOpenPath(const QString &caption, const QString &filter, base::lambda callback, base::lambda failed = base::lambda()); +void askOpenPaths(const QString &caption, const QString &filter, base::lambda callback, base::lambda failed = base::lambda()); +void askWritePath(const QString &caption, const QString &filter, const QString &initialPath, base::lambda callback, base::lambda failed = base::lambda()); +void askFolder(const QString &caption, base::lambda callback, base::lambda failed = base::lambda()); } // namespace FileDialog diff --git a/Telegram/SourceFiles/ui/widgets/buttons.cpp b/Telegram/SourceFiles/ui/widgets/buttons.cpp index 611c2d8d1b..cbb766853a 100644 --- a/Telegram/SourceFiles/ui/widgets/buttons.cpp +++ b/Telegram/SourceFiles/ui/widgets/buttons.cpp @@ -192,9 +192,9 @@ void FlatButton::paintEvent(QPaintEvent *e) { class RoundButton::Numbers { public: - Numbers(const style::RoundButton &st, base::lambda &&animationCallback); + Numbers(const style::RoundButton &st, base::lambda animationCallback); - void setWidthChangedCallback(base::lambda &&callback) { + void setWidthChangedCallback(base::lambda callback) { _widthChangedCallback = std::move(callback); } void setText(const QString &text, int value); @@ -235,7 +235,7 @@ private: }; -RoundButton::Numbers::Numbers(const style::RoundButton &st, base::lambda &&animationCallback) +RoundButton::Numbers::Numbers(const style::RoundButton &st, base::lambda animationCallback) : _st(st) , _animationCallback(std::move(animationCallback)) { for (auto ch = '0'; ch != '9'; ++ch) { @@ -380,7 +380,7 @@ void RoundButton::setNumbersText(const QString &numbersText, int numbers) { updateText(); } -void RoundButton::setWidthChangedCallback(base::lambda &&callback) { +void RoundButton::setWidthChangedCallback(base::lambda callback) { if (!_numbers) { _numbers = std::make_unique(_st, [this] { numbersAnimationCallback(); }); } diff --git a/Telegram/SourceFiles/ui/widgets/buttons.h b/Telegram/SourceFiles/ui/widgets/buttons.h index 33c4ee0b40..0e4701def8 100644 --- a/Telegram/SourceFiles/ui/widgets/buttons.h +++ b/Telegram/SourceFiles/ui/widgets/buttons.h @@ -121,7 +121,7 @@ public: void setNumbersText(int numbers) { setNumbersText(QString::number(numbers), numbers); } - void setWidthChangedCallback(base::lambda &&callback); + void setWidthChangedCallback(base::lambda callback); void stepNumbersAnimation(TimeMs ms); void finishNumbersAnimation(); diff --git a/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp b/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp index 157e0150d7..dbcd291eee 100644 --- a/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp @@ -69,7 +69,7 @@ QAction *DropdownMenu::addAction(const QString &text, const QObject *receiver, c return _menu->addAction(text, receiver, member, icon, iconOver); } -QAction *DropdownMenu::addAction(const QString &text, base::lambda &&callback, const style::icon *icon, const style::icon *iconOver) { +QAction *DropdownMenu::addAction(const QString &text, base::lambda callback, const style::icon *icon, const style::icon *iconOver) { return _menu->addAction(text, std::move(callback), icon, iconOver); } diff --git a/Telegram/SourceFiles/ui/widgets/dropdown_menu.h b/Telegram/SourceFiles/ui/widgets/dropdown_menu.h index 7538857f6b..9fff13e3f2 100644 --- a/Telegram/SourceFiles/ui/widgets/dropdown_menu.h +++ b/Telegram/SourceFiles/ui/widgets/dropdown_menu.h @@ -30,11 +30,11 @@ public: DropdownMenu(QWidget *parent, const style::DropdownMenu &st = st::defaultDropdownMenu); QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); - QAction *addAction(const QString &text, base::lambda &&callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); + QAction *addAction(const QString &text, base::lambda callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); QAction *addSeparator(); void clearActions(); - void setHiddenCallback(base::lambda &&callback) { + void setHiddenCallback(base::lambda callback) { _hiddenCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h index cceba3c489..c4e2384581 100644 --- a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h +++ b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h @@ -48,13 +48,13 @@ public: void otherLeave(); void hideFast(); - void setShowStartCallback(base::lambda &&callback) { + void setShowStartCallback(base::lambda callback) { _showStartCallback = std::move(callback); } - void setHideStartCallback(base::lambda &&callback) { + void setHideStartCallback(base::lambda callback) { _hideStartCallback = std::move(callback); } - void setHiddenCallback(base::lambda &&callback) { + void setHiddenCallback(base::lambda callback) { _hiddenCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/ui/widgets/menu.cpp b/Telegram/SourceFiles/ui/widgets/menu.cpp index 804f514d66..0e3495be73 100644 --- a/Telegram/SourceFiles/ui/widgets/menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/menu.cpp @@ -57,7 +57,7 @@ QAction *Menu::addAction(const QString &text, const QObject *receiver, const cha return action; } -QAction *Menu::addAction(const QString &text, base::lambda &&callback, const style::icon *icon, const style::icon *iconOver) { +QAction *Menu::addAction(const QString &text, base::lambda callback, const style::icon *icon, const style::icon *iconOver) { auto action = addAction(new QAction(text, this), icon, iconOver); connect(action, SIGNAL(triggered(bool)), base::lambda_slot(action, std::move(callback)), SLOT(action()), Qt::QueuedConnection); return action; diff --git a/Telegram/SourceFiles/ui/widgets/menu.h b/Telegram/SourceFiles/ui/widgets/menu.h index a66f10791a..e48580df38 100644 --- a/Telegram/SourceFiles/ui/widgets/menu.h +++ b/Telegram/SourceFiles/ui/widgets/menu.h @@ -34,7 +34,7 @@ public: Menu(QWidget *parent, QMenu *menu, const style::Menu &st = st::defaultMenu); QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); - QAction *addAction(const QString &text, base::lambda &&callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); + QAction *addAction(const QString &text, base::lambda callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); QAction *addSeparator(); void clearActions(); @@ -52,33 +52,33 @@ public: using Actions = QList; Actions &actions(); - void setResizedCallback(base::lambda &&callback) { + void setResizedCallback(base::lambda callback) { _resizedCallback = std::move(callback); } - void setActivatedCallback(base::lambda &&callback) { + void setActivatedCallback(base::lambda callback) { _activatedCallback = std::move(callback); } - void setTriggeredCallback(base::lambda &&callback) { + void setTriggeredCallback(base::lambda callback) { _triggeredCallback = std::move(callback); } - void setKeyPressDelegate(base::lambda &&delegate) { + void setKeyPressDelegate(base::lambda delegate) { _keyPressDelegate = std::move(delegate); } void handleKeyPress(int key); - void setMouseMoveDelegate(base::lambda &&delegate) { + void setMouseMoveDelegate(base::lambda delegate) { _mouseMoveDelegate = std::move(delegate); } void handleMouseMove(QPoint globalPosition); - void setMousePressDelegate(base::lambda &&delegate) { + void setMousePressDelegate(base::lambda delegate) { _mousePressDelegate = std::move(delegate); } void handleMousePress(QPoint globalPosition); - void setMouseReleaseDelegate(base::lambda &&delegate) { + void setMouseReleaseDelegate(base::lambda delegate) { _mouseReleaseDelegate = std::move(delegate); } void handleMouseRelease(QPoint globalPosition); diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp index f7a97190a2..34128bf864 100644 --- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp +++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp @@ -57,7 +57,7 @@ public: void setPosition(int x, int y, int outerWidth, int maxVisiblePadding); QRect paintArea(int outerWidth) const; - void setUpdateCallback(const base::lambda_copy &updateCallback) { + void setUpdateCallback(base::lambda updateCallback) { _updateCallback = updateCallback; } void setText(const QString &text); @@ -89,7 +89,7 @@ private: uint64 _id; struct SlideAnimation { - SlideAnimation(const base::lambda_copy &updateCallback, int fromX, int toX, int y, float64 duration) + SlideAnimation(base::lambda updateCallback, int fromX, int toX, int y, float64 duration) : fromX(fromX) , toX(toX) , y(y) { @@ -112,7 +112,7 @@ private: bool _overDelete = false; bool _active = false; PaintRoundImage _paintRoundImage; - base::lambda_copy _updateCallback; + base::lambda _updateCallback; bool _hiding = false; }; @@ -376,15 +376,15 @@ void MultiSelect::scrollTo(int activeTop, int activeBottom) { } } -void MultiSelect::setQueryChangedCallback(base::lambda &&callback) { +void MultiSelect::setQueryChangedCallback(base::lambda callback) { _queryChangedCallback = std::move(callback); } -void MultiSelect::setSubmittedCallback(base::lambda &&callback) { +void MultiSelect::setSubmittedCallback(base::lambda callback) { _inner->setSubmittedCallback(std::move(callback)); } -void MultiSelect::setResizedCallback(base::lambda &&callback) { +void MultiSelect::setResizedCallback(base::lambda callback) { _resizedCallback = std::move(callback); } @@ -402,11 +402,11 @@ QString MultiSelect::getQuery() const { return _inner->getQuery(); } -void MultiSelect::addItem(uint64 itemId, const QString &text, style::color color, PaintRoundImage &&paintRoundImage, AddItemWay way) { +void MultiSelect::addItem(uint64 itemId, const QString &text, style::color color, PaintRoundImage paintRoundImage, AddItemWay way) { _inner->addItem(std::make_unique(_st.item, itemId, text, color, std::move(paintRoundImage)), way); } -void MultiSelect::setItemRemovedCallback(base::lambda &&callback) { +void MultiSelect::setItemRemovedCallback(base::lambda callback) { _inner->setItemRemovedCallback(std::move(callback)); } @@ -423,7 +423,7 @@ int MultiSelect::resizeGetHeight(int newWidth) { return newHeight; } -MultiSelect::Inner::Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback &&callback) : TWidget(parent) +MultiSelect::Inner::Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback callback) : TWidget(parent) , _st(st) , _scrollCallback(std::move(callback)) , _field(this, _st.field, placeholder) @@ -470,11 +470,11 @@ void MultiSelect::Inner::clearQuery() { _field->setText(QString()); } -void MultiSelect::Inner::setQueryChangedCallback(base::lambda &&callback) { +void MultiSelect::Inner::setQueryChangedCallback(base::lambda callback) { _queryChangedCallback = std::move(callback); } -void MultiSelect::Inner::setSubmittedCallback(base::lambda &&callback) { +void MultiSelect::Inner::setSubmittedCallback(base::lambda callback) { _submittedCallback = std::move(callback); } @@ -775,11 +775,11 @@ void MultiSelect::Inner::setItemText(uint64 itemId, const QString &text) { } } -void MultiSelect::Inner::setItemRemovedCallback(base::lambda &&callback) { +void MultiSelect::Inner::setItemRemovedCallback(base::lambda callback) { _itemRemovedCallback = std::move(callback); } -void MultiSelect::Inner::setResizedCallback(base::lambda &&callback) { +void MultiSelect::Inner::setResizedCallback(base::lambda callback) { _resizedCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.h b/Telegram/SourceFiles/ui/widgets/multi_select.h index f675796718..d3171b1232 100644 --- a/Telegram/SourceFiles/ui/widgets/multi_select.h +++ b/Telegram/SourceFiles/ui/widgets/multi_select.h @@ -36,19 +36,19 @@ public: void setInnerFocus(); void clearQuery(); - void setQueryChangedCallback(base::lambda &&callback); - void setSubmittedCallback(base::lambda &&callback); - void setResizedCallback(base::lambda &&callback); + void setQueryChangedCallback(base::lambda callback); + void setSubmittedCallback(base::lambda callback); + void setResizedCallback(base::lambda callback); enum class AddItemWay { Default, SkipAnimation, }; using PaintRoundImage = base::lambda; - void addItem(uint64 itemId, const QString &text, style::color color, PaintRoundImage &&paintRoundImage, AddItemWay way = AddItemWay::Default); + void addItem(uint64 itemId, const QString &text, style::color color, PaintRoundImage paintRoundImage, AddItemWay way = AddItemWay::Default); void setItemText(uint64 itemId, const QString &text); - void setItemRemovedCallback(base::lambda &&callback); + void setItemRemovedCallback(base::lambda callback); void removeItem(uint64 itemId); protected: @@ -76,23 +76,23 @@ class MultiSelect::Inner : public TWidget { public: using ScrollCallback = base::lambda; - Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback &&callback); + Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback callback); QString getQuery() const; bool setInnerFocus(); void clearQuery(); - void setQueryChangedCallback(base::lambda &&callback); - void setSubmittedCallback(base::lambda &&callback); + void setQueryChangedCallback(base::lambda callback); + void setSubmittedCallback(base::lambda callback); class Item; void addItem(std::unique_ptr item, AddItemWay way); void setItemText(uint64 itemId, const QString &text); - void setItemRemovedCallback(base::lambda &&callback); + void setItemRemovedCallback(base::lambda callback); void removeItem(uint64 itemId); - void setResizedCallback(base::lambda &&callback); + void setResizedCallback(base::lambda callback); ~Inner(); diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp index f85dbb6c2f..b1f6ce7cd7 100644 --- a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp @@ -86,7 +86,7 @@ QAction *PopupMenu::addAction(const QString &text, const QObject *receiver, cons return _menu->addAction(text, receiver, member, icon, iconOver); } -QAction *PopupMenu::addAction(const QString &text, base::lambda &&callback, const style::icon *icon, const style::icon *iconOver) { +QAction *PopupMenu::addAction(const QString &text, base::lambda callback, const style::icon *icon, const style::icon *iconOver) { return _menu->addAction(text, std::move(callback), icon, iconOver); } diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.h b/Telegram/SourceFiles/ui/widgets/popup_menu.h index 5a07cdaa7a..aed4ac201f 100644 --- a/Telegram/SourceFiles/ui/widgets/popup_menu.h +++ b/Telegram/SourceFiles/ui/widgets/popup_menu.h @@ -29,7 +29,7 @@ public: PopupMenu(QWidget*, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu); QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); - QAction *addAction(const QString &text, base::lambda &&callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); + QAction *addAction(const QString &text, base::lambda callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); QAction *addSeparator(); void clearActions(); @@ -40,7 +40,7 @@ public: void popup(const QPoint &p); void hideMenu(bool fast = false); - void setDestroyedCallback(base::lambda &&callback) { + void setDestroyedCallback(base::lambda callback) { _destroyedCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/window/player_wrap_widget.cpp b/Telegram/SourceFiles/window/player_wrap_widget.cpp index 4b055cdd56..cd45ab4baf 100644 --- a/Telegram/SourceFiles/window/player_wrap_widget.cpp +++ b/Telegram/SourceFiles/window/player_wrap_widget.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org namespace Window { -PlayerWrapWidget::PlayerWrapWidget(QWidget *parent, base::lambda &&updateCallback) : Parent(parent +PlayerWrapWidget::PlayerWrapWidget(QWidget *parent, base::lambda updateCallback) : Parent(parent , object_ptr(parent) , style::margins(0, 0, 0, 0) , std::move(updateCallback)) { diff --git a/Telegram/SourceFiles/window/player_wrap_widget.h b/Telegram/SourceFiles/window/player_wrap_widget.h index 00a6d2ebff..4c0cd841d7 100644 --- a/Telegram/SourceFiles/window/player_wrap_widget.h +++ b/Telegram/SourceFiles/window/player_wrap_widget.h @@ -13,7 +13,7 @@ class PlayerWrapWidget : public Ui::WidgetSlideWrap { using Parent = Ui::WidgetSlideWrap; public: - PlayerWrapWidget(QWidget *parent, base::lambda &&updateCallback); + PlayerWrapWidget(QWidget *parent, base::lambda updateCallback); void updateAdaptiveLayout() { updateShadowGeometry(); diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp index e28a92bddd..10677c02da 100644 --- a/Telegram/SourceFiles/window/themes/window_theme.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme.cpp @@ -798,7 +798,7 @@ bool CopyColorsToPalette(const QString &path, const QByteArray &themeContent) { return true; } -bool ReadPaletteValues(const QByteArray &content, base::lambda &&callback) { +bool ReadPaletteValues(const QByteArray &content, base::lambda callback) { if (content.size() > kThemeSchemeSizeLimit) { LOG(("Theme Error: color scheme file too large (should be less than 1 MB, got %2)").arg(content.size())); return false; diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h index 6a53e2b544..cf18fb70dd 100644 --- a/Telegram/SourceFiles/window/themes/window_theme.h +++ b/Telegram/SourceFiles/window/themes/window_theme.h @@ -141,7 +141,7 @@ void ComputeBackgroundRects(QRect wholeFill, QSize imageSize, QRect &to, QRect & bool CopyColorsToPalette(const QString &path, const QByteArray &themeContent); -bool ReadPaletteValues(const QByteArray &content, base::lambda &&callback); +bool ReadPaletteValues(const QByteArray &content, base::lambda callback); } // namespace Theme } // namespace Window diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp index b877fd2257..ecacd4167b 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp @@ -208,13 +208,13 @@ class Editor::Inner : public TWidget, private base::Subscriber { public: Inner(QWidget *parent, const QString &path); - void setErrorCallback(base::lambda &&callback) { + void setErrorCallback(base::lambda callback) { _errorCallback = std::move(callback); } - void setFocusCallback(base::lambda &&callback) { + void setFocusCallback(base::lambda callback) { _focusCallback = std::move(callback); } - void setScrollCallback(base::lambda &&callback) { + void setScrollCallback(base::lambda callback) { _scrollCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.h b/Telegram/SourceFiles/window/themes/window_theme_warning.h index b6ef433c22..f634b6924e 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_warning.h +++ b/Telegram/SourceFiles/window/themes/window_theme_warning.h @@ -31,7 +31,7 @@ class WarningWidget : public TWidget { public: WarningWidget(QWidget *parent); - void setHiddenCallback(base::lambda &&callback) { + void setHiddenCallback(base::lambda callback) { _hiddenCallback = std::move(callback); } diff --git a/Telegram/SourceFiles/window/top_bar_widget.cpp b/Telegram/SourceFiles/window/top_bar_widget.cpp index 76fd37fee6..0565dbad4c 100644 --- a/Telegram/SourceFiles/window/top_bar_widget.cpp +++ b/Telegram/SourceFiles/window/top_bar_widget.cpp @@ -126,7 +126,7 @@ void TopBarWidget::showMenu() { } })); _menuToggle->installEventFilter(_menu); - App::main()->fillPeerMenu(peer, [this](const QString &text, base::lambda &&callback) { + App::main()->fillPeerMenu(peer, [this](const QString &text, base::lambda callback) { return _menu->addAction(text, std::move(callback)); }, false); _menu->moveToRight(st::topBarMenuPosition.x(), st::topBarMenuPosition.y());