From de96e684275be9548252f874cbc515b81cd51cd8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 28 Mar 2023 15:50:42 +0200 Subject: Simple browser example: Use modern string literals Pick-to: 6.5 Change-Id: I14ed5efed1bf228239f95a8a4addce5d19a9f220 Reviewed-by: Michal Klocek --- examples/webenginewidgets/simplebrowser/browser.cpp | 6 ++++-- examples/webenginewidgets/simplebrowser/browserwindow.cpp | 14 ++++++++------ examples/webenginewidgets/simplebrowser/downloadwidget.cpp | 6 ++++-- examples/webenginewidgets/simplebrowser/main.cpp | 10 ++++++---- examples/webenginewidgets/simplebrowser/tabwidget.cpp | 6 ++++-- examples/webenginewidgets/simplebrowser/webview.cpp | 8 +++++--- 6 files changed, 31 insertions(+), 19 deletions(-) (limited to 'examples') diff --git a/examples/webenginewidgets/simplebrowser/browser.cpp b/examples/webenginewidgets/simplebrowser/browser.cpp index f1ed68739..83e273d07 100644 --- a/examples/webenginewidgets/simplebrowser/browser.cpp +++ b/examples/webenginewidgets/simplebrowser/browser.cpp @@ -6,6 +6,8 @@ #include +using namespace Qt::StringLiterals; + Browser::Browser() { // Quit application if the download manager window is the only remaining window @@ -19,8 +21,8 @@ Browser::Browser() BrowserWindow *Browser::createHiddenWindow(bool offTheRecord) { if (!offTheRecord && !m_profile) { - m_profile.reset(new QWebEngineProfile( - QString::fromLatin1("simplebrowser.%1").arg(qWebEngineChromiumVersion()))); + const QString name = u"simplebrowser."_s + QLatin1StringView(qWebEngineChromiumVersion()); + m_profile.reset(new QWebEngineProfile(name)); m_profile->settings()->setAttribute(QWebEngineSettings::PluginsEnabled, true); m_profile->settings()->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true); m_profile->settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, true); diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.cpp b/examples/webenginewidgets/simplebrowser/browserwindow.cpp index 6fc9f9d1d..de8658196 100644 --- a/examples/webenginewidgets/simplebrowser/browserwindow.cpp +++ b/examples/webenginewidgets/simplebrowser/browserwindow.cpp @@ -21,6 +21,8 @@ #include #include +using namespace Qt::StringLiterals; + BrowserWindow::BrowserWindow(Browser *browser, QWebEngineProfile *profile, bool forDevTools) : m_browser(browser) , m_profile(profile) @@ -58,7 +60,7 @@ BrowserWindow::BrowserWindow(Browser *browser, QWebEngineProfile *profile, bool m_progressBar->setMaximumHeight(1); m_progressBar->setTextVisible(false); - m_progressBar->setStyleSheet(QStringLiteral("QProgressBar {border: 0px} QProgressBar::chunk {background-color: #da4453}")); + m_progressBar->setStyleSheet(u"QProgressBar {border: 0px} QProgressBar::chunk {background-color: #da4453}"_s); layout->addWidget(m_progressBar); } @@ -319,7 +321,7 @@ QToolBar *BrowserWindow::createToolBar() backShortcuts.append(QKeySequence(Qt::Key_Back)); m_historyBackAction->setShortcuts(backShortcuts); m_historyBackAction->setIconVisibleInMenu(false); - m_historyBackAction->setIcon(QIcon(QStringLiteral(":go-previous.png"))); + m_historyBackAction->setIcon(QIcon(u":go-previous.png"_s)); m_historyBackAction->setToolTip(tr("Go back in history")); connect(m_historyBackAction, &QAction::triggered, [this]() { m_tabWidget->triggerWebPageAction(QWebEnginePage::Back); @@ -337,7 +339,7 @@ QToolBar *BrowserWindow::createToolBar() fwdShortcuts.append(QKeySequence(Qt::Key_Forward)); m_historyForwardAction->setShortcuts(fwdShortcuts); m_historyForwardAction->setIconVisibleInMenu(false); - m_historyForwardAction->setIcon(QIcon(QStringLiteral(":go-next.png"))); + m_historyForwardAction->setIcon(QIcon(u":go-next.png"_s)); m_historyForwardAction->setToolTip(tr("Go forward in history")); connect(m_historyForwardAction, &QAction::triggered, [this]() { m_tabWidget->triggerWebPageAction(QWebEnginePage::Forward); @@ -357,7 +359,7 @@ QToolBar *BrowserWindow::createToolBar() navigationBar->addWidget(m_urlLineEdit); auto downloadsAction = new QAction(this); - downloadsAction->setIcon(QIcon(QStringLiteral(":go-bottom.png"))); + downloadsAction->setIcon(QIcon(u":go-bottom.png"_s)); downloadsAction->setToolTip(tr("Show downloads")); navigationBar->addAction(downloadsAction); connect(downloadsAction, &QAction::triggered, [this]() { @@ -462,8 +464,8 @@ WebView *BrowserWindow::currentTab() const void BrowserWindow::handleWebViewLoadProgress(int progress) { - static QIcon stopIcon(QStringLiteral(":process-stop.png")); - static QIcon reloadIcon(QStringLiteral(":view-refresh.png")); + static QIcon stopIcon(u":process-stop.png"_s); + static QIcon reloadIcon(u":view-refresh.png"_s); if (0 < progress && progress < 100) { m_stopReloadAction->setData(QWebEnginePage::Stop); diff --git a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp index d4998853e..8f73f9f37 100644 --- a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp +++ b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp @@ -7,6 +7,8 @@ #include #include +using namespace Qt::StringLiterals; + DownloadWidget::DownloadWidget(QWebEngineDownloadRequest *download, QWidget *parent) : QFrame(parent) , m_download(download) @@ -101,11 +103,11 @@ void DownloadWidget::updateWidget() } if (state == QWebEngineDownloadRequest::DownloadInProgress) { - static QIcon cancelIcon(QStringLiteral(":process-stop.png")); + static QIcon cancelIcon(u":process-stop.png"_s); m_cancelButton->setIcon(cancelIcon); m_cancelButton->setToolTip(tr("Stop downloading")); } else { - static QIcon removeIcon(QStringLiteral(":edit-clear.png")); + static QIcon removeIcon(u":edit-clear.png"_s); m_cancelButton->setIcon(removeIcon); m_cancelButton->setToolTip(tr("Remove from list")); } diff --git a/examples/webenginewidgets/simplebrowser/main.cpp b/examples/webenginewidgets/simplebrowser/main.cpp index b945ef27e..d5d9e78ab 100644 --- a/examples/webenginewidgets/simplebrowser/main.cpp +++ b/examples/webenginewidgets/simplebrowser/main.cpp @@ -9,14 +9,16 @@ #include #include +using namespace Qt::StringLiterals; + QUrl commandLineUrlArgument() { const QStringList args = QCoreApplication::arguments(); for (const QString &arg : args.mid(1)) { - if (!arg.startsWith(QLatin1Char('-'))) + if (!arg.startsWith(u'-')) return QUrl::fromUserInput(arg); } - return QUrl(QStringLiteral("https://www.qt.io")); + return QUrl(u"https://www.qt.io"_s); } int main(int argc, char **argv) @@ -24,8 +26,8 @@ int main(int argc, char **argv) QCoreApplication::setOrganizationName("QtExamples"); QApplication app(argc, argv); - app.setWindowIcon(QIcon(QStringLiteral(":AppLogoColor.png"))); - QLoggingCategory::setFilterRules(QStringLiteral("qt.webenginecontext.debug=true")); + app.setWindowIcon(QIcon(u":AppLogoColor.png"_s)); + QLoggingCategory::setFilterRules(u"qt.webenginecontext.debug=true"_s); QWebEngineProfile::defaultProfile()->settings()->setAttribute(QWebEngineSettings::PluginsEnabled, true); QWebEngineProfile::defaultProfile()->settings()->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true); diff --git a/examples/webenginewidgets/simplebrowser/tabwidget.cpp b/examples/webenginewidgets/simplebrowser/tabwidget.cpp index 9e19cf782..f9037a8e1 100644 --- a/examples/webenginewidgets/simplebrowser/tabwidget.cpp +++ b/examples/webenginewidgets/simplebrowser/tabwidget.cpp @@ -9,6 +9,8 @@ #include #include +using namespace Qt::StringLiterals; + TabWidget::TabWidget(QWebEngineProfile *profile, QWidget *parent) : QTabWidget(parent) , m_profile(profile) @@ -32,9 +34,9 @@ TabWidget::TabWidget(QWebEngineProfile *profile, QWidget *parent) if (profile->isOffTheRecord()) { QLabel *icon = new QLabel(this); - QPixmap pixmap(QStringLiteral(":ninja.png")); + QPixmap pixmap(u":ninja.png"_s); icon->setPixmap(pixmap.scaledToHeight(tabBar->height())); - setStyleSheet(QStringLiteral("QTabWidget::tab-bar { left: %1px; }"). + setStyleSheet(u"QTabWidget::tab-bar { left: %1px; }"_s. arg(icon->pixmap().width())); } } diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp index 16a58ce6c..c8dccdf14 100644 --- a/examples/webenginewidgets/simplebrowser/webview.cpp +++ b/examples/webenginewidgets/simplebrowser/webview.cpp @@ -17,6 +17,8 @@ #include #include +using namespace Qt::StringLiterals; + WebView::WebView(QWidget *parent) : QWebEngineView(parent) , m_loadProgress(100) @@ -147,13 +149,13 @@ QIcon WebView::favIcon() const return favIcon; if (m_loadProgress < 0) { - static QIcon errorIcon(QStringLiteral(":dialog-error.png")); + static QIcon errorIcon(u":dialog-error.png"_s); return errorIcon; } else if (m_loadProgress < 100) { - static QIcon loadingIcon(QStringLiteral(":view-refresh.png")); + static QIcon loadingIcon(u":view-refresh.png"_s); return loadingIcon; } else { - static QIcon defaultIcon(QStringLiteral(":text-html.png")); + static QIcon defaultIcon(u":text-html.png"_s); return defaultIcon; } } -- cgit v1.2.3