diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-06-20 14:20:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-06-21 15:04:51 +0200 |
| commit | 6536439d44afcce296a5a40f8724ada2a1488d45 (patch) | |
| tree | aebb5ee9f0b80a80dfc8e05d22519996b45f7e88 /examples/demos/documentviewer/plugins/txtviewer/txtviewer.cpp | |
| parent | 1740e270544eed31e1fd6b63ec056814961d7d69 (diff) | |
DocumentViewer demo: Use modern string literals
This unearthes that JSON should convert from UTF-8.
Pick-to: 6.6
Change-Id: If155b745cac0579232b927a3988588204c31d207
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Diffstat (limited to 'examples/demos/documentviewer/plugins/txtviewer/txtviewer.cpp')
| -rw-r--r-- | examples/demos/documentviewer/plugins/txtviewer/txtviewer.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/examples/demos/documentviewer/plugins/txtviewer/txtviewer.cpp b/examples/demos/documentviewer/plugins/txtviewer/txtviewer.cpp index 44075018f..7eec2cbc0 100644 --- a/examples/demos/documentviewer/plugins/txtviewer/txtviewer.cpp +++ b/examples/demos/documentviewer/plugins/txtviewer/txtviewer.cpp @@ -22,6 +22,8 @@ #include <QPrintDialog> #endif +using namespace Qt::StringLiterals; + TxtViewer::TxtViewer() { connect(this, &AbstractViewer::uiInitialized, this, &TxtViewer::setupTxtUi); @@ -37,7 +39,7 @@ void TxtViewer::init(QFile *file, QWidget *parent, QMainWindow *mainWindow) QStringList TxtViewer::supportedMimeTypes() const { - return {"text/plain"}; + return {"text/plain"_L1}; } void TxtViewer::setupTxtUi() @@ -45,7 +47,8 @@ void TxtViewer::setupTxtUi() QMenu *editMenu = addMenu(tr("&Edit")); QToolBar *editToolBar = addToolBar(tr("Edit")); #ifndef QT_NO_CLIPBOARD - const QIcon cutIcon = QIcon::fromTheme("edit-cut", QIcon(":/demos/documentviewer/images/cut.png")); + const QIcon cutIcon = QIcon::fromTheme("edit-cut"_L1, + QIcon(":/demos/documentviewer/images/cut.png"_L1)); QAction *cutAct = new QAction(cutIcon, tr("Cu&t"), this); cutAct->setShortcuts(QKeySequence::Cut); cutAct->setStatusTip(tr("Cut the current selection's contents to the " @@ -54,7 +57,8 @@ void TxtViewer::setupTxtUi() editMenu->addAction(cutAct); editToolBar->addAction(cutAct); - const QIcon copyIcon = QIcon::fromTheme("edit-copy", QIcon(":/demos/documentviewer/images/copy.png")); + const QIcon copyIcon = QIcon::fromTheme("edit-copy"_L1, + QIcon(":/demos/documentviewer/images/copy.png"_L1)); QAction *copyAct = new QAction(copyIcon, tr("&Copy"), this); copyAct->setShortcuts(QKeySequence::Copy); copyAct->setStatusTip(tr("Copy the current selection's contents to the " @@ -63,7 +67,8 @@ void TxtViewer::setupTxtUi() editMenu->addAction(copyAct); editToolBar->addAction(copyAct); - const QIcon pasteIcon = QIcon::fromTheme("edit-paste", QIcon(":/demos/documentviewer/images/paste.png")); + const QIcon pasteIcon = QIcon::fromTheme("edit-paste"_L1, + QIcon(":/demos/documentviewer/images/paste.png"_L1)); QAction *pasteAct = new QAction(pasteIcon, tr("&Paste"), this); pasteAct->setShortcuts(QKeySequence::Paste); pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " |