diff options
Diffstat (limited to 'src/designer/src/lib/shared/newformwidget.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/newformwidget.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp index 8ee2c4955..1ed86700a 100644 --- a/src/designer/src/lib/shared/newformwidget.cpp +++ b/src/designer/src/lib/shared/newformwidget.cpp @@ -50,7 +50,7 @@ static const char *newFormObjectNameC = "Form"; // else return "Form". static QString formName(const QString &className) { - if (!className.startsWith(QLatin1Char('Q'))) + if (!className.startsWith(u'Q')) return QLatin1String(newFormObjectNameC); QString rc = className; rc.remove(0, 1); @@ -386,7 +386,7 @@ void NewFormWidget::loadFrom(const QString &path, bool resourceFile, const QStri if (list.isEmpty()) return; - const QChar separator = resourceFile ? QChar(QLatin1Char('/')) + const QChar separator = resourceFile ? QChar(u'/') : QDir::separator(); QTreeWidgetItem *root = new QTreeWidgetItem(m_ui->treeWidget); root->setFlags(root->flags() & ~Qt::ItemIsSelectable); @@ -402,9 +402,7 @@ void NewFormWidget::loadFrom(const QString &path, bool resourceFile, const QStri visiblePath = QDir::toNativeSeparators(visiblePath); } - const QChar underscore = QLatin1Char('_'); - const QChar blank = QLatin1Char(' '); - root->setText(0, visiblePath.replace(underscore, blank)); + root->setText(0, visiblePath.replace(u'_', u' ')); root->setToolTip(0, path); for (const auto &fi : list) { @@ -412,7 +410,7 @@ void NewFormWidget::loadFrom(const QString &path, bool resourceFile, const QStri continue; QTreeWidgetItem *item = new QTreeWidgetItem(root); - const QString text = fi.baseName().replace(underscore, blank); + const QString text = fi.baseName().replace(u'_', u' '); if (selectedItemFound == nullptr && text == selectedItem) selectedItemFound = item; item->setText(0, text); @@ -479,7 +477,7 @@ QString NewFormWidget::itemToTemplate(const QTreeWidgetItem *item, QString *erro const QFileInfo fiBase(fileName); QString sizeFileName; QTextStream(&sizeFileName) << fiBase.path() << QDir::separator() - << size.width() << QLatin1Char('x') << size.height() << QDir::separator() + << size.width() << 'x' << size.height() << QDir::separator() << fiBase.fileName(); if (QFileInfo(sizeFileName).isFile()) return readAll(sizeFileName, errorMessage); |