mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-05 00:46:08 +00:00
Code Issues Releases Wiki Activity

Using standard library instead of std_ namespace.

Browse Source 
Currently tested only in VS2015.
This commit is contained in:
John Preston
2017-02-21 16:45:56 +03:00
parent 27f015561a
commit ffc557a0f9
201 changed files with 892 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Telegram/SourceFiles/ui/widgets/multi_select.cpp
View File

@@ -99,7 +99,7 @@ private:
int fromX, toX;
int y;
};
std_::vector_of_moveable<SlideAnimation> _copies;
std::vector<SlideAnimation> _copies;
int _x = -1;
int _y = -1;
int _width = 0;
@@ -121,7 +121,7 @@ MultiSelect::Inner::Item::Item(const style::MultiSelectItem &st, uint64 id, cons
: _st(st)
, _id(id)
, _color(color)
, _paintRoundImage(std_::move(paintRoundImage)) {
, _paintRoundImage(std::move(paintRoundImage)) {
setText(text);
}
@@ -262,16 +262,16 @@ void MultiSelect::Inner::Item::setPosition(int x, int y, int outerWidth, int max
if (_copies.empty()) {
if (_y == y) {
auto copy = SlideAnimation(_updateCallback, _x, x, _y, _st.duration);
_copies.push_back(std_::move(copy));
_copies.push_back(std::move(copy));
} else {
auto copyHiding = SlideAnimation(_updateCallback, _x, (y > _y) ? rightHidden : leftHidden, _y, _st.duration);
_copies.push_back(std_::move(copyHiding));
_copies.push_back(std::move(copyHiding));
auto copyShowing = SlideAnimation(_updateCallback, (y > _y) ? leftHidden : rightHidden, x, y, _st.duration);
_copies.push_back(std_::move(copyShowing));
_copies.push_back(std::move(copyShowing));
}
} else if (!found) {
auto copy = SlideAnimation(_updateCallback, (y > _y) ? leftHidden : rightHidden, x, y, _st.duration);
_copies.push_back(std_::move(copy));
_copies.push_back(std::move(copy));
}
}
_x = x;
@@ -307,7 +307,7 @@ void MultiSelect::Inner::Item::prepareCache() {
Painter p(&data);
paintOnce(p, _width * (kWideScale - 1) / 2, _st.height * (kWideScale - 1) / 2, cacheWidth, getms());
}
_cache = App::pixmapFromImageInPlace(std_::move(data));
_cache = App::pixmapFromImageInPlace(std::move(data));
}
void MultiSelect::Inner::Item::setVisibleAnimated(bool visible) {
@@ -377,15 +377,15 @@ void MultiSelect::scrollTo(int activeTop, int activeBottom) {
}
void MultiSelect::setQueryChangedCallback(base::lambda<void(const QString &query)> &&callback) {
_queryChangedCallback = std_::move(callback);
_queryChangedCallback = std::move(callback);
}
void MultiSelect::setSubmittedCallback(base::lambda<void(bool ctrlShiftEnter)> &&callback) {
_inner->setSubmittedCallback(std_::move(callback));
_inner->setSubmittedCallback(std::move(callback));
}
void MultiSelect::setResizedCallback(base::lambda<void()> &&callback) {
_resizedCallback = std_::move(callback);
_resizedCallback = std::move(callback);
}
void MultiSelect::setInnerFocus() {
@@ -403,11 +403,11 @@ QString MultiSelect::getQuery() const {
}
void MultiSelect::addItem(uint64 itemId, const QString &text, style::color color, PaintRoundImage &&paintRoundImage, AddItemWay way) {
_inner->addItem(std_::make_unique<Inner::Item>(_st.item, itemId, text, color, std_::move(paintRoundImage)), way);
_inner->addItem(std::make_unique<Inner::Item>(_st.item, itemId, text, color, std::move(paintRoundImage)), way);
}
void MultiSelect::setItemRemovedCallback(base::lambda<void(uint64 itemId)> &&callback) {
_inner->setItemRemovedCallback(std_::move(callback));
_inner->setItemRemovedCallback(std::move(callback));
}
void MultiSelect::removeItem(uint64 itemId) {
@@ -425,7 +425,7 @@ int MultiSelect::resizeGetHeight(int newWidth) {
MultiSelect::Inner::Inner(QWidget *parent, const style::MultiSelect &st, const QString &placeholder, ScrollCallback &&callback) : TWidget(parent)
, _st(st)
, _scrollCallback(std_::move(callback))
, _scrollCallback(std::move(callback))
, _field(this, _st.field, placeholder)
, _cancel(this, _st.fieldCancel) {
_field->customUpDown(true);
@@ -471,11 +471,11 @@ void MultiSelect::Inner::clearQuery() {
}
void MultiSelect::Inner::setQueryChangedCallback(base::lambda<void(const QString &query)> &&callback) {
_queryChangedCallback = std_::move(callback);
_queryChangedCallback = std::move(callback);
}
void MultiSelect::Inner::setSubmittedCallback(base::lambda<void(bool ctrlShiftEnter)> &&callback) {
_submittedCallback = std_::move(callback);
_submittedCallback = std::move(callback);
}
void MultiSelect::Inner::updateFieldGeometry() {
@@ -685,7 +685,7 @@ void MultiSelect::Inner::mousePressEvent(QMouseEvent *e) {
}
}
void MultiSelect::Inner::addItem(std_::unique_ptr<Item> item, AddItemWay way) {
void MultiSelect::Inner::addItem(std::unique_ptr<Item> item, AddItemWay way) {
auto wasEmpty = _items.empty();
item->setUpdateCallback([this, item = item.get()] {
auto itemRect = item->paintArea(width() - _st.padding.left() - _st.padding.top());
@@ -776,11 +776,11 @@ void MultiSelect::Inner::setItemText(uint64 itemId, const QString &text) {
}
void MultiSelect::Inner::setItemRemovedCallback(base::lambda<void(uint64 itemId)> &&callback) {
_itemRemovedCallback = std_::move(callback);
_itemRemovedCallback = std::move(callback);
}
void MultiSelect::Inner::setResizedCallback(base::lambda<void(int heightDelta)> &&callback) {
_resizedCallback = std_::move(callback);
_resizedCallback = std::move(callback);
}
void MultiSelect::Inner::removeItem(uint64 itemId) {