diff options
Diffstat (limited to 'examples/webenginewidgets/simplebrowser')
6 files changed, 22 insertions, 32 deletions
diff --git a/examples/webenginewidgets/simplebrowser/browser.cpp b/examples/webenginewidgets/simplebrowser/browser.cpp index 83e273d07..f1ed68739 100644 --- a/examples/webenginewidgets/simplebrowser/browser.cpp +++ b/examples/webenginewidgets/simplebrowser/browser.cpp @@ -6,8 +6,6 @@ #include <QWebEngineSettings> -using namespace Qt::StringLiterals; - Browser::Browser() { // Quit application if the download manager window is the only remaining window @@ -21,8 +19,8 @@ Browser::Browser() BrowserWindow *Browser::createHiddenWindow(bool offTheRecord) { if (!offTheRecord && !m_profile) { - const QString name = u"simplebrowser."_s + QLatin1StringView(qWebEngineChromiumVersion()); - m_profile.reset(new QWebEngineProfile(name)); + m_profile.reset(new QWebEngineProfile( + QString::fromLatin1("simplebrowser.%1").arg(qWebEngineChromiumVersion()))); 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 7f30d2e92..d5b097b22 100644 --- a/examples/webenginewidgets/simplebrowser/browserwindow.cpp +++ b/examples/webenginewidgets/simplebrowser/browserwindow.cpp @@ -21,8 +21,6 @@ #include <QWebEngineFindTextResult> #include <QWebEngineProfile> -using namespace Qt::StringLiterals; - BrowserWindow::BrowserWindow(Browser *browser, QWebEngineProfile *profile, bool forDevTools) : m_browser(browser) , m_profile(profile) @@ -52,7 +50,8 @@ BrowserWindow::BrowserWindow(Browser *browser, QWebEngineProfile *profile, bool m_progressBar->setMaximumHeight(1); m_progressBar->setTextVisible(false); - m_progressBar->setStyleSheet(u"QProgressBar {border: 0px} QProgressBar::chunk {background-color: #da4453}"_s); + m_progressBar->setStyleSheet(QStringLiteral( + "QProgressBar {border: 0px} QProgressBar::chunk {background-color: #da4453}")); layout->addWidget(m_progressBar); } @@ -320,7 +319,7 @@ QToolBar *BrowserWindow::createToolBar() backShortcuts.append(QKeySequence(Qt::Key_Back)); m_historyBackAction->setShortcuts(backShortcuts); m_historyBackAction->setIconVisibleInMenu(false); - m_historyBackAction->setIcon(QIcon(u":go-previous.png"_s)); + m_historyBackAction->setIcon(QIcon(QStringLiteral(":go-previous.png"))); m_historyBackAction->setToolTip(tr("Go back in history")); connect(m_historyBackAction, &QAction::triggered, [this]() { m_tabWidget->triggerWebPageAction(QWebEnginePage::Back); @@ -332,7 +331,7 @@ QToolBar *BrowserWindow::createToolBar() fwdShortcuts.append(QKeySequence(Qt::Key_Forward)); m_historyForwardAction->setShortcuts(fwdShortcuts); m_historyForwardAction->setIconVisibleInMenu(false); - m_historyForwardAction->setIcon(QIcon(u":go-next.png"_s)); + m_historyForwardAction->setIcon(QIcon(QStringLiteral(":go-next.png"))); m_historyForwardAction->setToolTip(tr("Go forward in history")); connect(m_historyForwardAction, &QAction::triggered, [this]() { m_tabWidget->triggerWebPageAction(QWebEnginePage::Forward); @@ -352,7 +351,7 @@ QToolBar *BrowserWindow::createToolBar() navigationBar->addWidget(m_urlLineEdit); auto downloadsAction = new QAction(this); - downloadsAction->setIcon(QIcon(u":go-bottom.png"_s)); + downloadsAction->setIcon(QIcon(QStringLiteral(":go-bottom.png"))); downloadsAction->setToolTip(tr("Show downloads")); navigationBar->addAction(downloadsAction); connect(downloadsAction, &QAction::triggered, @@ -456,8 +455,8 @@ WebView *BrowserWindow::currentTab() const void BrowserWindow::handleWebViewLoadProgress(int progress) { - static QIcon stopIcon(u":process-stop.png"_s); - static QIcon reloadIcon(u":view-refresh.png"_s); + static QIcon stopIcon(QStringLiteral(":process-stop.png")); + static QIcon reloadIcon(QStringLiteral(":view-refresh.png")); 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 83784b628..f8b96c6e6 100644 --- a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp +++ b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp @@ -7,8 +7,6 @@ #include <QUrl> #include <QWebEngineDownloadRequest> -using namespace Qt::StringLiterals; - DownloadWidget::DownloadWidget(QWebEngineDownloadRequest *download, QWidget *parent) : QFrame(parent) , m_download(download) @@ -98,11 +96,11 @@ void DownloadWidget::updateWidget() } if (state == QWebEngineDownloadRequest::DownloadInProgress) { - static QIcon cancelIcon(u":process-stop.png"_s); + static QIcon cancelIcon(QStringLiteral(":process-stop.png")); m_cancelButton->setIcon(cancelIcon); m_cancelButton->setToolTip(tr("Stop downloading")); } else { - static QIcon removeIcon(u":edit-clear.png"_s); + static QIcon removeIcon(QStringLiteral(":edit-clear.png")); 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 d5d9e78ab..b945ef27e 100644 --- a/examples/webenginewidgets/simplebrowser/main.cpp +++ b/examples/webenginewidgets/simplebrowser/main.cpp @@ -9,16 +9,14 @@ #include <QWebEngineProfile> #include <QWebEngineSettings> -using namespace Qt::StringLiterals; - QUrl commandLineUrlArgument() { const QStringList args = QCoreApplication::arguments(); for (const QString &arg : args.mid(1)) { - if (!arg.startsWith(u'-')) + if (!arg.startsWith(QLatin1Char('-'))) return QUrl::fromUserInput(arg); } - return QUrl(u"https://www.qt.io"_s); + return QUrl(QStringLiteral("https://www.qt.io")); } int main(int argc, char **argv) @@ -26,8 +24,8 @@ int main(int argc, char **argv) QCoreApplication::setOrganizationName("QtExamples"); QApplication app(argc, argv); - app.setWindowIcon(QIcon(u":AppLogoColor.png"_s)); - QLoggingCategory::setFilterRules(u"qt.webenginecontext.debug=true"_s); + app.setWindowIcon(QIcon(QStringLiteral(":AppLogoColor.png"))); + QLoggingCategory::setFilterRules(QStringLiteral("qt.webenginecontext.debug=true")); 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 f9037a8e1..e4e204ce9 100644 --- a/examples/webenginewidgets/simplebrowser/tabwidget.cpp +++ b/examples/webenginewidgets/simplebrowser/tabwidget.cpp @@ -9,8 +9,6 @@ #include <QTabBar> #include <QWebEngineProfile> -using namespace Qt::StringLiterals; - TabWidget::TabWidget(QWebEngineProfile *profile, QWidget *parent) : QTabWidget(parent) , m_profile(profile) @@ -34,10 +32,10 @@ TabWidget::TabWidget(QWebEngineProfile *profile, QWidget *parent) if (profile->isOffTheRecord()) { QLabel *icon = new QLabel(this); - QPixmap pixmap(u":ninja.png"_s); + QPixmap pixmap(QStringLiteral(":ninja.png")); icon->setPixmap(pixmap.scaledToHeight(tabBar->height())); - setStyleSheet(u"QTabWidget::tab-bar { left: %1px; }"_s. - arg(icon->pixmap().width())); + setStyleSheet( + QStringLiteral("QTabWidget::tab-bar { left: %1px; }").arg(icon->pixmap().width())); } } diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp index e024f9126..e41d4334e 100644 --- a/examples/webenginewidgets/simplebrowser/webview.cpp +++ b/examples/webenginewidgets/simplebrowser/webview.cpp @@ -17,8 +17,6 @@ #include <QTimer> #include <QStyle> -using namespace Qt::StringLiterals; - WebView::WebView(QWidget *parent) : QWebEngineView(parent) { @@ -148,15 +146,16 @@ QIcon WebView::favIcon() const return favIcon; if (m_loadProgress < 0) { - static QIcon errorIcon(u":dialog-error.png"_s); + static QIcon errorIcon(QStringLiteral(":dialog-error.png")); return errorIcon; } + if (m_loadProgress < 100) { - static QIcon loadingIcon(u":view-refresh.png"_s); + static QIcon loadingIcon(QStringLiteral(":view-refresh.png")); return loadingIcon; } - static QIcon defaultIcon(u":text-html.png"_s); + static QIcon defaultIcon(":text-html.png"); return defaultIcon; } |