mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +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

28
Telegram/SourceFiles/window/themes/window_theme_preview.cpp
View File

@@ -185,14 +185,14 @@ private:
QRect _history;
int _rowsTop = 0;
std_::vector_of_moveable<Row> _rows;
std::vector<Row> _rows;
Text _topBarName;
QString _topBarStatus;
bool _topBarStatusActive = false;
int _historyBottom = 0;
std_::vector_of_moveable<Bubble> _bubbles;
std::vector<Bubble> _bubbles;
style::TextPalette _textPalette;
@@ -220,7 +220,7 @@ void Generator::addRow(QString name, int peerIndex, QString date, QString text)
row.peerIndex = peerIndex;
row.date = date;
row.text.setRichText(st::dialogsTextStyle, text, _textDlgOptions);
_rows.push_back(std_::move(row));
_rows.push_back(std::move(row));
}
void Generator::addBubble(Bubble bubble, int width, int height, QString date, Status status) {
@@ -228,7 +228,7 @@ void Generator::addBubble(Bubble bubble, int width, int height, QString date, St
bubble.height = height;
bubble.date = date;
bubble.status = status;
_bubbles.push_back(std_::move(bubble));
_bubbles.push_back(std::move(bubble));
}
void Generator::addAudioBubble(QVector<int> waveform, int waveactive, QString wavestatus, QString date, Status status) {
@@ -247,7 +247,7 @@ void Generator::addAudioBubble(QVector<int> waveform, int waveactive, QString wa
accumulate_min(width, st::msgMaxWidth);
auto height = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
addBubble(std_::move(bubble), width, height, date, status);
addBubble(std::move(bubble), width, height, date, status);
}
QSize Generator::computeSkipBlock(Status status, QString date) {
@@ -278,12 +278,12 @@ void Generator::addTextBubble(QString text, QString date, Status status) {
auto textHeight = bubble.text.countHeight(textWidth);
auto height = st::msgPadding.top() + textHeight + st::msgPadding.bottom();
addBubble(std_::move(bubble), width, height, date, status);
addBubble(std::move(bubble), width, height, date, status);
}
void Generator::addDateBubble(QString date) {
Bubble bubble;
addBubble(std_::move(bubble), 0, 0, date, Status::None);
addBubble(std::move(bubble), 0, 0, date, Status::None);
}
void Generator::addPhotoBubble(QString image, QString caption, QString date, Status status) {
@@ -302,7 +302,7 @@ void Generator::addPhotoBubble(QString image, QString caption, QString date, Sta
auto textHeight = bubble.text.countHeight(textWidth);
auto height = st::mediaCaptionSkip + textHeight + st::msgPadding.bottom();
addBubble(std_::move(bubble), width, height, date, status);
addBubble(std::move(bubble), width, height, date, status);
}
void Generator::generateData() {
@@ -378,7 +378,7 @@ QPixmap Generator::generate() {
}
Platform::PreviewWindowFramePaint(result, _palette, _body, _rect.width());
return App::pixmapFromImageInPlace(std_::move(result));
return App::pixmapFromImageInPlace(std::move(result));
}
void Generator::paintHistoryList() {
@@ -411,7 +411,7 @@ void Generator::paintHistoryBackground() {
tiled = _current.backgroundTiled;
}
}
background = std_::move(background).convertToFormat(QImage::Format_ARGB32_Premultiplied);
background = std::move(background).convertToFormat(QImage::Format_ARGB32_Premultiplied);
background.setDevicePixelRatio(cRetinaFactor());
_p->setClipRect(_history);
if (tiled) {
@@ -888,14 +888,14 @@ void Generator::restoreTextPalette() {
} // namespace
std_::unique_ptr<Preview> GeneratePreview(const QString &filepath, const CurrentData &data) {
auto result = std_::make_unique<Preview>();
std::unique_ptr<Preview> GeneratePreview(const QString &filepath, const CurrentData &data) {
auto result = std::make_unique<Preview>();
result->path = filepath;
if (!LoadFromFile(filepath, &result->instance, &result->content)) {
return std_::unique_ptr<Preview>();
return std::unique_ptr<Preview>();
}
result->preview = Generator(result->instance, data).generate();
return std_::move(result);
return std::move(result);
}
int DefaultPreviewTitleHeight() {