thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some qt6 prep

Browse source
This commit is contained in:
Nicolas Werner 2021-12-28 20:09:08 +01:00
parent 2866826356
commit 5ca98829f7
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
32 changed files with 89 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChatPage.cpp
View file

@ -62,7 +62,6 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
topLayout_ = new QHBoxLayout(this);
topLayout_->setSpacing(0);
topLayout_->setMargin(0);
view_manager_ = new TimelineViewManager(callManager_, this);
@ -1303,7 +1302,7 @@ ChatPage::handleMatrixUri(QString uri)
auto tempPath = uri_.path(QUrl::ComponentFormattingOption::FullyEncoded);
if (tempPath.startsWith('/'))
tempPath.remove(0, 1);
auto segments = tempPath.splitRef('/');
auto segments = QStringView(tempPath).split('/');
if (segments.size() != 2 && segments.size() != 4)
return false;
@ -1314,7 +1313,7 @@ ChatPage::handleMatrixUri(QString uri)
return false;
QString mxid2;
if (segments.size() == 4 && segments[2] == "e") {
if (segments.size() == 4 && segments[2] == QStringView(u"e")) {
if (segments[3].isEmpty())
return false;
else