mixa/tdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Qt 6 support

Browse Source 
Tested only on Linux so far
This commit is contained in:
Ilya Fedin
2021-10-19 17:00:21 +04:00
committed by John Preston
parent ea10cf5758
commit 847c01d605
154 changed files with 382 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/support/support_autocomplete.cpp
View File

@@ -21,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h"
#include "base/unixtime.h"
#include "base/call_delayed.h"
#include "base/qt_adapters.h"
#include "main/main_session.h"
#include "main/main_session_settings.h"
#include "apiwrap.h"
@@ -477,7 +476,7 @@ void Autocomplete::submitValue(const QString &value) {
const auto contact = value.mid(
prefix.size(),
(line > 0) ? (line - prefix.size()) : -1);
const auto parts = contact.split(' ', base::QStringSkipEmptyParts);
const auto parts = contact.split(' ', Qt::SkipEmptyParts);
if (parts.size() > 1) {
const auto phone = parts[0];
const auto firstName = parts[1];

27
Telegram/SourceFiles/support/support_helper.cpp
View File

@@ -177,18 +177,18 @@ uint32 ParseOccupationTag(History *history) {
return 0;
}
const auto &text = draft->textWithTags.text;
const auto parts = text.splitRef(';');
const auto parts = QStringView(text).split(';');
auto valid = false;
auto result = uint32();
for (const auto &part : parts) {
if (part.startsWith(qstr("t:"))) {
if (part.mid(2).toInt() >= base::unixtime::now()) {
if (base::StringViewMid(part, 2).toInt() >= base::unixtime::now()) {
valid = true;
} else {
return 0;
}
} else if (part.startsWith(qstr("u:"))) {
result = part.mid(2).toUInt();
result = base::StringViewMid(part, 2).toUInt();
}
}
return valid ? result : 0;
@@ -203,18 +203,18 @@ QString ParseOccupationName(History *history) {
return QString();
}
const auto &text = draft->textWithTags.text;
const auto parts = text.splitRef(';');
const auto parts = QStringView(text).split(';');
auto valid = false;
auto result = QString();
for (const auto &part : parts) {
if (part.startsWith(qstr("t:"))) {
if (part.mid(2).toInt() >= base::unixtime::now()) {
if (base::StringViewMid(part, 2).toInt() >= base::unixtime::now()) {
valid = true;
} else {
return 0;
}
} else if (part.startsWith(qstr("n:"))) {
result = part.mid(2).toString();
result = base::StringViewMid(part, 2).toString();
}
}
return valid ? result : QString();
@@ -229,18 +229,18 @@ TimeId OccupiedBySomeoneTill(History *history) {
return 0;
}
const auto &text = draft->textWithTags.text;
const auto parts = text.splitRef(';');
const auto parts = QStringView(text).split(';');
auto valid = false;
auto result = TimeId();
for (const auto &part : parts) {
if (part.startsWith(qstr("t:"))) {
if (part.mid(2).toInt() >= base::unixtime::now()) {
result = part.mid(2).toInt();
if (base::StringViewMid(part, 2).toInt() >= base::unixtime::now()) {
result = base::StringViewMid(part, 2).toInt();
} else {
return 0;
}
} else if (part.startsWith(qstr("u:"))) {
if (part.mid(2).toUInt() != OccupationTag()) {
if (base::StringViewMid(part, 2).toUInt() != OccupationTag()) {
valid = true;
} else {
return 0;
@@ -562,11 +562,14 @@ QString InterpretSendPath(
for (const auto &line : lines) {
if (line.startsWith(qstr("from: "))) {
if (window->session().userId().bare
!= line.midRef(qstr("from: ").size()).toULongLong()) {
!= base::StringViewMid(
line,
qstr("from: ").size()).toULongLong()) {
return "App Error: Wrong current user.";
}
} else if (line.startsWith(qstr("channel: "))) {
const auto channelId = line.midRef(
const auto channelId = base::StringViewMid(
line,
qstr("channel: ").size()).toULongLong();
toId = peerFromChannel(channelId);
} else if (line.startsWith(qstr("file: "))) {

2
Telegram/SourceFiles/support/support_templates.cpp
View File

@@ -433,7 +433,7 @@ int CountMaxKeyLength(const TemplatesData &data) {
for (const auto &[path, file] : data.files) {
for (const auto &[normalized, question] : file.questions) {
for (const auto &key : question.normalizedKeys) {
accumulate_max(result, key.size());
accumulate_max(result, int(key.size()));
}
}
}