From d532dde2c3dcc09a4a4e38fa4396f2c11a7d4285 Mon Sep 17 00:00:00 2001 From: Roman Vladimirov Date: Sun, 12 May 2024 14:52:09 +0300 Subject: [PATCH] * Fixes for Qt6 --- src/Classes/Models/seenmodel.cpp | 2 +- src/Classes/Models/seenmodel.h | 2 +- src/Classes/Models/youtubevideomodel.cpp | 2 +- src/Classes/Models/youtubevideomodel.h | 2 +- src/Classes/Services/releaselinkedseries.cpp | 4 ++-- src/Classes/ViewModels/mainviewmodel.h | 4 ++-- src/Classes/ViewModels/onlineplayerviewmodel.cpp | 6 ++++-- src/Classes/ViewModels/torrentnotifierviewmodel.cpp | 2 +- src/Classes/ViewModels/youtubeviewmodel.cpp | 3 ++- src/main.cpp | 5 +++-- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/Classes/Models/seenmodel.cpp b/src/Classes/Models/seenmodel.cpp index c68dc6e8..e5f47038 100644 --- a/src/Classes/Models/seenmodel.cpp +++ b/src/Classes/Models/seenmodel.cpp @@ -33,7 +33,7 @@ void SeenModel::writeToJson(QJsonObject &json) const noexcept json["timestamp"] = m_Timestamp; } -void SeenModel::readFromJson(QJsonValue &json) +void SeenModel::readFromJson(QJsonObject &json) { setId(json["id"].toInt()); setVideoId(json["videoId"].toInt()); diff --git a/src/Classes/Models/seenmodel.h b/src/Classes/Models/seenmodel.h index 6c492294..2b6d0e8b 100644 --- a/src/Classes/Models/seenmodel.h +++ b/src/Classes/Models/seenmodel.h @@ -24,7 +24,7 @@ class SeenModel void setTimestamp(const int timestamp) noexcept; void writeToJson(QJsonObject &json) const noexcept; - void readFromJson(QJsonValue &json); + void readFromJson(QJsonObject &json); }; #endif // SEENMODEL_H diff --git a/src/Classes/Models/youtubevideomodel.cpp b/src/Classes/Models/youtubevideomodel.cpp index b6965583..6648d907 100644 --- a/src/Classes/Models/youtubevideomodel.cpp +++ b/src/Classes/Models/youtubevideomodel.cpp @@ -62,7 +62,7 @@ void YoutubeVideoModel::writeToJson(QJsonObject &json) const noexcept json["image"] = m_Image; } -void YoutubeVideoModel::readFromJson(QJsonValue &json) +void YoutubeVideoModel::readFromJson(QJsonObject &json) { setId(json["id"].toInt()); setTitle(json["title"].toString()); diff --git a/src/Classes/Models/youtubevideomodel.h b/src/Classes/Models/youtubevideomodel.h index 193a9a08..63a927da 100644 --- a/src/Classes/Models/youtubevideomodel.h +++ b/src/Classes/Models/youtubevideomodel.h @@ -49,7 +49,7 @@ class YoutubeVideoModel void setTimestamp(const int timestamp) noexcept; void writeToJson(QJsonObject &json) const noexcept; - void readFromJson(QJsonValue &json); + void readFromJson(QJsonObject &json); }; diff --git a/src/Classes/Services/releaselinkedseries.cpp b/src/Classes/Services/releaselinkedseries.cpp index f880bdb1..bbf2b208 100644 --- a/src/Classes/Services/releaselinkedseries.cpp +++ b/src/Classes/Services/releaselinkedseries.cpp @@ -485,7 +485,7 @@ void ReleaseLinkedSeries::processReleasesFromDescription(const QString& descript int watchOrderIndex = description.indexOf(startToken); if (watchOrderIndex == -1) return; - auto cuttedDescription = description.midRef(watchOrderIndex + startToken.length()); + auto cuttedDescription = description.mid(watchOrderIndex + startToken.length()); auto parts = cuttedDescription.split("#").mid(1); static QRegularExpression linkRegexp(R"(\/release\/(.*)\.html)"); @@ -505,7 +505,7 @@ void ReleaseLinkedSeries::processReleasesFromDescription(const QString& descript auto series = new ReleaseSeriesModel(); foreach (auto part, parts) { - auto partString = part.toString(); + auto partString = part; auto match = linkRegexp.match(partString); diff --git a/src/Classes/ViewModels/mainviewmodel.h b/src/Classes/ViewModels/mainviewmodel.h index 3c27224f..39e4100a 100644 --- a/src/Classes/ViewModels/mainviewmodel.h +++ b/src/Classes/ViewModels/mainviewmodel.h @@ -57,8 +57,8 @@ class MainViewModel : public QObject QVariantList m_leftToolbar { QVariantList() }; bool m_editLeftToolbar { false }; QVariantList m_otherLeftToolbar { QVariantList() }; - QString m_dropIndex { -1 }; - QString m_dragIndex { -1 }; + QString m_dropIndex { "" }; + QString m_dragIndex { "" }; QString m_globalTextFont { "" }; QStringList m_fontFamilies { QStringList() }; const QString addItemButton { "additem" }; diff --git a/src/Classes/ViewModels/onlineplayerviewmodel.cpp b/src/Classes/ViewModels/onlineplayerviewmodel.cpp index c81c698c..67e4cf4e 100644 --- a/src/Classes/ViewModels/onlineplayerviewmodel.cpp +++ b/src/Classes/ViewModels/onlineplayerviewmodel.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "../../globalhelpers.h" @@ -666,7 +667,7 @@ void OnlinePlayerViewModel::quickSetupForSingleRelease(int releaseId, int custom m_isStreamingTorrents = false; QDateTime timestamp; - timestamp.setTime_t(release->timestamp()); + timestamp.setSecsSinceEpoch(release->timestamp()); auto year = timestamp.date().year(); m_isReleaseLess2022 = year > 0 && year < 2022; @@ -1281,7 +1282,8 @@ void OnlinePlayerViewModel::loadSeens() foreach (auto item, jsonSeens) { SeenModel* seenModel = new SeenModel(); - seenModel->readFromJson(item); + auto object = item.toObject(); + seenModel->readFromJson(object); if (!m_seenModels->contains(seenModel->id())) { m_seenModels->insert(seenModel->id(), seenModel); } diff --git a/src/Classes/ViewModels/torrentnotifierviewmodel.cpp b/src/Classes/ViewModels/torrentnotifierviewmodel.cpp index d5f3f2a2..f6990583 100644 --- a/src/Classes/ViewModels/torrentnotifierviewmodel.cpp +++ b/src/Classes/ViewModels/torrentnotifierviewmodel.cpp @@ -197,7 +197,7 @@ void TorrentNotifierViewModel::messageReceived(const QString &message) auto firstSeparator = message.indexOf(":"); if (firstSeparator == -1) return; - auto response = message.midRef(0, firstSeparator); + auto response = message.mid(0, firstSeparator); if (response == "ds") { auto document = QJsonDocument::fromJson(message.mid(3).toUtf8()); diff --git a/src/Classes/ViewModels/youtubeviewmodel.cpp b/src/Classes/ViewModels/youtubeviewmodel.cpp index 18d3baf9..9865965d 100644 --- a/src/Classes/ViewModels/youtubeviewmodel.cpp +++ b/src/Classes/ViewModels/youtubeviewmodel.cpp @@ -148,8 +148,9 @@ void YoutubeViewModel::readYoutubeItems() auto items = dataObject["items"].toArray(); foreach (auto item, items) { + auto object = item.toObject(); auto model = new YoutubeVideoModel(); - model->readFromJson(item); + model->readFromJson(object); m_youtubeVideos->append(model); } diff --git a/src/main.cpp b/src/main.cpp index f0b275e6..4dab4200 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -86,11 +86,12 @@ int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL); QQuickWindow::setSceneGraphBackend("opengl"); +#else + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); #endif #ifdef Q_OS_WIN