summaryrefslogtreecommitdiff
path: root/src/designer/src/designer
diff options
context:
space:
mode:
Diffstat (limited to 'src/designer/src/designer')
-rw-r--r--src/designer/src/designer/appfontdialog.cpp4
-rw-r--r--src/designer/src/designer/assistantclient.cpp2
-rw-r--r--src/designer/src/designer/qdesigner.cpp2
-rw-r--r--src/designer/src/designer/qdesigner_actions.cpp14
-rw-r--r--src/designer/src/designer/qdesigner_formwindow.cpp3
-rw-r--r--src/designer/src/designer/qdesigner_server.cpp10
-rw-r--r--src/designer/src/designer/qdesigner_workbench.cpp4
-rw-r--r--src/designer/src/designer/saveformastemplate.cpp4
8 files changed, 17 insertions, 26 deletions
diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index e14b40b33..10ebc8c92 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -92,9 +92,7 @@ void AppFontManager::save(QDesignerSettingsInterface *s, const QString &prefix)
void AppFontManager::restore(const QDesignerSettingsInterface *s, const QString &prefix)
{
- QString key = prefix;
- key += QLatin1Char('/');
- key += QLatin1String(fontFileKeyC);
+ const QString key = prefix + u'/' + QLatin1StringView(fontFileKeyC);
const QStringList fontFiles = s->value(key, QStringList()).toStringList();
if (debugAppFontWidget)
diff --git a/src/designer/src/designer/assistantclient.cpp b/src/designer/src/designer/assistantclient.cpp
index 0f01aa295..43934c13e 100644
--- a/src/designer/src/designer/assistantclient.cpp
+++ b/src/designer/src/designer/assistantclient.cpp
@@ -59,7 +59,7 @@ bool AssistantClient::sendCommand(const QString &cmd, QString *errorMessage)
return false;
}
QTextStream str(m_process);
- str << cmd << QLatin1Char('\n') << Qt::endl;
+ str << cmd << "\n\n";
return true;
}
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index cc20413c5..3181bd557 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -85,7 +85,7 @@ void QDesigner::showErrorMessage(const QString &message)
const QMessageLogContext emptyContext;
previousMessageHandler(QtWarningMsg, emptyContext, message); // just in case we crash
m_initializationErrors += qMessage;
- m_initializationErrors += QLatin1Char('\n');
+ m_initializationErrors += u'\n';
}
}
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index ba3791f3d..8e01988c1 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -778,11 +778,8 @@ bool QDesignerActions::readInForm(const QString &fileName)
if (!fInfo.exists()) {
// Normalize file name
const QString directory = fInfo.absolutePath();
- if (QDir(directory).exists()) {
- newFormFileName = directory;
- newFormFileName += QLatin1Char('/');
- newFormFileName += fInfo.fileName();
- }
+ if (QDir(directory).exists())
+ newFormFileName = directory + u'/' + fInfo.fileName();
}
showNewFormDialog(newFormFileName);
return false;
@@ -1245,11 +1242,8 @@ void QDesignerActions::savePreviewImage()
const QString filter = tr("Image files (*.%1)").arg(extension);
QString suggestion = fw->fileName();
- if (!suggestion.isEmpty()) {
- suggestion = QFileInfo(suggestion).baseName();
- suggestion += QLatin1Char('.');
- suggestion += extension;
- }
+ if (!suggestion.isEmpty())
+ suggestion = QFileInfo(suggestion).baseName() + u'.' + extension;
QFileDialog dialog(fw, tr("Save Image"), suggestion, filter);
dialog.setAcceptMode(QFileDialog::AcceptSave);
diff --git a/src/designer/src/designer/qdesigner_formwindow.cpp b/src/designer/src/designer/qdesigner_formwindow.cpp
index 7ef8b1f98..3c6dc2f12 100644
--- a/src/designer/src/designer/qdesigner_formwindow.cpp
+++ b/src/designer/src/designer/qdesigner_formwindow.cpp
@@ -174,8 +174,7 @@ void QDesignerFormWindow::updateWindowTitle(const QString &fileName)
if (fileName.isEmpty()) {
fileNameTitle += "untitled"_L1;
if (const int maxUntitled = getNumberOfUntitledWindows()) {
- fileNameTitle += QLatin1Char(' ');
- fileNameTitle += QString::number(maxUntitled + 1);
+ fileNameTitle += u' ' + QString::number(maxUntitled + 1);
}
} else {
fileNameTitle = QFileInfo(fileName).fileName();
diff --git a/src/designer/src/designer/qdesigner_server.cpp b/src/designer/src/designer/qdesigner_server.cpp
index 6b4a81a9a..f12a360d1 100644
--- a/src/designer/src/designer/qdesigner_server.cpp
+++ b/src/designer/src/designer/qdesigner_server.cpp
@@ -15,6 +15,8 @@
QT_BEGIN_NAMESPACE
+using namespace Qt::StringLiterals;
+
// ### review
QDesignerServer::QDesignerServer(QObject *parent)
@@ -56,8 +58,8 @@ void QDesignerServer::readFromClient()
while (m_socket->canReadLine()) {
QString file = QString::fromUtf8(m_socket->readLine());
if (!file.isNull()) {
- file.remove(QLatin1Char('\n'));
- file.remove(QLatin1Char('\r'));
+ file.remove(u'\n');
+ file.remove(u'\r');
qDesigner->postEvent(qDesigner, new QFileOpenEvent(file));
}
}
@@ -102,8 +104,8 @@ void QDesignerClient::readFromSocket()
while (m_socket->canReadLine()) {
QString file = QString::fromUtf8(m_socket->readLine());
if (!file.isNull()) {
- file.remove(QLatin1Char('\n'));
- file.remove(QLatin1Char('\r'));
+ file.remove(u'\n');
+ file.remove(u'\r');
if (QFile::exists(file))
qDesigner->postEvent(qDesigner, new QFileOpenEvent(file));
}
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index 5ee5f7790..58c856047 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -885,8 +885,8 @@ QDesignerFormWindow * QDesignerWorkbench::loadForm(const QString &fileName,
const QString text = QString::fromUtf8(file.readLine());
file.close();
- const int lf = text.indexOf(QLatin1Char('\n'));
- if (lf > 0 && text.at(lf-1) == QLatin1Char('\r')) {
+ const auto lf = text.indexOf(u'\n');
+ if (lf > 0 && text.at(lf - 1) == u'\r') {
mode = qdesigner_internal::FormWindowBase::CRLFLineTerminator;
} else if (lf >= 0) {
mode = qdesigner_internal::FormWindowBase::LFLineTerminator;
diff --git a/src/designer/src/designer/saveformastemplate.cpp b/src/designer/src/designer/saveformastemplate.cpp
index a26b057e9..e8bc64477 100644
--- a/src/designer/src/designer/saveformastemplate.cpp
+++ b/src/designer/src/designer/saveformastemplate.cpp
@@ -44,10 +44,8 @@ SaveFormAsTemplate::~SaveFormAsTemplate() = default;
void SaveFormAsTemplate::accept()
{
- QString templateFileName = ui.categoryCombo->currentText();
- templateFileName += QLatin1Char('/');
const QString name = ui.templateNameEdit->text();
- templateFileName += name;
+ QString templateFileName = ui.categoryCombo->currentText() + u'/' + name;
const auto extension = ".ui"_L1;
if (!templateFileName.endsWith(extension))
templateFileName.append(extension);
View Lorry Controller Status