aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2014-05-12 14:09:02 +0200
committerMarco Bubke <marco.bubke@digia.com>2014-05-13 15:05:38 +0200
commit4743217eac61bb7af7f04787d2558493ac390823 (patch)
tree72094f059efd27e77172338e505486ac54d1d797
parentc7b1ae1ee4852734e28c447fc96d182dcd530821 (diff)
QmlDesigner: Exchange QLatin1String with QStringLiteral
Change-Id: Iaefe0ea33ee17795cb402da33e4e7f0da747d4d5 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r--src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp2
-rw-r--r--src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp6
-rw-r--r--src/plugins/qmldesigner/components/debugview/debugview.cpp8
-rw-r--r--src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp20
-rw-r--r--src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp6
-rw-r--r--src/plugins/qmldesigner/components/importmanager/importmanagercombobox.cpp2
-rw-r--r--src/plugins/qmldesigner/components/integration/designdocumentview.cpp8
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp12
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp2
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp24
-rw-r--r--src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp6
-rw-r--r--src/plugins/qmldesigner/components/navigator/navigatorview.cpp2
-rw-r--r--src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp5
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp2
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp2
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp2
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp44
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp4
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp10
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp6
-rw-r--r--src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp6
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp8
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp4
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp6
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp4
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp4
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp6
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp12
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/include/customnotifications.h6
-rw-r--r--src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h4
-rw-r--r--src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp4
-rw-r--r--src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp40
-rw-r--r--src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp16
-rw-r--r--src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp6
-rw-r--r--src/plugins/qmldesigner/designercore/model/abstractview.cpp10
-rw-r--r--src/plugins/qmldesigner/designercore/model/bindingproperty.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/model/import.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/model/modelnode.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp10
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmlanchors.cpp18
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp30
-rw-r--r--src/plugins/qmldesigner/designercore/model/rewriteaction.cpp20
-rw-r--r--src/plugins/qmldesigner/designercore/model/rewriterview.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp70
-rw-r--r--src/plugins/qmldesigner/designmodewidget.cpp8
51 files changed, 242 insertions, 243 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index 0af6af8c23..8b349dedfa 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -249,7 +249,7 @@ bool selectionCanBeLayouted(const SelectionContext &context)
bool hasQtQuickLayoutImport(const SelectionContext &context)
{
if (context.view() && context.view()->model()) {
- Import import = Import::createLibraryImport(QLatin1String("QtQuick.Layouts"), QLatin1String("1.0"));
+ Import import = Import::createLibraryImport(QStringLiteral("QtQuick.Layouts"), QStringLiteral("1.0"));
return context.view()->model()->hasImport(import, true, true);
}
diff --git a/src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp b/src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp
index 6f452361f8..e057b1c5f1 100644
--- a/src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp
@@ -144,11 +144,11 @@ static ModelNode findTabViewModelNode(const ModelNode &currentModelNode)
void TabViewDesignerAction::addNewTab()
{
- QString tabName = AddTabToTabViewDialog::create(QLatin1String("Tab"), Core::ICore::mainWindow());
+ QString tabName = AddTabToTabViewDialog::create(QStringLiteral("Tab"), Core::ICore::mainWindow());
if (!tabName.isEmpty()) {
QString directoryPath = QFileInfo(selectionContext().view()->model()->fileUrl().toLocalFile()).absolutePath();
- QString newFilePath = directoryPath +QLatin1String("/") + tabName + QLatin1String(".qml");
+ QString newFilePath = directoryPath +QStringLiteral("/") + tabName + QStringLiteral(".qml");
if (QFileInfo(newFilePath).exists()) {
QMessageBox::warning(Core::ICore::mainWindow(), tr("Naming Error"), tr("Component already exists."));
@@ -161,7 +161,7 @@ void TabViewDesignerAction::addNewTab()
ModelNode tabViewModelNode = findTabViewModelNode(selectionContext().currentSingleSelectedNode());
PropertyListType propertyList;
- propertyList.append(QPair<PropertyName, QVariant>("source", QString(tabName + QLatin1String(".qml"))));
+ propertyList.append(QPair<PropertyName, QVariant>("source", QString(tabName + QStringLiteral(".qml"))));
propertyList.append(QPair<PropertyName, QVariant>("title", tabName));
ModelNode newTabModelNode = selectionContext().view()->createModelNode("QtQuick.Controls.Tab",
diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp
index 9a32541df9..aeeebfdf68 100644
--- a/src/plugins/qmldesigner/components/debugview/debugview.cpp
+++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp
@@ -38,7 +38,7 @@
#include <variantproperty.h>
namespace {
-const QLatin1String lineBreak = QLatin1String("<br>");
+const QString lineBreak = QStringLiteral("<br>");
bool isDebugViewEnabled()
{
@@ -204,9 +204,9 @@ void DebugView::rootNodeTypeChanged(const QString &type, int majorVersion, int m
if (isDebugViewEnabled()) {
QString message;
message += type;
- message += QLatin1String(" ");
+ message += QStringLiteral(" ");
message += QString::number(majorVersion);
- message += QLatin1String(" ");
+ message += QStringLiteral(" ");
message += QString::number(minorVersion);
log(tr("Node id changed:"), message);
}
@@ -263,7 +263,7 @@ void DebugView::rewriterEndTransaction()
WidgetInfo DebugView::widgetInfo()
{
- return createWidgetInfo(m_debugViewWidget.data(), 0, QLatin1String("DebugView"), WidgetInfo::LeftPane, 0, tr("Debug View"));
+ return createWidgetInfo(m_debugViewWidget.data(), 0, QStringLiteral("DebugView"), WidgetInfo::LeftPane, 0, tr("Debug View"));
}
bool DebugView::hasWidget() const
diff --git a/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp b/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp
index 3e80fc2de6..cd880ced9e 100644
--- a/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp
+++ b/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp
@@ -46,24 +46,24 @@ DebugViewWidget::DebugViewWidget(QWidget *parent) : QWidget(parent)
void DebugViewWidget::addLogMessage(const QString &topic, const QString &message, bool highlight)
{
if (highlight) {
- m_ui.modelLog->appendHtml(QLatin1String("<b><font color=\"blue\">")
+ m_ui.modelLog->appendHtml(QStringLiteral("<b><font color=\"blue\">")
+ topic
- + QLatin1String("</b><br>")
+ + QStringLiteral("</b><br>")
+ message);
} else {
- m_ui.modelLog->appendHtml(QLatin1String("<b>")
+ m_ui.modelLog->appendHtml(QStringLiteral("<b>")
+ topic
- + QLatin1String("</b><br>")
+ + QStringLiteral("</b><br>")
+ message);
}
}
void DebugViewWidget::addErrorMessage(const QString &topic, const QString &message)
{
- m_ui.instanceErrorLog->appendHtml(QLatin1String("<b><font color=\"red\">")
+ m_ui.instanceErrorLog->appendHtml(QStringLiteral("<b><font color=\"red\">")
+ topic
- + QLatin1String("</font></b><br>")
+ + QStringLiteral("</font></b><br>")
+ message
);
}
@@ -71,15 +71,15 @@ void DebugViewWidget::addErrorMessage(const QString &topic, const QString &messa
void DebugViewWidget::addLogInstanceMessage(const QString &topic, const QString &message, bool highlight)
{
if (highlight) {
- m_ui.instanceLog->appendHtml(QLatin1String("<b><font color=\"blue\">")
+ m_ui.instanceLog->appendHtml(QStringLiteral("<b><font color=\"blue\">")
+ topic
- + QLatin1String("</b><br>")
+ + QStringLiteral("</b><br>")
+ message);
} else {
- m_ui.instanceLog->appendHtml(QLatin1String("<b>")
+ m_ui.instanceLog->appendHtml(QStringLiteral("<b>")
+ topic
- + QLatin1String("</b><br>")
+ + QStringLiteral("</b><br>")
+ message);
}
}
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index c9c1a63b9b..0044eed14c 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -49,7 +49,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
: QWidget(),
m_formEditorView(view)
{
- setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/formeditorstylesheet.css")));
+ setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/formeditorstylesheet.css")));
QVBoxLayout *fillLayout = new QVBoxLayout(this);
fillLayout->setMargin(0);
@@ -146,7 +146,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
m_graphicsView = new FormEditorGraphicsView(this);
fillLayout->addWidget(m_graphicsView.data());
- m_graphicsView.data()->setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css")));
+ m_graphicsView.data()->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css")));
}
void FormEditorWidget::changeTransformTool(bool checked)
@@ -179,7 +179,7 @@ void FormEditorWidget::changeRootItemHeight(const QString &heighText)
void FormEditorWidget::resetNodeInstanceView()
{
m_formEditorView->setCurrentStateNode(m_formEditorView->rootModelNode());
- m_formEditorView->emitCustomNotification(QLatin1String("reset QmlPuppet"));
+ m_formEditorView->emitCustomNotification(QStringLiteral("reset QmlPuppet"));
}
void FormEditorWidget::wheelEvent(QWheelEvent *event)
diff --git a/src/plugins/qmldesigner/components/importmanager/importmanagercombobox.cpp b/src/plugins/qmldesigner/components/importmanager/importmanagercombobox.cpp
index a8a60985f4..3d60d926dd 100644
--- a/src/plugins/qmldesigner/components/importmanager/importmanagercombobox.cpp
+++ b/src/plugins/qmldesigner/components/importmanager/importmanagercombobox.cpp
@@ -36,7 +36,7 @@
ImportManagerComboBox::ImportManagerComboBox(QWidget *parent) :
QComboBox(parent)
{
- setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/importmanager/importmanager.css")));
+ setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/importmanager/importmanager.css")));
setToolTip(tr("Add new import"));
}
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
index 1625d57cf2..e7aacaca35 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
@@ -178,12 +178,12 @@ QString DesignDocumentView::toText() const
QString imports;
foreach (const Import &import, model()->imports()) {
if (import.isFileImport())
- imports += QLatin1String("import ") + QLatin1String("\"") + import.file() + QLatin1String("\"")+ QLatin1String(";\n");
+ imports += QStringLiteral("import ") + QStringLiteral("\"") + import.file() + QStringLiteral("\"")+ QStringLiteral(";\n");
else
- imports += QLatin1String("import ") + import.url() + QLatin1String(" ") + import.version() + QLatin1String(";\n");
+ imports += QStringLiteral("import ") + import.url() + QStringLiteral(" ") + import.version() + QStringLiteral(";\n");
}
- textEdit.setPlainText(imports + QLatin1String("Item {\n}\n"));
+ textEdit.setPlainText(imports + QStringLiteral("Item {\n}\n"));
NotIndentingTextEditModifier modifier(&textEdit);
QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, 0));
@@ -208,7 +208,7 @@ void DesignDocumentView::fromText(QString text)
QPlainTextEdit textEdit;
QString imports;
foreach (const Import &import, model()->imports())
- imports += QLatin1String("import ") + import.toString(true) + QLatin1Char(';') + QLatin1Char('\n');
+ imports += QStringLiteral("import ") + import.toString(true) + QLatin1Char(';') + QLatin1Char('\n');
textEdit.setPlainText(imports + text);
NotIndentingTextEditModifier modifier(&textEdit);
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index 747a9dddfa..ab4de50b96 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -276,7 +276,7 @@ QString ItemLibraryItemModel::itemName() const
QString ItemLibraryItemModel::itemLibraryIconPath() const
{
//Prepend image provider prefix
- return QLatin1String("image://qmldesigner_itemlibrary/")+ m_iconPath;
+ return QStringLiteral("image://qmldesigner_itemlibrary/")+ m_iconPath;
}
QVariant ItemLibraryItemModel::sortingRole() const
@@ -325,8 +325,8 @@ bool ItemLibrarySectionModel::sectionExpanded() const
QVariant ItemLibrarySectionModel::sortingRole() const
{
- if (sectionName() == QLatin1String("QML Components")) //Qml Components always come first
- return QVariant(QLatin1String("AA.this_comes_first"));
+ if (sectionName() == QStringLiteral("QML Components")) //Qml Components always come first
+ return QVariant(QStringLiteral("AA.this_comes_first"));
return sectionName();
}
@@ -532,7 +532,7 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model)
// delayed creation of (default) icons
if (entry.iconPath().isEmpty())
- entry.setIconPath(QLatin1String(":/ItemLibrary/images/item-default-icon.png"));
+ entry.setIconPath(QStringLiteral(":/ItemLibrary/images/item-default-icon.png"));
if (entry.dragIcon().isNull())
entry.setDragIcon(createDragPixmap(getWidth(entry), getHeight(entry)));
@@ -560,7 +560,7 @@ QMimeData *ItemLibraryModel::getMimeData(int libId)
QByteArray data;
QDataStream stream(&data, QIODevice::WriteOnly);
stream << m_itemInfos.value(libId);
- mimeData->setData(QLatin1String("application/vnd.bauhaus.itemlibraryinfo"), data);
+ mimeData->setData(QStringLiteral("application/vnd.bauhaus.itemlibraryinfo"), data);
const QIcon icon = m_itemInfos.value(libId).dragIcon();
if (!icon.isNull()) {
@@ -569,7 +569,7 @@ QMimeData *ItemLibraryModel::getMimeData(int libId)
mimeData->setImageData(icon.pixmap(sizes.front()).toImage());
}
- mimeData->removeFormat(QLatin1String("text/plain"));
+ mimeData->removeFormat(QStringLiteral("text/plain"));
return mimeData;
}
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
index 7e2645aad8..76a246a39b 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
@@ -61,7 +61,7 @@ WidgetInfo ItemLibraryView::widgetInfo()
return createWidgetInfo(m_widget.data(),
new WidgetInfo::ToolBarWidgetDefaultFactory<ItemLibraryWidget>(m_widget.data()),
- QLatin1String("Library"),
+ QStringLiteral("Library"),
WidgetInfo::LeftPane,
0);
}
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 3b685cd598..bf37b061b5 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -79,14 +79,14 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
m_itemLibraryModel->setItemIconSize(m_itemIconSize);
QQmlContext *rootContext = m_itemsView->rootContext();
- rootContext->setContextProperty(QLatin1String("itemLibraryModel"), m_itemLibraryModel.data());
- rootContext->setContextProperty(QLatin1String("itemLibraryIconWidth"), m_itemIconSize.width());
- rootContext->setContextProperty(QLatin1String("itemLibraryIconHeight"), m_itemIconSize.height());
+ rootContext->setContextProperty(QStringLiteral("itemLibraryModel"), m_itemLibraryModel.data());
+ rootContext->setContextProperty(QStringLiteral("itemLibraryIconWidth"), m_itemIconSize.width());
+ rootContext->setContextProperty(QStringLiteral("itemLibraryIconHeight"), m_itemIconSize.height());
QColor highlightColor = palette().highlight().color();
if (0.5*highlightColor.saturationF()+0.75-highlightColor.valueF() < 0)
highlightColor.setHsvF(highlightColor.hsvHueF(),0.1 + highlightColor.saturationF()*2.0, highlightColor.valueF());
- m_itemsView->rootContext()->setContextProperty(QLatin1String("highlightColor"), highlightColor);
+ m_itemsView->rootContext()->setContextProperty(QStringLiteral("highlightColor"), highlightColor);
// loading the qml has to come after all needed context properties are set
m_itemsView->setSource(QUrl("qrc:/ItemLibrary/qml/ItemsView.qml"));
@@ -104,7 +104,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
m_resourcesView->setIconSize(m_resIconSize);
/* create image provider for loading item icons */
- m_itemsView->engine()->addImageProvider(QLatin1String("qmldesigner_itemlibrary"), new Internal::ItemLibraryImageProvider);
+ m_itemsView->engine()->addImageProvider(QStringLiteral("qmldesigner_itemlibrary"), new Internal::ItemLibraryImageProvider);
/* other widgets */
QTabBar *tabBar = new QTabBar(this);
@@ -116,14 +116,14 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(updateSearch()));
m_filterLineEdit = new Utils::FancyLineEdit(this);
- m_filterLineEdit->setObjectName(QLatin1String("itemLibrarySearchInput"));
+ m_filterLineEdit->setObjectName(QStringLiteral("itemLibrarySearchInput"));
m_filterLineEdit->setPlaceholderText(tr("<Filter>", "Library search input hint text"));
m_filterLineEdit->setDragEnabled(false);
m_filterLineEdit->setMinimumWidth(75);
m_filterLineEdit->setTextMargins(0, 0, 20, 0);
m_filterLineEdit->setFiltering(true);
QWidget *lineEditFrame = new QWidget(this);
- lineEditFrame->setObjectName(QLatin1String("itemLibrarySearchInputFrame"));
+ lineEditFrame->setObjectName(QStringLiteral("itemLibrarySearchInputFrame"));
QGridLayout *lineEditLayout = new QGridLayout(lineEditFrame);
lineEditLayout->setMargin(2);
lineEditLayout->setSpacing(0);
@@ -139,7 +139,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
m_stackedWidget->addWidget(m_resourcesView.data());
QWidget *spacer = new QWidget(this);
- spacer->setObjectName(QLatin1String("itemLibrarySearchInputSpacer"));
+ spacer->setObjectName(QStringLiteral("itemLibrarySearchInputSpacer"));
spacer->setFixedHeight(4);
QGridLayout *layout = new QGridLayout(this);
@@ -154,8 +154,8 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
setSearchFilter(QString());
/* style sheets */
- setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css")));
- m_resourcesView->setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css")));
+ setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css")));
+ m_resourcesView->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css")));
}
void ItemLibraryWidget::setItemLibraryInfo(ItemLibraryInfo *itemLibraryInfo)
@@ -316,9 +316,9 @@ void ItemLibraryWidget::setImportFilter(FilterChangeFlag flag)
try {
block = true;
if (flag == QtBasic)
- removeImport(QLatin1String("com.nokia.meego"));
+ removeImport(QStringLiteral("com.nokia.meego"));
else if (flag == Meego)
- addImport(QLatin1String("com.nokia.meego"), QLatin1String("1.0"));
+ addImport(QStringLiteral("com.nokia.meego"), QStringLiteral("1.0"));
QApplication::restoreOverrideCursor();
block = false;
m_filterFlag = flag;
diff --git a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
index 958d781c42..aae2a9e3d2 100644
--- a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
+++ b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
@@ -121,12 +121,12 @@ static QIcon getIcon(const ModelNode &modelNode)
if (!itemLibraryEntryList.isEmpty())
return itemLibraryEntryList.first().icon();
else if (modelNode.metaInfo().isValid())
- return QIcon(QLatin1String(":/ItemLibrary/images/item-default-icon.png"));
+ return QIcon(QStringLiteral(":/ItemLibrary/images/item-default-icon.png"));
else
- return QIcon(QLatin1String(":/ItemLibrary/images/item-invalid-icon.png"));
+ return QIcon(QStringLiteral(":/ItemLibrary/images/item-invalid-icon.png"));
}
- return QIcon(QLatin1String(":/ItemLibrary/images/item-invalid-icon.png"));
+ return QIcon(QStringLiteral(":/ItemLibrary/images/item-invalid-icon.png"));
}
static int drawIcon(QPainter *painter,
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
index 37c49a510b..6f39ae2e9f 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
@@ -113,7 +113,7 @@ WidgetInfo NavigatorView::widgetInfo()
{
return createWidgetInfo(m_widget.data(),
new WidgetInfo::ToolBarWidgetDefaultFactory<NavigatorWidget>(m_widget.data()),
- QLatin1String("Navigator"),
+ QStringLiteral("Navigator"),
WidgetInfo::LeftPane,
0);
}
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 2740ca85a0..b380d7a016 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -62,9 +62,8 @@ NavigatorWidget::NavigatorWidget(NavigatorView *view) :
setWindowTitle(tr("Navigator", "Title of navigator view"));
- setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css")));
- m_treeView->setStyleSheet(
- QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css")));
+ setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css")));
+ m_treeView->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css")));
}
void NavigatorWidget::setTreeModel(QAbstractItemModel* model)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp b/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp
index 400211c052..9ffdd6f672 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp
@@ -44,7 +44,7 @@ QVariant DesignerPropertyMap::value(const QString &key) const
void DesignerPropertyMap::registerDeclarativeType(const QString &name)
{
- qmlRegisterType<DesignerPropertyMap>("Bauhaus",1,0,name.toLatin1());
+ qmlRegisterType<DesignerPropertyMap>("Bauhaus",1,0,name.toUtf8());
}
} //QmlDesigner
diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
index bef187feb2..f94c091fda 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
@@ -124,7 +124,7 @@ void FileResourcesModel::openFileDialog()
//If that one is not valid we try the path for the current file
if (path.isEmpty() && !m_fileName.isEmpty())
- path = QFileInfo(modelPath + QLatin1String("/") + m_fileName.toString()).absoluteDir().absolutePath();
+ path = QFileInfo(modelPath + QStringLiteral("/") + m_fileName.toString()).absoluteDir().absolutePath();
//Next we try to fall back to the path any file browser was opened with
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
index 75cf14f7ef..e068334a9c 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
@@ -107,7 +107,7 @@ QQmlComponent *PropertyEditorContextObject::specificQmlComponent()
m_qmlComponent = new QQmlComponent(m_qmlContext->engine(), this);
- m_qmlComponent->setData(m_specificQmlData.toLatin1(), QUrl::fromLocalFile("specfics.qml"));
+ m_qmlComponent->setData(m_specificQmlData.toUtf8(), QUrl::fromLocalFile(QStringLiteral("specfics.qml")));
return m_qmlComponent;
}
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
index eba1702276..b0334d5326 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
@@ -55,14 +55,14 @@ static QmlJS::SimpleReaderNode::Ptr s_templateConfiguration = QmlJS::SimpleReade
static inline QString propertyTemplatesPath()
{
- return QmlDesigner::PropertyEditorQmlBackend::propertyEditorResourcesPath() + QLatin1String("/PropertyTemplates/");
+ return QmlDesigner::PropertyEditorQmlBackend::propertyEditorResourcesPath() + QStringLiteral("/PropertyTemplates/");
}
QmlJS::SimpleReaderNode::Ptr templateConfiguration()
{
if (!s_templateConfiguration) {
QmlJS::SimpleReader reader;
- const QString fileName = propertyTemplatesPath() + QLatin1String("TemplateTypes.qml");
+ const QString fileName = propertyTemplatesPath() + QStringLiteral("TemplateTypes.qml");
s_templateConfiguration = reader.readFile(fileName);
if (!s_templateConfiguration)
@@ -308,11 +308,11 @@ void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl
contextObject()->setSpecificsUrl(qmlSpecificsFile);
- contextObject()->setStateName(QLatin1String("basestate"));
+ contextObject()->setStateName(QStringLiteral("basestate"));
contextObject()->setIsBaseState(true);
- contextObject()->setSpecificQmlData(QLatin1String(""));
+ contextObject()->setSpecificQmlData(QStringLiteral(""));
contextObject()->setGlobalBaseUrl(QUrl());
}
@@ -328,12 +328,12 @@ QString PropertyEditorQmlBackend::templateGeneration(NodeMetaInfo type,
if (!templateConfiguration() || !templateConfiguration()->isValid())
return QString();
- QStringList imports = variantToStringList(templateConfiguration()->property(QLatin1String("imports")));
+ QStringList imports = variantToStringList(templateConfiguration()->property(QStringLiteral("imports")));
- QString qmlTemplate = imports.join(QLatin1String("\n")) + QLatin1Char('\n');
- qmlTemplate += QLatin1String("Section {\n");
+ QString qmlTemplate = imports.join(QStringLiteral("\n")) + QLatin1Char('\n');
+ qmlTemplate += QStringLiteral("Section {\n");
qmlTemplate += QStringLiteral("caption: \"%1\"\n").arg(QString::fromUtf8(objectNode.modelNode().simplifiedTypeName()));
- qmlTemplate += QLatin1String("SectionLayout {\n");
+ qmlTemplate += QStringLiteral("SectionLayout {\n");
QList<PropertyName> orderedList = type.propertyNames();
qSort(orderedList);
@@ -350,13 +350,13 @@ QString PropertyEditorQmlBackend::templateGeneration(NodeMetaInfo type,
QString typeName = type.propertyTypeName(name);
//alias resolution only possible with instance
- if (typeName == QLatin1String("alias") && objectNode.isValid())
+ if (typeName == QStringLiteral("alias") && objectNode.isValid())
typeName = objectNode.instanceType(name);
if (!superType.hasProperty(name) && type.propertyIsWritable(name) && !name.contains(".")) {
foreach (const QmlJS::SimpleReaderNode::Ptr &node, templateConfiguration()->children())
- if (variantToStringList(node->property(QLatin1String("typeNames"))).contains(typeName)) {
- const QString fileName = propertyTemplatesPath() + node->property(QLatin1String("sourceFile")).toString();
+ if (variantToStringList(node->property(QStringLiteral("typeNames"))).contains(typeName)) {
+ const QString fileName = propertyTemplatesPath() + node->property(QStringLiteral("sourceFile")).toString();
QFile file(fileName);
if (file.open(QIODevice::ReadOnly)) {
QString source = file.readAll();
@@ -369,8 +369,8 @@ QString PropertyEditorQmlBackend::templateGeneration(NodeMetaInfo type,
}
}
}
- qmlTemplate += QLatin1String("}\n"); //Section
- qmlTemplate += QLatin1String("}\n"); //SectionLayout
+ qmlTemplate += QStringLiteral("}\n"); //Section
+ qmlTemplate += QStringLiteral("}\n"); //SectionLayout
if (emptyTemplate)
return QString();
@@ -380,7 +380,7 @@ QString PropertyEditorQmlBackend::templateGeneration(NodeMetaInfo type,
QUrl PropertyEditorQmlBackend::getQmlFileUrl(const QString &relativeTypeName, const NodeMetaInfo &info)
{
- return fileToUrl(locateQmlFile(info, fixTypeNameForPanes(relativeTypeName) + QLatin1String(".qml")));
+ return fileToUrl(locateQmlFile(info, fixTypeNameForPanes(relativeTypeName) + QStringLiteral(".qml")));
}
QString PropertyEditorQmlBackend::fixTypeNameForPanes(const QString &typeName)
@@ -395,7 +395,7 @@ QString PropertyEditorQmlBackend::qmlFileName(const NodeMetaInfo &nodeInfo)
if (nodeInfo.typeName().split('.').last() == "QDeclarativeItem")
return "QtQuick/ItemPane.qml";
const QString fixedTypeName = fixTypeNameForPanes(nodeInfo.typeName());
- return fixedTypeName + QLatin1String("Pane.qml");
+ return fixedTypeName + QStringLiteral("Pane.qml");
}
QUrl PropertyEditorQmlBackend::fileToUrl(const QString &filePath) {
@@ -418,9 +418,9 @@ QUrl PropertyEditorQmlBackend::fileToUrl(const QString &filePath) {
QString PropertyEditorQmlBackend::fileFromUrl(const QUrl &url)
{
- if (url.scheme() == QLatin1String("qrc")) {
+ if (url.scheme() == QStringLiteral("qrc")) {
const QString &path = url.path();
- return QLatin1String(":") + path;
+ return QStringLiteral(":") + path;
}
return url.toLocalFile();
@@ -456,16 +456,16 @@ QString PropertyEditorQmlBackend::locateQmlFile(const NodeMetaInfo &info, const
static QDir resourcesDir(QStringLiteral(":/propertyEditorQmlSources"));
QDir importDir(info.importDirectoryPath() + QLatin1String(Constants::QML_DESIGNER_SUBFOLDER));
- const QString versionString = QLatin1String("_") + QString::number(info.majorVersion())
- + QLatin1String("_")
+ const QString versionString = QStringLiteral("_") + QString::number(info.majorVersion())
+ + QStringLiteral("_")
+ QString::number(info.minorVersion());
QString relativePathWithoutEnding = relativePath;
relativePathWithoutEnding.chop(4);
- const QString relativePathWithVersion = relativePathWithoutEnding + versionString + QLatin1String(".qml");
+ const QString relativePathWithVersion = relativePathWithoutEnding + versionString + QStringLiteral(".qml");
//Check for qml files with versions first
- const QString withoutDirWithVersion = relativePathWithVersion.split(QLatin1String("/")).last();
+ const QString withoutDirWithVersion = relativePathWithVersion.split(QStringLiteral("/")).last();
if (importDir.exists(relativePathWithVersion))
return importDir.absoluteFilePath(relativePathWithVersion);
if (importDir.exists(withoutDirWithVersion)) //Since we are in a subfolder of the import we do not require the directory
@@ -475,7 +475,7 @@ QString PropertyEditorQmlBackend::locateQmlFile(const NodeMetaInfo &info, const
if (resourcesDir.exists(relativePathWithVersion))
return resourcesDir.absoluteFilePath(relativePathWithVersion);
- const QString withoutDir = relativePath.split(QLatin1String("/")).last();
+ const QString withoutDir = relativePath.split(QStringLiteral("/")).last();
if (importDir.exists(relativePath))
return importDir.absoluteFilePath(relativePath);
if (importDir.exists(withoutDir)) //Since we are in a subfolder of the import we do not require the directory
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 2177cf6522..20e32edded 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -101,7 +101,7 @@ static void fixAmbigousColorNames(const QmlDesigner::ModelNode &modelNode, const
color = QColor(color.name());
color.setAlpha(alpha);
*value = color;
- } else if (value->toString() != QLatin1String("transparent")) {
+ } else if (value->toString() != QStringLiteral("transparent")) {
*value = QColor(value->toString()).name();
}
}
@@ -113,7 +113,7 @@ static void fixUrl(const QmlDesigner::ModelNode &modelNode, const QmlDesigner::P
&& (modelNode.metaInfo().propertyTypeName(name) == "QUrl"
|| modelNode.metaInfo().propertyTypeName(name) == "url")) {
if (!value->isValid())
- *value = QString(QLatin1String(""));
+ *value = QStringLiteral("");
}
}
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
index d31d55c05c..1b35e0a07d 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
@@ -83,7 +83,7 @@ PropertyEditorView::PropertyEditorView(QWidget *parent) :
connect(m_updateShortcut, SIGNAL(activated()), this, SLOT(reloadQml()));
m_stackedWidget->setStyleSheet(
- QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css")));
+ QString::fromUtf8(Utils::FileReader::fetchQrc(QStringLiteral(":/qmldesigner/stylesheet.css"))));
m_stackedWidget->setMinimumWidth(320);
m_stackedWidget->move(0, 0);
connect(m_stackedWidget, SIGNAL(resized()), this, SLOT(updateSize()));
@@ -103,7 +103,7 @@ void PropertyEditorView::setupPane(const TypeName &typeName)
{
NodeMetaInfo metaInfo = model()->metaInfo(typeName);
- QUrl qmlFile = PropertyEditorQmlBackend::getQmlFileUrl(QLatin1String("Qt/ItemPane"), metaInfo);
+ QUrl qmlFile = PropertyEditorQmlBackend::getQmlFileUrl(QStringLiteral("Qt/ItemPane"), metaInfo);
QUrl qmlSpecificsFile;
qmlSpecificsFile = PropertyEditorQmlBackend::getQmlFileUrl(typeName + "Specifics", metaInfo);
@@ -373,7 +373,7 @@ void PropertyEditorView::setupQmlBackend()
foreach (const NodeMetaInfo &metaInfo, hierarchy) {
if (PropertyEditorQmlBackend::checkIfUrlExists(qmlSpecificsFile))
break;
- qmlSpecificsFile = PropertyEditorQmlBackend::getQmlFileUrl(metaInfo.typeName() + QLatin1String("Specifics"), metaInfo);
+ qmlSpecificsFile = PropertyEditorQmlBackend::getQmlFileUrl(metaInfo.typeName() + QStringLiteral("Specifics"), metaInfo);
diffClassName = metaInfo.typeName();
}
}
@@ -388,7 +388,7 @@ void PropertyEditorView::setupQmlBackend()
PropertyEditorQmlBackend *currentQmlBackend = m_qmlBackendHash.value(qmlFile.toString());
- QString currentStateName = currentState().isBaseState() ? currentState().name() : QLatin1String("invalid state");
+ QString currentStateName = currentState().isBaseState() ? currentState().name() : QStringLiteral("invalid state");
if (!currentQmlBackend) {
currentQmlBackend = new PropertyEditorQmlBackend(this);
@@ -593,7 +593,7 @@ bool PropertyEditorView::hasWidget() const
WidgetInfo PropertyEditorView::widgetInfo()
{
- return createWidgetInfo(m_stackedWidget, 0, QLatin1String("Properties"), WidgetInfo::RightPane, 0);
+ return createWidgetInfo(m_stackedWidget, 0, QStringLiteral("Properties"), WidgetInfo::RightPane, 0);
}
void PropertyEditorView::currentStateChanged(const ModelNode &node)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
index a1e2cf7447..622b5c31bc 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
@@ -547,7 +547,7 @@ QStringList QmlAnchorBindingProxy::possibleTargetItems() const
QmlItemNode parent(m_qmlItemNode.instanceParent().toQmlItemNode());
if (parent.isValid())
- stringList.append(QLatin1String("parent"));
+ stringList.append(QStringLiteral("parent"));
return stringList;
}
@@ -818,7 +818,7 @@ QmlItemNode QmlAnchorBindingProxy::targetIdToNode(const QString &id) const
itemNode = m_qmlItemNode.view()->modelNodeForId(id);
- if (id == QLatin1String("parent"))
+ if (id == QStringLiteral("parent"))
itemNode = m_qmlItemNode.instanceParent().modelNode();
}
@@ -828,7 +828,7 @@ QmlItemNode QmlAnchorBindingProxy::targetIdToNode(const QString &id) const
QString QmlAnchorBindingProxy::idForNode(const QmlItemNode &qmlItemNode) const
{
if (m_qmlItemNode.instanceParent().modelNode() == qmlItemNode)
- return QLatin1String("parent");
+ return QStringLiteral("parent");
return qmlItemNode.id();
}
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
index ebde4184af..d7c86c2ead 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
@@ -88,7 +88,7 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State
m_imageProvider = new Internal::StatesEditorImageProvider;
m_imageProvider->setNodeInstanceView(statesEditorView->nodeInstanceView());
- m_quickView->engine()->addImageProvider(QLatin1String("qmldesigner_stateseditor"), m_imageProvider);
+ m_quickView->engine()->addImageProvider(QStringLiteral("qmldesigner_stateseditor"), m_imageProvider);
m_quickView->engine()->addImportPath(statesEditorResourcesPath());
//m_quickView->setAcceptDrops(false);
@@ -105,11 +105,11 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State
m_quickView->setResizeMode(QQuickView::SizeRootObjectToView);
- m_quickView->rootContext()->setContextProperty(QLatin1String("statesEditorModel"), statesEditorModel);
+ m_quickView->rootContext()->setContextProperty(QStringLiteral("statesEditorModel"), statesEditorModel);
QColor highlightColor = palette().highlight().color();
if (0.5*highlightColor.saturationF()+0.75-highlightColor.valueF() < 0)
highlightColor.setHsvF(highlightColor.hsvHueF(),0.1 + highlightColor.saturationF()*2.0, highlightColor.valueF());
- m_quickView->rootContext()->setContextProperty(QLatin1String("highlightColor"), highlightColor);
+ m_quickView->rootContext()->setContextProperty(QStringLiteral("highlightColor"), highlightColor);
m_quickView->rootContext()->setContextProperty("canAddNewStates", true);
diff --git a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp
index d8f5510abe..5cf0609c37 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp
@@ -97,7 +97,7 @@ void AddArrayMemberVisitor::insertInto(QmlJS::AST::UiArrayBinding *arrayBinding)
const int insertionPoint = lastMember->lastSourceLocation().end();
const int indentDepth = calculateIndentDepth(lastMember->firstSourceLocation());
- replace(insertionPoint, 0, QLatin1String(",\n") + addIndentation(m_content, indentDepth));
+ replace(insertionPoint, 0, QStringLiteral(",\n") + addIndentation(m_content, indentDepth));
setDidRewriting(true);
}
@@ -105,13 +105,13 @@ void AddArrayMemberVisitor::insertInto(QmlJS::AST::UiArrayBinding *arrayBinding)
void AddArrayMemberVisitor::convertAndAdd(QmlJS::AST::UiObjectBinding *objectBinding)
{
const int indentDepth = calculateIndentDepth(objectBinding->firstSourceLocation());
- const QString arrayPrefix = QLatin1String("[\n") + addIndentation(QString(), indentDepth);
+ const QString arrayPrefix = QStringLiteral("[\n") + addIndentation(QString(), indentDepth);
replace(objectBinding->qualifiedTypeNameId->identifierToken.offset, 0, arrayPrefix);
const int insertionPoint = objectBinding->lastSourceLocation().end();
replace(insertionPoint, 0,
- QLatin1String(",\n")
+ QStringLiteral(",\n")
+ addIndentation(m_content, indentDepth) + QLatin1Char('\n')
- + addIndentation(QLatin1String("]"), indentDepth)
+ + addIndentation(QStringLiteral("]"), indentDepth)
);
setDidRewriting(true);
diff --git a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp
index bfc04b115e..6d6ce9ccec 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp
@@ -80,14 +80,14 @@ void AddObjectVisitor::insertInto(QmlJS::AST::UiObjectInitializer *ast)
if (insertAfter && insertAfter->member) {
insertionPoint = insertAfter->member->lastSourceLocation().end();
depth = calculateIndentDepth(insertAfter->member->lastSourceLocation());
- textToInsert += QLatin1String("\n");
+ textToInsert += QStringLiteral("\n");
} else {
insertionPoint = ast->lbraceToken.end();
depth = calculateIndentDepth(ast->lbraceToken) + indentDepth();
}
textToInsert += addIndentation(m_content, depth);
- replace(insertionPoint, 0, QLatin1String("\n") + textToInsert);
+ replace(insertionPoint, 0, QStringLiteral("\n") + textToInsert);
setDidRewriting(true);
}
diff --git a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp
index adc6c2d0a5..8b704a13e6 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp
@@ -132,16 +132,16 @@ void AddPropertyVisitor::addInMembers(QmlJS::AST::UiObjectInitializer *initializ
QString newPropertyTemplate;
switch (m_propertyType) {
case QmlRefactoring::ArrayBinding:
- newPropertyTemplate = QLatin1String("%1: [\n%2\n]");
+ newPropertyTemplate = QStringLiteral("%1: [\n%2\n]");
m_value = addIndentation(m_value, 4);
break;
case QmlRefactoring::ObjectBinding:
- newPropertyTemplate = QLatin1String("%1: %2");
+ newPropertyTemplate = QStringLiteral("%1: %2");
break;
case QmlRefactoring::ScriptBinding:
- newPropertyTemplate = QLatin1String("%1: %2");
+ newPropertyTemplate = QStringLiteral("%1: %2");
break;
default:
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
index b5da23fa0e..213980420a 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
@@ -61,9 +61,9 @@ bool ChangeImportsVisitor::add(QmlJS::AST::UiProgram *ast, const Import &import)
if (!c.isSpace() && c != QLatin1Char(';'))
break;
}
- replace(insertionPoint+1, 0, QLatin1String("\n") + import.toImportString());
+ replace(insertionPoint+1, 0, QStringLiteral("\n") + import.toImportString());
} else {
- replace(0, 0, import.toImportString() + QLatin1String("\n\n"));
+ replace(0, 0, import.toImportString() + QStringLiteral("\n\n"));
}
setDidRewriting(true);
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
index e179ba3739..685dbadf0d 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
@@ -152,7 +152,7 @@ void ChangePropertyVisitor::replaceMemberValue(UiObjectMember *propertyMember, b
endOffset = startOffset;
if (publicMember->semicolonToken.isValid())
startOffset = publicMember->semicolonToken.offset;
- replacement.prepend(QLatin1String(": "));
+ replacement.prepend(QStringLiteral(": "));
}
} else {
return;
@@ -207,6 +207,6 @@ void ChangePropertyVisitor::insertIntoArray(QmlJS::AST::UiArrayBinding *ast)
const int insertionPoint = lastMember->lastSourceLocation().end();
const int depth = calculateIndentDepth(lastMember->firstSourceLocation());
const QString indentedArrayMember = addIndentation(m_value, depth);
- replace(insertionPoint, 0, QLatin1String(",\n") + indentedArrayMember);
+ replace(insertionPoint, 0, QStringLiteral(",\n") + indentedArrayMember);
setDidRewriting(true);
}
diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
index 2d61c380a9..1c66d7caf1 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
@@ -128,7 +128,7 @@ void MoveObjectBeforeObjectVisitor::doMove()
otherArrayMember = cur;
}
Q_ASSERT(arrayMember && otherArrayMember);
- separator = QLatin1String(",");
+ separator = QStringLiteral(",");
}
moveInfo.objectStart = movingObject->firstSourceLocation().offset;
@@ -153,7 +153,7 @@ void MoveObjectBeforeObjectVisitor::doMove()
includeSurroundingWhitespace(moveInfo.destination, dummy);
moveInfo.prefixToInsert = QString(moveInfo.leadingCharsToRemove, QLatin1Char(' '));
- moveInfo.suffixToInsert = separator + QLatin1String("\n\n");
+ moveInfo.suffixToInsert = separator + QStringLiteral("\n\n");
} else {
const SourceLocation insertionPoint = lastParentLocation();
Q_ASSERT(insertionPoint.isValid());
@@ -162,7 +162,7 @@ void MoveObjectBeforeObjectVisitor::doMove()
includeSurroundingWhitespace(moveInfo.destination, dummy);
moveInfo.prefixToInsert = separator + QString(moveInfo.leadingCharsToRemove, QLatin1Char(' '));
- moveInfo.suffixToInsert = QLatin1String("\n");
+ moveInfo.suffixToInsert = QStringLiteral("\n");
}
move(moveInfo);
diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
index e4b912c1f0..12c4a3c8ca 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
@@ -87,10 +87,10 @@ private:
if (insertAfter && insertAfter->member) {
moveInfo.destination = insertAfter->member->lastSourceLocation().end();
- moveInfo.prefixToInsert = QLatin1String("\n\n");
+ moveInfo.prefixToInsert = QStringLiteral("\n\n");
} else {
moveInfo.destination = ast->lbraceToken.end();
- moveInfo.prefixToInsert = QLatin1String("\n");
+ moveInfo.prefixToInsert = QStringLiteral("\n");
}
move(moveInfo);
@@ -115,8 +115,8 @@ private:
{ // insert (create) a UiObjectBinding:
UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, targetPropertyName, propertyOrder);
- moveInfo.prefixToInsert = QLatin1String("\n") + targetPropertyName + (targetIsArrayBinding ? QLatin1String(": [") : QLatin1String(": "));
- moveInfo.suffixToInsert = targetIsArrayBinding ? QLatin1String("\n]") : QLatin1String("");
+ moveInfo.prefixToInsert = QStringLiteral("\n") + targetPropertyName + (targetIsArrayBinding ? QStringLiteral(": [") : QStringLiteral(": "));
+ moveInfo.suffixToInsert = targetIsArrayBinding ? QStringLiteral("\n]") : QStringLiteral("");
if (insertAfter && insertAfter->member)
moveInfo.destination = insertAfter->member->lastSourceLocation().end();
@@ -142,8 +142,8 @@ private:
Q_ASSERT(!"Invalid QML: empty array found.");
moveInfo.destination = lastMember->lastSourceLocation().end();
- moveInfo.prefixToInsert = QLatin1String(",\n");
- moveInfo.suffixToInsert = QLatin1String("\n");
+ moveInfo.prefixToInsert = QStringLiteral(",\n");
+ moveInfo.suffixToInsert = QStringLiteral("\n");
move(moveInfo);
}
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
index 890aa8c827..29c7ffa91d 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
@@ -313,7 +313,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m
else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (cast<UiPublicMember*>(member))
- orderedMembers[QLatin1String("property")] = iter;
+ orderedMembers[QStringLiteral("property")] = iter;
}
int idx = propertyOrder.indexOf(propertyName);
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp
index 5bc75258ba..dfa750e58d 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp
@@ -28,7 +28,7 @@ QmlWarningDialog::QmlWarningDialog(QWidget *parent, const QStringList &warnings)
QString warningText;
foreach (const QString &string, warnings)
- warningText += QLatin1String(" ") + string + QLatin1String("\n");
+ warningText += QStringLiteral(" ") + string + QStringLiteral("\n");
ui->warnings->setText(warningText);
}
diff --git a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp
index f087f2270c..bc570be0ad 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp
@@ -130,7 +130,7 @@ void RemovePropertyVisitor::removeMember(UiObjectMember *member)
includeSurroundingWhitespace(start, end);
- replace(start, end - start, QLatin1String(""));
+ replace(start, end - start, QStringLiteral(""));
setDidRewriting(true);
}
diff --git a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp
index be41102a46..1749a064b8 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp
@@ -80,7 +80,7 @@ bool RemoveUIObjectMemberVisitor::visitObjectMember(QmlJS::AST::UiObjectMember *
includeSurroundingWhitespace(start, end);
includeLeadingEmptyLine(start);
- replace(start, end - start, QLatin1String(""));
+ replace(start, end - start, QStringLiteral(""));
setDidRewriting(true);
diff --git a/src/plugins/qmldesigner/designercore/include/customnotifications.h b/src/plugins/qmldesigner/designercore/include/customnotifications.h
index cc172a1c13..7753919d30 100644
--- a/src/plugins/qmldesigner/designercore/include/customnotifications.h
+++ b/src/plugins/qmldesigner/designercore/include/customnotifications.h
@@ -30,12 +30,12 @@
#ifndef CUSTOMNOTIFICATIONS_H
#define CUSTOMNOTIFICATIONS_H
-#include <QLatin1String>
+#include <QString>
namespace QmlDesigner {
-const QLatin1String StartRewriterAmend("__start rewriter amend__");
-const QLatin1String EndRewriterAmend("__end rewriter amend__");
+const QString StartRewriterAmend = QStringLiteral("__start rewriter amend__");
+const QString EndRewriterAmend = QStringLiteral("__end rewriter amend__");
}
diff --git a/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h b/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h
index e47fc19438..e5bfbb8201 100644
--- a/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h
+++ b/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h
@@ -30,8 +30,8 @@
#ifndef WIDGETPLUGIN_HELPER_H
#define WIDGETPLUGIN_HELPER_H
-#define QMLDESIGNER_REGISTER_WIDGET(TYPE) uiEngine->addObjectCreator(new QUiWidgetCreator<TYPE>(QLatin1String(#TYPE)));
-#define QMLDESIGNER_REGISTER_GRAPHICSWIDGET(TYPE) uiEngine->addObjectCreator(new QUiGraphicsWidgetCreator<TYPE>(QLatin1String(#TYPE)));
+#define QMLDESIGNER_REGISTER_WIDGET(TYPE) uiEngine->addObjectCreator(new QUiWidgetCreator<TYPE>(QStringLiteral(#TYPE)));
+#define QMLDESIGNER_REGISTER_GRAPHICSWIDGET(TYPE) uiEngine->addObjectCreator(new QUiGraphicsWidgetCreator<TYPE>(QStringLiteral(#TYPE)));
#endif //WIDGETPLUGIN_HELPER
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 3f48c656db..eb4e5990f8 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -512,7 +512,7 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node, const Propert
void NodeInstanceView::customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &, const QList<QVariant> &)
{
- if (view && identifier == QLatin1String("reset QmlPuppet"))
+ if (view && identifier == QStringLiteral("reset QmlPuppet"))
restartProcess();
}
@@ -1049,7 +1049,7 @@ void NodeInstanceView::valuesChanged(const ValuesChangedCommand &command)
}
}
- nodeInstanceServer()->removeSharedMemory(createRemoveSharedMemoryCommand(QLatin1String("Values"), command.keyNumber()));
+ nodeInstanceServer()->removeSharedMemory(createRemoveSharedMemoryCommand(QStringLiteral("Values"), command.keyNumber()));
if (!valuePropertyChangeList.isEmpty())
emitInstancePropertyChange(valuePropertyChangeList);
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index 5bee5de1e6..a81f7d7887 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -99,7 +99,7 @@ void MetaInfoPrivate::parseItemLibraryDescriptions()
reader.readMetaInfoFile(plugin->metaInfo());
} catch (InvalidMetaInfoException &e) {
qWarning() << e.description();
- const QString errorMessage = plugin->metaInfo() + QLatin1Char('\n') + QLatin1Char('\n') + reader.errors().join(QLatin1String("\n"));
+ const QString errorMessage = plugin->metaInfo() + QLatin1Char('\n') + QLatin1Char('\n') + reader.errors().join(QStringLiteral("\n"));
QmlDesignerWarning::show(QCoreApplication::translate("QmlDesigner::Internal::MetaInfoPrivate", "Invalid meta info"),
errorMessage);
}
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
index 7b69a39ce8..43e36a6326 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
@@ -42,11 +42,11 @@ enum {
debug = false
};
-const char rootElementName[] = "MetaInfo";
-const char typeElementName[] = "Type";
-const char ItemLibraryEntryElementName[] = "ItemLibraryEntry";
-const char QmlSourceElementName[] = "QmlSource";
-const char PropertyElementName[] = "Property";
+const QString rootElementName = QStringLiteral("MetaInfo");
+const QString typeElementName = QStringLiteral("Type");
+const QString ItemLibraryEntryElementName = QStringLiteral("ItemLibraryEntry");
+const QString QmlSourceElementName = QStringLiteral("QmlSource");
+const QString PropertyElementName = QStringLiteral("Property");
MetaInfoReader::MetaInfoReader(const MetaInfo &metaInfo)
: m_parserState(Undefined),
@@ -138,7 +138,7 @@ void MetaInfoReader::propertyDefinition(const QString &name, const QVariant &val
MetaInfoReader::ParserSate MetaInfoReader::readDocument(const QString &name)
{
- if (name == QLatin1String(rootElementName)) {
+ if (name == rootElementName) {
m_currentClassName.clear();
m_currentIcon.clear();
return ParsingMetaInfo;
@@ -150,7 +150,7 @@ MetaInfoReader::ParserSate MetaInfoReader::readDocument(const QString &name)
MetaInfoReader::ParserSate MetaInfoReader::readMetaInfoRootElement(const QString &name)
{
- if (name == QLatin1String(typeElementName)) {
+ if (name == typeElementName) {
m_currentClassName.clear();
m_currentIcon.clear();
return ParsingType;
@@ -162,7 +162,7 @@ MetaInfoReader::ParserSate MetaInfoReader::readMetaInfoRootElement(const QString
MetaInfoReader::ParserSate MetaInfoReader::readTypeElement(const QString &name)
{
- if (name == QLatin1String(ItemLibraryEntryElementName)) {
+ if (name == ItemLibraryEntryElementName) {
m_currentEntry = ItemLibraryEntry();
m_currentEntry.setType(m_currentClassName, -1, -1);
m_currentEntry.setIcon(QIcon(m_currentIcon));
@@ -202,11 +202,11 @@ MetaInfoReader::ParserSate MetaInfoReader::readQmlSourceElement(const QString &n
void MetaInfoReader::readTypeProperty(const QString &name, const QVariant &value)
{
- if (name == QLatin1String("name")) {
+ if (name == "name") {
m_currentClassName = value.toString().toUtf8();
if (!m_qualication.isEmpty()) //prepend qualification
m_currentClassName = m_qualication + "." + m_currentClassName;
- } else if (name == QLatin1String("icon")) {
+ } else if (name == QStringLiteral("icon")) {
m_currentIcon = absoluteFilePathForDocument(value.toString());
} else {
addError(tr("Unknown property for Type %1").arg(name), currentSourceLocation());
@@ -216,15 +216,15 @@ void MetaInfoReader::readTypeProperty(const QString &name, const QVariant &value
void MetaInfoReader::readItemLibraryEntryProperty(const QString &name, const QVariant &value)
{
- if (name == QLatin1String("name")) {
+ if (name == QStringLiteral("name")) {
m_currentEntry.setName(value.toString());
- } else if (name == QLatin1String("category")) {
+ } else if (name == QStringLiteral("category")) {
m_currentEntry.setCategory(value.toString());
- } else if (name == QLatin1String("libraryIcon")) {
+ } else if (name == QStringLiteral("libraryIcon")) {
m_currentEntry.setIconPath(absoluteFilePathForDocument(value.toString()));
- } else if (name == QLatin1String("version")) {
+ } else if (name == QStringLiteral("version")) {
setVersion(value.toString());
- } else if (name == QLatin1String("requiredImport")) {
+ } else if (name == QStringLiteral("requiredImport")) {
m_currentEntry.setRequiredImport(value.toString());
} else {
addError(tr("Unknown property for ItemLibraryEntry %1").arg(name), currentSourceLocation());
@@ -234,11 +234,11 @@ void MetaInfoReader::readItemLibraryEntryProperty(const QString &name, const QVa
void MetaInfoReader::readPropertyProperty(const QString &name, const QVariant &value)
{
- if (name == QLatin1String("name")) {
+ if (name == QStringLiteral("name")) {
m_currentPropertyName = value.toByteArray();
- } else if (name == QLatin1String("type")) {
+ } else if (name == QStringLiteral("type")) {
m_currentPropertyType = value.toString();
- } else if (name == QLatin1String("value")) {
+ } else if (name == QStringLiteral("value")) {
m_currentPropertyValue = value;
} else {
addError(tr("Unknown property for Property %1").arg(name), currentSourceLocation());
@@ -248,7 +248,7 @@ void MetaInfoReader::readPropertyProperty(const QString &name, const QVariant &v
void MetaInfoReader::readQmlSourceProperty(const QString &name, const QVariant &value)
{
- if (name == QLatin1String("source")) {
+ if (name == QStringLiteral("source")) {
m_currentEntry.setQmlPath(absoluteFilePathForDocument(value.toString()));
} else {
addError(tr("Unknown property for QmlSource %1").arg(name), currentSourceLocation());
@@ -322,7 +322,7 @@ QString MetaInfoReader::absoluteFilePathForDocument(const QString &relativeFileP
if (fileInfo.isAbsolute() && fileInfo.exists())
return relativeFilePath;
- return QFileInfo(QFileInfo(m_documentPath).absolutePath() + QLatin1String("/") + relativeFilePath).absoluteFilePath();
+ return QFileInfo(QFileInfo(m_documentPath).absolutePath() + QStringLiteral("/") + relativeFilePath).absoluteFilePath();
}
} //Internal
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 6d31ef0023..33163e78ce 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -754,7 +754,7 @@ QString NodeMetaInfoPrivate::propertyEnumScope(const PropertyName &propertyName)
return QString();
if (propertyType(propertyName).contains("Qt::"))
- return QLatin1String("Qt");
+ return QStringLiteral("Qt");
if (propertyName.contains('.')) {
const PropertyNameList parts = propertyName.split('.');
@@ -780,7 +780,7 @@ QString NodeMetaInfoPrivate::propertyEnumScope(const PropertyName &propertyName)
if (definedIn) {
QString nonCppPackage;
foreach (const LanguageUtils::FakeMetaObject::Export &qmlExport, definedIn->metaObject()->exports()) {
- if (qmlExport.package != QLatin1String("<cpp>"))
+ if (qmlExport.package != QStringLiteral("<cpp>"))
nonCppPackage = qmlExport.package;
}
@@ -810,7 +810,7 @@ static QString getPackage(const QString &name)
return QString();
nameComponents.removeLast();
- return nameComponents.join(QLatin1String("."));
+ return nameComponents.join(QStringLiteral("."));
}
bool NodeMetaInfoPrivate::cleverCheckType(const QString &otherType) const
@@ -974,7 +974,7 @@ QString NodeMetaInfoPrivate::lookupName() const
QStringList packageClassName = className.split(QLatin1Char('.'));
if (packageClassName.size() > 1) {
className = packageClassName.takeLast();
- packageName = packageClassName.join(QLatin1String("."));
+ packageName = packageClassName.join(QStringLiteral("."));
}
return CppQmlTypes::qualifiedName(
@@ -1061,7 +1061,7 @@ void NodeMetaInfoPrivate::setupPrototypes()
if (importInfo.isValid()) {
QString uri = importInfo.name();
- uri.replace(QLatin1String(","), QLatin1String("."));
+ uri.replace(QStringLiteral(","), QStringLiteral("."));
if (!uri.isEmpty())
description.className = QString(uri + QString::fromLatin1(".") + QString::fromLatin1(description.className)).toLatin1();
}
@@ -1210,11 +1210,11 @@ QVariant NodeMetaInfo::propertyCastedValue(const PropertyName &propertyName, con
if (variant.type() == QVariant::UserType && variant.userType() == ModelNode::variantUserType()) {
return variant;
- } else if (typeId == QVariant::UserType && typeName == QLatin1String("QVariant")) {
+ } else if (typeId == QVariant::UserType && typeName == QStringLiteral("QVariant")) {
return variant;
- } else if (typeId == QVariant::UserType && typeName == QLatin1String("variant")) {
+ } else if (typeId == QVariant::UserType && typeName == QStringLiteral("variant")) {
return variant;
- } else if (typeId == QVariant::UserType && typeName == QLatin1String("var")) {
+ } else if (typeId == QVariant::UserType && typeName == QStringLiteral("var")) {
return variant;
} else if (variant.type() == QVariant::List && variant.type() == QVariant::List) {
// TODO: check the contents of the list
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index 81c4a58400..5825d6eb5e 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -95,7 +95,7 @@ static inline bool checkIfDerivedFromItem(const QString &fileName)
QmlJS::Document::MutablePtr document =
QmlJS::Document::create(fileName.isEmpty() ?
- QLatin1String("<internal>") : fileName, QmlJS::Language::Qml);
+ QStringLiteral("<internal>") : fileName, QmlJS::Language::Qml);
document->setSource(source);
document->parseQml();
@@ -250,7 +250,7 @@ void SubComponentManager::parseDirectory(const QString &canonicalDirPath, bool a
reader.readMetaInfoFile(metaInfoFile.absoluteFilePath(), true);
} catch (InvalidMetaInfoException &e) {
qWarning() << e.description();
- const QString errorMessage = metaInfoFile.absoluteFilePath() + QLatin1Char('\n') + QLatin1Char('\n') + reader.errors().join(QLatin1String("\n"));
+ const QString errorMessage = metaInfoFile.absoluteFilePath() + QLatin1Char('\n') + QLatin1Char('\n') + reader.errors().join(QStringLiteral("\n"));
QmlDesignerWarning::show(QCoreApplication::translate("SubComponentManager::parseDirectory", "Invalid meta info"),
errorMessage);
}
@@ -381,7 +381,7 @@ void SubComponentManager::registerQmlFile(const QFileInfo &fileInfo, const QStri
QString fixedQualifier = qualifier;
if (!qualifier.isEmpty()) {
fixedQualifier = qualifier;
- if (qualifier.right(1) == QLatin1String("."))
+ if (qualifier.right(1) == QStringLiteral("."))
fixedQualifier.chop(1); //remove last char if it is a dot
componentName = fixedQualifier + '.' + componentName;
}
diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index dac9e93c05..f61ef6fa99 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -367,12 +367,12 @@ QString AbstractView::generateNewId(const QString prefixName) const
int counter = 1;
QString newId = QString("%1%2").arg(firstCharToLower(prefixName)).arg(counter);
- newId.remove(QRegExp(QLatin1String("[^a-zA-Z0-9_]")));
+ newId.remove(QRegExp(QStringLiteral("[^a-zA-Z0-9_]")));
while (hasId(newId)) {
counter += 1;
newId = QString("%1%2").arg(firstCharToLower(prefixName)).arg(counter);
- newId.remove(QRegExp(QLatin1String("[^a-zA-Z0-9_]")));
+ newId.remove(QRegExp(QStringLiteral("[^a-zA-Z0-9_]")));
}
return newId;
@@ -534,10 +534,10 @@ QmlModelState AbstractView::currentState() const
static int getMajorVersionFromImport(const Model *model)
{
foreach (const Import &import, model->imports()) {
- if (import.isLibraryImport() && import.url() == QLatin1String("QtQuick")) {
+ if (import.isLibraryImport() && import.url() == QStringLiteral("QtQuick")) {
const QString versionString = import.version();
- if (versionString.contains(QLatin1String("."))) {
- const QString majorVersionString = versionString.split(QLatin1String(".")).first();
+ if (versionString.contains(QStringLiteral("."))) {
+ const QString majorVersionString = versionString.split(QStringLiteral(".")).first();
return majorVersionString.toInt();
}
}
diff --git a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
index af8c420f80..1b2ada05d8 100644
--- a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
@@ -135,7 +135,7 @@ ModelNode BindingProperty::resolveToModelNode() const
static inline QStringList commaSeparatedSimplifiedStringList(const QString &string)
{
- QStringList stringList = string.split(QLatin1String(","));
+ QStringList stringList = string.split(QStringLiteral(","));
QStringList simpleList;
foreach (const QString &simpleString, stringList)
simpleList.append(simpleString.simplified());
diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp
index 67e9510c1c..62ed94e5c5 100644
--- a/src/plugins/qmldesigner/designercore/model/import.cpp
+++ b/src/plugins/qmldesigner/designercore/model/import.cpp
@@ -54,7 +54,7 @@ Import Import::empty()
QString Import::toImportString() const
{
- QString result = QLatin1String("import ");
+ QString result = QStringLiteral("import ");
result += toString(false);
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index f916ef0dfc..8215054ac2 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -155,7 +155,7 @@ static bool idIsQmlKeyWord(const QString& id)
static bool idContainsWrongLetter(const QString& id)
{
- static QRegExp idExpr(QLatin1String("[a-z_][a-zA-Z0-9_]*"));
+ static QRegExp idExpr(QStringLiteral("[a-z_][a-zA-Z0-9_]*"));
return !idExpr.exactMatch(id);
}
diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
index f9deaaa5b0..bbee08f0c5 100644
--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
@@ -213,21 +213,21 @@ void ModelToTextMerger::applyChanges()
if (m_rewriteActions.isEmpty())
return;
- dumpRewriteActions(QLatin1String("Before compression"));
+ dumpRewriteActions(QStringLiteral("Before compression"));
RewriteActionCompressor compress(getPropertyOrder());
compress(m_rewriteActions);
- dumpRewriteActions(QLatin1String("After compression"));
+ dumpRewriteActions(QStringLiteral("After compression"));
if (m_rewriteActions.isEmpty())
return;
- Document::MutablePtr tmpDocument(Document::create(QLatin1String("<ModelToTextMerger>"), Language::Qml));
+ Document::MutablePtr tmpDocument(Document::create(QStringLiteral("<ModelToTextMerger>"), Language::Qml));
tmpDocument->setSource(m_rewriterView->textModifier()->text());
if (!tmpDocument->parseQml()) {
qDebug() << "*** Possible problem: QML file wasn't parsed correctly.";
qDebug() << "*** QML text:" << m_rewriterView->textModifier()->text();
- QString errorMessage = QLatin1String("Error while rewriting");
+ QString errorMessage = QStringLiteral("Error while rewriting");
if (!tmpDocument->diagnosticMessages().isEmpty())
errorMessage = tmpDocument->diagnosticMessages().first().message;
@@ -261,7 +261,7 @@ void ModelToTextMerger::applyChanges()
// don't merge these two if statements, because the previous then-part changes the value
// of "success" !
if (!success) {
- m_rewriterView->enterErrorState(QLatin1String("Error rewriting document"));
+ m_rewriterView->enterErrorState(QStringLiteral("Error rewriting document"));
if (true || DebugRewriteActions) {
qDebug() << "*** QML source code: ***";
diff --git a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
index 606239fcf8..bb43efa1fb 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
@@ -54,23 +54,23 @@ static PropertyName lineTypeToString(AnchorLineType lineType)
static AnchorLineType propertyNameToLineType(const QString & string)
{
- if (string == QLatin1String("left"))
+ if (string == QStringLiteral("left"))
return AnchorLineLeft;
- else if (string == QLatin1String("top"))
+ else if (string == QStringLiteral("top"))
return AnchorLineTop;
- else if (string == QLatin1String("right"))
+ else if (string == QStringLiteral("right"))
return AnchorLineRight;
- else if (string == QLatin1String("bottom"))
+ else if (string == QStringLiteral("bottom"))
return AnchorLineBottom;
- else if (string == QLatin1String("horizontalCenter"))
+ else if (string == QStringLiteral("horizontalCenter"))
return AnchorLineHorizontalCenter;
- else if (string == QLatin1String("verticalCenter"))
+ else if (string == QStringLiteral("verticalCenter"))
return AnchorLineVerticalCenter;
- else if (string == QLatin1String("baseline"))
+ else if (string == QStringLiteral("baseline"))
return AnchorLineVerticalCenter;
- else if (string == QLatin1String("centerIn"))
+ else if (string == QStringLiteral("centerIn"))
return AnchorLineCenter;
- else if (string == QLatin1String("fill"))
+ else if (string == QStringLiteral("fill"))
return AnchorLineFill;
return AnchorLineInvalid;
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index 0f4d52b9c8..a028bd61c7 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -121,7 +121,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
propertyPairList.append(qMakePair(PropertyName("y"), QVariant(qRound(position.y()))));
foreach (const PropertyContainer &property, itemLibraryEntry.properties()) {
- if (property.type() == QLatin1String("binding")) {
+ if (property.type() == QStringLiteral("binding")) {
propertyBindingList.append(PropertyBindingEntry(property.name(), property.value().toString()));
} else {
propertyPairList.append(qMakePair(property.name(), property.value()));
diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
index 9a71ebb31b..cd8b66dfc9 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
@@ -85,13 +85,13 @@ QString QmlTextGenerator::toQml(const AbstractProperty &property, int indentDept
QString result;
for (int i = 0; i < nodes.length(); ++i) {
if (i > 0)
- result += QLatin1String("\n\n");
+ result += QStringLiteral("\n\n");
result += QString(indentDepth, QLatin1Char(' '));
result += toQml(nodes.at(i), indentDepth);
}
return result;
} else {
- QString result = QLatin1String("[");
+ QString result = QStringLiteral("[");
const int arrayContentDepth = indentDepth + 4;
const QString arrayContentIndentation(arrayContentDepth, QLatin1Char(' '));
for (int i = 0; i < nodes.length(); ++i) {
@@ -120,9 +120,9 @@ QString QmlTextGenerator::toQml(const AbstractProperty &property, int indentDept
switch (value.type()) {
case QVariant::Bool:
if (value.value<bool>())
- return QLatin1String("true");
+ return QStringLiteral("true");
else
- return QLatin1String("false");
+ return QStringLiteral("false");
case QVariant::Color:
return QStringLiteral("\"%1\"").arg(properColorName(value.value<QColor>()));
@@ -176,7 +176,7 @@ QString QmlTextGenerator::toQml(const ModelNode &node, int indentDepth) const
result = alias + '.';
result += type;
- result += QLatin1String(" {\n");
+ result += QStringLiteral(" {\n");
const int propertyIndentDepth = indentDepth + 4;
@@ -198,7 +198,7 @@ QString QmlTextGenerator::propertiesToQml(const ModelNode &node, int indentDepth
// the model handles the id property special, so:
if (!node.id().isEmpty()) {
QString idLine(indentDepth, QLatin1Char(' '));
- idLine += QLatin1String("id: ");
+ idLine += QStringLiteral("id: ");
idLine += node.id();
idLine += QLatin1Char('\n');
@@ -235,14 +235,14 @@ QString QmlTextGenerator::propertyToQml(const AbstractProperty &property, int in
} else {
if (property.isDynamic()) {
result = QString(indentDepth, QLatin1Char(' '))
- + QLatin1String("property ")
+ + QStringLiteral("property ")
+ property.dynamicTypeName()
- + QLatin1String(" ")
+ + QStringLiteral(" ")
+ property.name()
- + QLatin1String(": ")
+ + QStringLiteral(": ")
+ toQml(property, indentDepth);
} else {
- result = QString(indentDepth, QLatin1Char(' ')) + property.name() + QLatin1String(": ") + toQml(property, indentDepth);
+ result = QString(indentDepth, QLatin1Char(' ')) + property.name() + QStringLiteral(": ") + toQml(property, indentDepth);
}
}
@@ -255,12 +255,12 @@ QString QmlTextGenerator::escape(const QString &value)
{
QString result = value;
- result.replace(QLatin1String("\\"), QLatin1String("\\\\"));
+ result.replace(QStringLiteral("\\"), QStringLiteral("\\\\"));
- result.replace(QLatin1String("\""), QLatin1String("\\\""));
- result.replace(QLatin1String("\t"), QLatin1String("\\t"));
- result.replace(QLatin1String("\r"), QLatin1String("\\r"));
- result.replace(QLatin1String("\n"), QLatin1String("\\n"));
+ result.replace(QStringLiteral("\""), QStringLiteral("\\\""));
+ result.replace(QStringLiteral("\t"), QStringLiteral("\\t"));
+ result.replace(QStringLiteral("\r"), QStringLiteral("\\r"));
+ result.replace(QStringLiteral("\n"), QStringLiteral("\\n"));
return result;
}
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
index a578bc2f7c..5763f48f1d 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
@@ -45,26 +45,26 @@ static inline QString toInfo(const Import &import)
QString txt;
if (import.isEmpty()) {
- return QLatin1String("empty import");
+ return QStringLiteral("empty import");
} else if (import.isFileImport()) {
- txt = QLatin1String("import file \"%1\"");
+ txt = QStringLiteral("import file \"%1\"");
txt = txt.arg(import.url());
} else if (import.isLibraryImport()) {
- txt = QLatin1String("import library \"%1\"");
+ txt = QStringLiteral("import library \"%1\"");
txt = txt.arg(import.file());
} else {
- return QLatin1String("unknown type of import");
+ return QStringLiteral("unknown type of import");
}
if (import.hasVersion())
txt += QStringLiteral("with version \"%1\"").arg(import.version());
else
- txt += QLatin1String("without version");
+ txt += QStringLiteral("without version");
if (import.hasAlias())
txt += QStringLiteral("aliassed as \"%1\"").arg(import.alias());
else
- txt += QLatin1String("unaliassed");
+ txt += QStringLiteral("unaliassed");
return txt;
}
@@ -72,10 +72,10 @@ static inline QString toInfo(const Import &import)
static inline QString toString(QmlRefactoring::PropertyType type)
{
switch (type) {
- case QmlRefactoring::ArrayBinding: return QLatin1String("array binding");
- case QmlRefactoring::ObjectBinding: return QLatin1String("object binding");
- case QmlRefactoring::ScriptBinding: return QLatin1String("script binding");
- default: return QLatin1String("UNKNOWN");
+ case QmlRefactoring::ArrayBinding: return QStringLiteral("array binding");
+ case QmlRefactoring::ObjectBinding: return QStringLiteral("object binding");
+ case QmlRefactoring::ScriptBinding: return QStringLiteral("script binding");
+ default: return QStringLiteral("UNKNOWN");
}
}
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index 5bc40f16e1..9711723f85 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -113,7 +113,7 @@ QString RewriterView::Error::toString() const
}
if (!str.isEmpty())
- QLatin1String(": ");
+ QStringLiteral(": ");
str += description();
return str;
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 8f7d292cfc..b1c130ea01 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -65,14 +65,14 @@ namespace {
static inline QStringList supportedVersionsList()
{
QStringList list;
- list << QLatin1String("1.0") << QLatin1String("1.1") << QLatin1String("2.0") << QLatin1String("2.1") << QLatin1String("2.2");
+ list << QStringLiteral("1.0") << QStringLiteral("1.1") << QStringLiteral("2.0") << QStringLiteral("2.1") << QStringLiteral("2.2");
return list;
}
static inline QStringList globalQtEnums()
{
- static QStringList list = QStringList() << QLatin1String("Horizontal") << QLatin1String("Vertical") << QLatin1String("AlignVCenter")
- << QLatin1String("AlignLeft") << QLatin1String("LeftToRight") << QLatin1String("RightToLeft");
+ static QStringList list = QStringList() << QStringLiteral("Horizontal") << QStringLiteral("Vertical") << QStringLiteral("AlignVCenter")
+ << QStringLiteral("AlignLeft") << QStringLiteral("LeftToRight") << QStringLiteral("RightToLeft");
return list;
}
@@ -96,11 +96,11 @@ static inline QString deEscape(const QString &value)
{
QString result = value;
- result.replace(QLatin1String("\\\\"), QLatin1String("\\"));
- result.replace(QLatin1String("\\\""), QLatin1String("\""));
- result.replace(QLatin1String("\\t"), QLatin1String("\t"));
- result.replace(QLatin1String("\\r"), QLatin1String("\\\r"));
- result.replace(QLatin1String("\\n"), QLatin1String("\n"));
+ result.replace(QStringLiteral("\\\\"), QStringLiteral("\\"));
+ result.replace(QStringLiteral("\\\""), QStringLiteral("\""));
+ result.replace(QStringLiteral("\\t"), QStringLiteral("\t"));
+ result.replace(QStringLiteral("\\r"), QStringLiteral("\\\r"));
+ result.replace(QStringLiteral("\\n"), QStringLiteral("\n"));
return result;
}
@@ -143,7 +143,7 @@ static inline QString fixEscapedUnicodeChar(const QString &value) //convert "\u2
static inline bool isSignalPropertyName(const QString &signalName)
{
// see QmlCompiler::isSignalPropertyName
- return signalName.length() >= 3 && signalName.startsWith(QLatin1String("on")) &&
+ return signalName.length() >= 3 && signalName.startsWith(QStringLiteral("on")) &&
signalName.at(2).isLetter();
}
@@ -200,23 +200,23 @@ static inline bool isLiteralValue(UiScriptBinding *script)
static inline int propertyType(const QString &typeName)
{
- if (typeName == QLatin1String("bool"))
+ if (typeName == QStringLiteral("bool"))
return QMetaType::type("bool");
- else if (typeName == QLatin1String("color"))
+ else if (typeName == QStringLiteral("color"))
return QMetaType::type("QColor");
- else if (typeName == QLatin1String("date"))
+ else if (typeName == QStringLiteral("date"))
return QMetaType::type("QDate");
- else if (typeName == QLatin1String("int"))
+ else if (typeName == QStringLiteral("int"))
return QMetaType::type("int");
- else if (typeName == QLatin1String("real"))
+ else if (typeName == QStringLiteral("real"))
return QMetaType::type("double");
- else if (typeName == QLatin1String("double"))
+ else if (typeName == QStringLiteral("double"))
return QMetaType::type("double");
- else if (typeName == QLatin1String("string"))
+ else if (typeName == QStringLiteral("string"))
return QMetaType::type("QString");
- else if (typeName == QLatin1String("url"))
+ else if (typeName == QStringLiteral("url"))
return QMetaType::type("QUrl");
- else if (typeName == QLatin1String("var") || typeName == QLatin1String("variant"))
+ else if (typeName == QStringLiteral("var") || typeName == QStringLiteral("variant"))
return QMetaType::type("QVariant");
else
return -1;
@@ -339,7 +339,7 @@ public:
const CppComponentValue * qmlValue = value_cast<CppComponentValue>(value);
if (qmlValue) {
- typeName = qmlValue->moduleName() + QLatin1String(".") + qmlValue->className();
+ typeName = qmlValue->moduleName() + QStringLiteral(".") + qmlValue->className();
majorVersion = qmlValue->componentVersion().majorVersion();
minorVersion = qmlValue->componentVersion().minorVersion();
@@ -408,7 +408,7 @@ public:
if (name)
*name = propertyName;
- if (propertyName == QLatin1String("id") && ! id->next)
+ if (propertyName == QStringLiteral("id") && ! id->next)
return false; // ### should probably be a special value
// attached properties
@@ -509,7 +509,7 @@ public:
QVariant convertToVariant(const QString &astValue, const QString &propertyPrefix, UiQualifiedId *propertyId)
{
- const bool hasQuotes = astValue.trimmed().left(1) == QLatin1String("\"") && astValue.trimmed().right(1) == QLatin1String("\"");
+ const bool hasQuotes = astValue.trimmed().left(1) == QStringLiteral("\"") && astValue.trimmed().right(1) == QStringLiteral("\"");
const QString cleanedValue = fixEscapedUnicodeChar(deEscape(stripQuotes(astValue.trimmed())));
const Value *property = 0;
const ObjectValue *containingObject = 0;
@@ -561,10 +561,10 @@ public:
QVariant convertToEnum(Statement *rhs, const QString &propertyPrefix, UiQualifiedId *propertyId, const QString &astValue)
{
- QStringList astValueList = astValue.split(QLatin1String("."));
+ QStringList astValueList = astValue.split(QStringLiteral("."));
if (astValueList.count() == 2 //Check for global Qt enums
- && astValueList.first() == QLatin1String("Qt")
+ && astValueList.first() == QStringLiteral("Qt")
&& globalQtEnums().contains(astValueList.last()))
return QVariant::fromValue(Enumeration(astValue));
@@ -711,9 +711,9 @@ void TextToModelMerger::setupImports(const Document::Ptr &doc,
differenceHandler.modelMissesImport(newImport);
} else {
QString importUri = toString(import->importUri);
- if (importUri == QLatin1String("Qt") && version == QLatin1String("4.7")) {
- importUri = QLatin1String("QtQuick");
- version = QLatin1String("1.0");
+ if (importUri == QStringLiteral("Qt") && version == QStringLiteral("4.7")) {
+ importUri = QStringLiteral("QtQuick");
+ version = QStringLiteral("1.0");
}
const Import newImport =
@@ -743,10 +743,10 @@ void TextToModelMerger::setupPossibleImports(const QmlJS::Snapshot &snapshot, co
filteredPossibleImportKeys.insert(importKey.path(), importKey);
}
- filteredPossibleImportKeys.remove(QLatin1String("<cpp>"));
- filteredPossibleImportKeys.remove(QLatin1String("QML"));
- filteredPossibleImportKeys.remove(QLatin1String("QtQml"));
- filteredPossibleImportKeys.remove(QLatin1String("QtQuick/PrivateWidgets"));
+ filteredPossibleImportKeys.remove(QStringLiteral("<cpp>"));
+ filteredPossibleImportKeys.remove(QStringLiteral("QML"));
+ filteredPossibleImportKeys.remove(QStringLiteral("QtQml"));
+ filteredPossibleImportKeys.remove(QStringLiteral("QtQuick/PrivateWidgets"));
QList<QmlJS::Import> allImports = m_scopeChain->context()->imports(m_document.data())->all();
@@ -801,7 +801,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
try {
Snapshot snapshot = m_rewriterView->textModifier()->getSnapshot();
const QString fileName = url.toLocalFile();
- Document::MutablePtr doc = Document::create(fileName.isEmpty() ? QLatin1String("<internal>") : fileName, Language::Qml);
+ Document::MutablePtr doc = Document::create(fileName.isEmpty() ? QStringLiteral("<internal>") : fileName, Language::Qml);
doc->setSource(data);
doc->parseQml();
@@ -840,7 +840,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
}
foreach (const QmlDesigner::Import &import, m_rewriterView->model()->imports()) {
- if (import.isLibraryImport() && import.url() == QLatin1String("QtQuick") && !supportedQtQuickVersion(import.version())) {
+ if (import.isLibraryImport() && import.url() == QStringLiteral("QtQuick") && !supportedQtQuickVersion(import.version())) {
const QmlJS::DiagnosticMessage diagnosticMessage(QmlJS::Severity::Error, AST::SourceLocation(0, 0, 0, 0),
QCoreApplication::translate("QmlDesigner::TextToModelMerger", "Unsupported QtQuick version"));
errors.append(RewriterView::Error(diagnosticMessage, QUrl::fromLocalFile(doc->fileName())));
@@ -892,8 +892,8 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
QStringList message;
foreach (const RewriterView::Error &warning, warnings) {
- QString string = QLatin1String("Line: ") + QString::number(warning.line()) + QLatin1String(": ") + warning.description();
- //string += QLatin1String(" <a href=\"") + QString::number(warning.line()) + QLatin1String("\">Go to error</a>") + QLatin1String("<p>");
+ QString string = QStringLiteral("Line: ") + QString::number(warning.line()) + QStringLiteral(": ") + warning.description();
+ //string += QStringLiteral(" <a href=\"") + QString::number(warning.line()) + QStringLiteral("\">Go to error</a>") + QStringLiteral("<p>");
message << string;
}
@@ -1179,7 +1179,7 @@ QmlDesigner::PropertyName TextToModelMerger::syncScriptBinding(ModelNode &modelN
astValue = astValue.trimmed();
}
- if (astPropertyName == QLatin1String("id")) {
+ if (astPropertyName == QStringLiteral("id")) {
syncNodeId(modelNode, astValue, differenceHandler);
return astPropertyName.toUtf8();
}
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index cd26204957..69b94ae612 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -232,8 +232,8 @@ void DesignModeWidget::readSettings()
QSettings *settings = Core::ICore::settings();
settings->beginGroup("Bauhaus");
- m_leftSideBar->readSettings(settings, QLatin1String("LeftSideBar"));
- m_rightSideBar->readSettings(settings, QLatin1String("RightSideBar"));
+ m_leftSideBar->readSettings(settings, QStringLiteral("LeftSideBar"));
+ m_rightSideBar->readSettings(settings, QStringLiteral("RightSideBar"));
if (settings->contains("MainSplitter")) {
const QByteArray splitterState = settings->value("MainSplitter").toByteArray();
m_mainSplitter->restoreState(splitterState);
@@ -247,8 +247,8 @@ void DesignModeWidget::saveSettings()
QSettings *settings = Core::ICore::settings();
settings->beginGroup("Bauhaus");
- m_leftSideBar->saveSettings(settings, QLatin1String("LeftSideBar"));
- m_rightSideBar->saveSettings(settings, QLatin1String("RightSideBar"));
+ m_leftSideBar->saveSettings(settings, QStringLiteral("LeftSideBar"));
+ m_rightSideBar->saveSettings(settings, QStringLiteral("RightSideBar"));
settings->setValue("MainSplitter", m_mainSplitter->saveState());
settings->endGroup();
}