From 233ca06500245a3d61432a7edce1668aa4ce35c9 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 5 May 2023 17:58:26 +0200 Subject: [PATCH] rsslisting example: move default URL to main() It felt more natural that the RSSListing class would be agnostic about the default URL, so let it be a constructor parameter. In the process, update the URL to what the old one now redirects to (thanks to Ivan Solovev for spotting that) and make the constructor explcit (thaks to Ievgenii Meshcheriakov for suggesting this). Task-number: QTBUG-111228 Pick-to: 6.5 Change-Id: I9f4c0d126e0872bb4ec6e6bb41add7e9d2a9537f Reviewed-by: Ievgenii Meshcheriakov --- examples/corelib/serialization/rsslisting/main.cpp | 3 ++- examples/corelib/serialization/rsslisting/rsslisting.cpp | 4 ++-- examples/corelib/serialization/rsslisting/rsslisting.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/corelib/serialization/rsslisting/main.cpp b/examples/corelib/serialization/rsslisting/main.cpp index 99862bac775..f6b44b0bbb2 100644 --- a/examples/corelib/serialization/rsslisting/main.cpp +++ b/examples/corelib/serialization/rsslisting/main.cpp @@ -9,6 +9,7 @@ Provides the main function for the RSS news reader example. #include "rsslisting.h" #include +using namespace Qt::StringLiterals; /*! Create an application and a main widget. Open the main widget for @@ -19,7 +20,7 @@ Provides the main function for the RSS news reader example. int main(int argc, char **argv) { QApplication app(argc, argv); - RSSListing rsslisting; + RSSListing rsslisting(u"https://www.qt.io/blog/rss.xml"_s); rsslisting.show(); return app.exec(); } diff --git a/examples/corelib/serialization/rsslisting/rsslisting.cpp b/examples/corelib/serialization/rsslisting/rsslisting.cpp index 51df3a6f4c5..7c1f57ecc98 100644 --- a/examples/corelib/serialization/rsslisting/rsslisting.cpp +++ b/examples/corelib/serialization/rsslisting/rsslisting.cpp @@ -32,12 +32,12 @@ its operation, and also allows very large data sources to be read. news. */ -RSSListing::RSSListing(QWidget *parent) +RSSListing::RSSListing(const QString &url, QWidget *parent) : QWidget(parent), currentReply(0) { lineEdit = new QLineEdit(this); - lineEdit->setText("http://blog.qt.io/feed/"); + lineEdit->setText(url); fetchButton = new QPushButton(tr("Fetch"), this); diff --git a/examples/corelib/serialization/rsslisting/rsslisting.h b/examples/corelib/serialization/rsslisting/rsslisting.h index a7fd5a857d2..c5ac855dce6 100644 --- a/examples/corelib/serialization/rsslisting/rsslisting.h +++ b/examples/corelib/serialization/rsslisting/rsslisting.h @@ -21,7 +21,7 @@ class RSSListing : public QWidget { Q_OBJECT public: - RSSListing(QWidget *widget = nullptr); + explicit RSSListing(const QString &url = QString(), QWidget *widget = nullptr); public slots: void fetch();