feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: QT_NO_CAST_FROM_ASCII fixes

Browse Source 
Change-Id: I45cd69bb863dbf7fc51f6d64fa4b2509c0e2ecee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-16 17:06:52 +02:00
committed by Thomas Hartmann
parent cad4ee7116
commit 893dfade18
19 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
View File

@@ -107,7 +107,7 @@ void CrumbleBar::pushFile(const QString &fileName)
CrumbleBarInfo crumbleBarInfo; CrumbleBarInfo crumbleBarInfo;
crumbleBarInfo.fileName = fileName; crumbleBarInfo.fileName = fileName;
crumblePath()->pushElement(fileName.split("/").last(), QVariant::fromValue(crumbleBarInfo)); crumblePath()->pushElement(fileName.split(QLatin1String("/")).last(), QVariant::fromValue(crumbleBarInfo));
m_isInternalCalled = false; m_isInternalCalled = false;
@@ -176,7 +176,7 @@ void CrumbleBar::onCrumblePathElementClicked(const QVariant &data)
m_isInternalCalled = true; m_isInternalCalled = true;
if (!clickedCrumbleBarInfo.modelNode.isValid() if (!clickedCrumbleBarInfo.modelNode.isValid()
&& clickedCrumbleBarInfo.fileName == currentDesignDocument()->fileName().fileName()) { && Utils::FileName::fromString(clickedCrumbleBarInfo.fileName) == currentDesignDocument()->fileName()) {
nextFileIsCalledInternally(); nextFileIsCalledInternally();
currentDesignDocument()->changeToDocumentModel(); currentDesignDocument()->changeToDocumentModel();
QmlDesignerPlugin::instance()->viewManager().setComponentViewToMaster(); QmlDesignerPlugin::instance()->viewManager().setComponentViewToMaster();

4
src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
View File

@@ -206,8 +206,8 @@ void AbstractFormEditorTool::dropEvent(const QList<QGraphicsItem*> &/*itemList*/
void AbstractFormEditorTool::dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) void AbstractFormEditorTool::dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event)
{ {
if (event->mimeData()->hasFormat("application/vnd.bauhaus.itemlibraryinfo") || if (event->mimeData()->hasFormat(QLatin1String("application/vnd.bauhaus.itemlibraryinfo")) ||
event->mimeData()->hasFormat("application/vnd.bauhaus.libraryresource")) { event->mimeData()->hasFormat(QLatin1String("application/vnd.bauhaus.libraryresource"))) {
event->accept(); event->accept();
view()->changeToDragTool(); view()->changeToDragTool();
view()->currentTool()->dragEnterEvent(itemList, event); view()->currentTool()->dragEnterEvent(itemList, event);

14
src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
View File

@@ -51,7 +51,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
: QWidget(), : QWidget(),
m_formEditorView(view) m_formEditorView(view)
{ {
setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/formeditorstylesheet.css"))); setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/formeditorstylesheet.css"))));
QVBoxLayout *fillLayout = new QVBoxLayout(this); QVBoxLayout *fillLayout = new QVBoxLayout(this);
fillLayout->setMargin(0); fillLayout->setMargin(0);
@@ -70,21 +70,21 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
m_noSnappingAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_noSnappingAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
m_noSnappingAction->setCheckable(true); m_noSnappingAction->setCheckable(true);
m_noSnappingAction->setChecked(true); m_noSnappingAction->setChecked(true);
m_noSnappingAction->setIcon(QPixmap(":/icon/layout/no_snapping.png")); m_noSnappingAction->setIcon(QPixmap(QLatin1String(":/icon/layout/no_snapping.png")));
m_snappingAndAnchoringAction = layoutActionGroup->addAction(tr("Snap to parent or sibling items and generate anchors (W).")); m_snappingAndAnchoringAction = layoutActionGroup->addAction(tr("Snap to parent or sibling items and generate anchors (W)."));
m_snappingAndAnchoringAction->setShortcut(Qt::Key_W); m_snappingAndAnchoringAction->setShortcut(Qt::Key_W);
m_snappingAndAnchoringAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_snappingAndAnchoringAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
m_snappingAndAnchoringAction->setCheckable(true); m_snappingAndAnchoringAction->setCheckable(true);
m_snappingAndAnchoringAction->setChecked(true); m_snappingAndAnchoringAction->setChecked(true);
m_snappingAndAnchoringAction->setIcon(QPixmap(":/icon/layout/snapping_and_anchoring.png")); m_snappingAndAnchoringAction->setIcon(QPixmap(QLatin1String(":/icon/layout/snapping_and_anchoring.png")));
m_snappingAction = layoutActionGroup->addAction(tr("Snap to parent or sibling items but do not generate anchors (E).")); m_snappingAction = layoutActionGroup->addAction(tr("Snap to parent or sibling items but do not generate anchors (E)."));
m_snappingAction->setShortcut(Qt::Key_E); m_snappingAction->setShortcut(Qt::Key_E);
m_snappingAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_snappingAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
m_snappingAction->setCheckable(true); m_snappingAction->setCheckable(true);
m_snappingAction->setChecked(true); m_snappingAction->setChecked(true);
m_snappingAction->setIcon(QPixmap(":/icon/layout/snapping.png")); m_snappingAction->setIcon(QPixmap(QLatin1String(":/icon/layout/snapping.png")));
addActions(layoutActionGroup->actions()); addActions(layoutActionGroup->actions());
@@ -100,7 +100,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
m_showBoundingRectAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_showBoundingRectAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
m_showBoundingRectAction->setCheckable(true); m_showBoundingRectAction->setCheckable(true);
m_showBoundingRectAction->setChecked(true); m_showBoundingRectAction->setChecked(true);
m_showBoundingRectAction->setIcon(QPixmap(":/icon/layout/boundingrect.png")); m_showBoundingRectAction->setIcon(QPixmap(QLatin1String(":/icon/layout/boundingrect.png")));
addAction(m_showBoundingRectAction.data()); addAction(m_showBoundingRectAction.data());
upperActions.append(m_showBoundingRectAction.data()); upperActions.append(m_showBoundingRectAction.data());
@@ -139,7 +139,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
m_resetAction = new QAction(tr("Reset view (R)."), this); m_resetAction = new QAction(tr("Reset view (R)."), this);
m_resetAction->setShortcut(Qt::Key_R); m_resetAction->setShortcut(Qt::Key_R);
m_resetAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_resetAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
m_resetAction->setIcon(QPixmap(":/icon/reset.png")); m_resetAction->setIcon(QPixmap(QLatin1String(":/icon/reset.png")));
connect(m_resetAction.data(), SIGNAL(triggered(bool)), this, SLOT(resetNodeInstanceView())); connect(m_resetAction.data(), SIGNAL(triggered(bool)), this, SLOT(resetNodeInstanceView()));
addAction(m_resetAction.data()); addAction(m_resetAction.data());
upperActions.append(m_resetAction.data()); upperActions.append(m_resetAction.data());
@@ -148,7 +148,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
m_graphicsView = new FormEditorGraphicsView(this); m_graphicsView = new FormEditorGraphicsView(this);
fillLayout->addWidget(m_graphicsView.data()); fillLayout->addWidget(m_graphicsView.data());
m_graphicsView.data()->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css"))); m_graphicsView.data()->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/scrollbar.css"))));
} }
void FormEditorWidget::changeTransformTool(bool checked) void FormEditorWidget::changeTransformTool(bool checked)

4
src/plugins/qmldesigner/components/formeditor/toolbox.cpp
View File

@@ -39,8 +39,8 @@ namespace QmlDesigner {
ToolBox::ToolBox(QWidget *parentWidget) ToolBox::ToolBox(QWidget *parentWidget)
: Utils::StyledBar(parentWidget), : Utils::StyledBar(parentWidget),
m_leftToolBar(new QToolBar("LeftSidebar", this)), m_leftToolBar(new QToolBar(QLatin1String("LeftSidebar"), this)),
m_rightToolBar(new QToolBar("RightSidebar", this)) m_rightToolBar(new QToolBar(QLatin1String("RightSidebar"), this))
{ {
setMaximumHeight(22); setMaximumHeight(22);
m_leftToolBar->setFloatable(true); m_leftToolBar->setFloatable(true);

4
src/plugins/qmldesigner/components/importmanager/importlabel.cpp
View File

@@ -45,7 +45,7 @@ ImportLabel::ImportLabel(QWidget *parent) :
m_removeButton = new QPushButton(this); m_removeButton = new QPushButton(this);
m_removeButton->setIcon(QIcon(Core::Constants::ICON_BUTTON_CLOSE)); m_removeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_BUTTON_CLOSE)));
m_removeButton->setFlat(true); m_removeButton->setFlat(true);
m_removeButton->setMaximumWidth(20); m_removeButton->setMaximumWidth(20);
m_removeButton->setMaximumHeight(20); m_removeButton->setMaximumHeight(20);
@@ -79,7 +79,7 @@ void ImportLabel::setReadOnly(bool readOnly) const
if (readOnly) if (readOnly)
m_removeButton->setIcon(QIcon()); m_removeButton->setIcon(QIcon());
else else
m_removeButton->setIcon(QIcon(Core::Constants::ICON_BUTTON_CLOSE)); m_removeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_BUTTON_CLOSE)));
} }
void ImportLabel::emitRemoveImport() void ImportLabel::emitRemoveImport()

2
src/plugins/qmldesigner/components/importmanager/importmanagercombobox.cpp
View File

@@ -37,7 +37,7 @@
ImportManagerComboBox::ImportManagerComboBox(QWidget *parent) : ImportManagerComboBox::ImportManagerComboBox(QWidget *parent) :
QComboBox(parent) QComboBox(parent)
{ {
setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/importmanager/importmanager.css"))); setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/importmanager/importmanager.css"))));
setToolTip(tr("Add new import")); setToolTip(tr("Add new import"));
} }

2
src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp
View File

@@ -64,7 +64,7 @@ WidgetInfo ImportManagerView::widgetInfo()
m_importsWidget->setImports(model()->imports()); m_importsWidget->setImports(model()->imports());
} }
return createWidgetInfo(m_importsWidget, 0, "ImportManager", WidgetInfo::LeftPane, 1); return createWidgetInfo(m_importsWidget, 0, QLatin1String("ImportManager"), WidgetInfo::LeftPane, 1);
} }
void ImportManagerView::modelAttached(Model *model) void ImportManagerView::modelAttached(Model *model)

6
src/plugins/qmldesigner/components/integration/componentview.cpp
View File

@@ -118,7 +118,7 @@ bool ComponentView::hasEntryForNode(const ModelNode &node) const
void ComponentView::addMasterDocument() void ComponentView::addMasterDocument()
{ {
if (!hasMasterEntry()) { if (!hasMasterEntry()) {
QStandardItem *item = new QStandardItem("master"); QStandardItem *item = new QStandardItem(QLatin1String("master"));
item->setData(QVariant::fromValue(0), ModelNodeRole); item->setData(QVariant::fromValue(0), ModelNodeRole);
item->setEditable(false); item->setEditable(false);
m_standardItemModel->appendRow(item); m_standardItemModel->appendRow(item);
@@ -140,11 +140,11 @@ QString ComponentView::descriptionForNode(const ModelNode &node) const
ModelNode parentNode = node.parentProperty().parentModelNode(); ModelNode parentNode = node.parentProperty().parentModelNode();
if (parentNode.id().isEmpty()) if (parentNode.id().isEmpty())
description = parentNode.simplifiedTypeName() + QLatin1Char(' '); description = QString::fromLatin1(parentNode.simplifiedTypeName()) + QLatin1Char(' ');
else else
description = parentNode.id() + QLatin1Char(' '); description = parentNode.id() + QLatin1Char(' ');
description += node.parentProperty().name(); description += QString::fromLatin1(node.parentProperty().name());
} }
return description; return description;

6
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -120,7 +120,7 @@ static ComponentTextModifier *createComponentTextModifier(TextModifier *original
const QString &componentText, const QString &componentText,
const ModelNode &componentNode) const ModelNode &componentNode)
{ {
bool explicitComponent = componentText.contains("Component"); bool explicitComponent = componentText.contains(QLatin1String("Component"));
ModelNode rootModelNode = rewriterView->rootModelNode(); ModelNode rootModelNode = rewriterView->rootModelNode();
@@ -406,7 +406,7 @@ void DesignDocument::copySelected()
node.destroy(); node.destroy();
} }
view.changeRootNodeType("QtQuick.Rectangle", 1, 0); view.changeRootNodeType("QtQuick.Rectangle", 1, 0);
view.rootModelNode().setIdWithRefactoring("designer__Selection"); view.rootModelNode().setIdWithRefactoring(QLatin1String("designer__Selection"));
foreach (const ModelNode &selectedNode, selectedNodes) { foreach (const ModelNode &selectedNode, selectedNodes) {
ModelNode newNode(view.insertModel(selectedNode)); ModelNode newNode(view.insertModel(selectedNode));
@@ -477,7 +477,7 @@ void DesignDocument::paste()
if (rootNode.type() == "empty") if (rootNode.type() == "empty")
return; return;
if (rootNode.id() == "designer__Selection") { if (rootNode.id() == QLatin1String("designer__Selection")) {
QList<ModelNode> selectedNodes = rootNode.directSubModelNodes(); QList<ModelNode> selectedNodes = rootNode.directSubModelNodes();
pasteModel->detachView(&view); pasteModel->detachView(&view);
currentModel()->attachView(&view); currentModel()->attachView(&view);

8
src/plugins/qmldesigner/components/integration/designdocumentview.cpp
View File

@@ -52,14 +52,14 @@ DesignDocumentView::~DesignDocumentView()
static QStringList arrayToStringList(const QByteArray &byteArray) static QStringList arrayToStringList(const QByteArray &byteArray)
{ {
QString str(QString::fromUtf8(byteArray)); QString str(QString::fromUtf8(byteArray));
return str.split('\n'); return str.split(QLatin1Char('\n'));
} }
static QByteArray stringListToArray(const QStringList &stringList) static QByteArray stringListToArray(const QStringList &stringList)
{ {
QString str; QString str;
foreach (const QString &subString, stringList) foreach (const QString &subString, stringList)
str += subString + '\n'; str += subString + QLatin1Char('\n');
return str.toUtf8(); return str.toUtf8();
} }
@@ -74,7 +74,7 @@ void DesignDocumentView::toClipboard() const
foreach (const Import &import, model()->imports()) foreach (const Import &import, model()->imports())
imports.append(import.toImportString()); imports.append(import.toImportString());
data->setData("QmlDesigner::imports", stringListToArray(imports)); data->setData(QLatin1String("QmlDesigner::imports"), stringListToArray(imports));
clipboard->setMimeData(data); clipboard->setMimeData(data);
} }
@@ -82,7 +82,7 @@ void DesignDocumentView::fromClipboard()
{ {
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
fromText(clipboard->text()); fromText(clipboard->text());
QStringList imports = arrayToStringList(clipboard->mimeData()->data("QmlDesigner::imports")); QStringList imports = arrayToStringList(clipboard->mimeData()->data(QLatin1String("QmlDesigner::imports")));
// foreach (const QString &importString, imports) { // foreach (const QString &importString, imports) {
// Import import(Import::createLibraryImport(); // Import import(Import::createLibraryImport();
// model()->addImport(import); //### imports // model()->addImport(import); //### imports

4
src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
View File

@@ -45,7 +45,7 @@ void XUIFileDialog::runOpenFileDialog(const QString& path, QWidget* parent, QObj
dir = XUIFileDialog::defaultFolder(); dir = XUIFileDialog::defaultFolder();
QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Open File"); QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Open File");
QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(";;"), 0, QFileDialog::ReadOnly); QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(QLatin1String(";;")), 0, QFileDialog::ReadOnly);
QmlDesigner::Internal::SignalEmitter emitter; QmlDesigner::Internal::SignalEmitter emitter;
QObject::connect(&emitter, SIGNAL(fileNameSelected(QString)), receiver, member); QObject::connect(&emitter, SIGNAL(fileNameSelected(QString)), receiver, member);
@@ -67,7 +67,7 @@ void XUIFileDialog::runSaveFileDialog(const QString& path, QWidget* parent, QObj
dialog->open(receiver, member); dialog->open(receiver, member);
} else { } else {
QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Save File"); QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Save File");
QString fileName = QFileDialog::getSaveFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(";;")); QString fileName = QFileDialog::getSaveFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(QLatin1String(";;")));
QmlDesigner::Internal::SignalEmitter emitter; QmlDesigner::Internal::SignalEmitter emitter;
QObject::connect(&emitter, SIGNAL(fileNameSelected(QString)), receiver, member); QObject::connect(&emitter, SIGNAL(fileNameSelected(QString)), receiver, member);

4
src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.cpp
View File

@@ -124,7 +124,7 @@ void ItemLibraryTreeView::startDrag(Qt::DropActions /* supportedActions */)
QDrag *drag = new QDrag(this); QDrag *drag = new QDrag(this);
drag->setPixmap(QIcon(pixmap).pixmap(128, 128)); drag->setPixmap(QIcon(pixmap).pixmap(128, 128));
QMimeData *mimeData = new QMimeData; QMimeData *mimeData = new QMimeData;
mimeData->setData("application/vnd.bauhaus.libraryresource", fileInfo.absoluteFilePath().toUtf8()); mimeData->setData(QLatin1String("application/vnd.bauhaus.libraryresource"), fileInfo.absoluteFilePath().toUtf8());
drag->setMimeData(mimeData); drag->setMimeData(mimeData);
drag->exec(); drag->exec();
} }
@@ -155,7 +155,7 @@ void ItemLibraryTreeView::activateItem( const QModelIndex & /*index*/)
QFileInfo fileInfo = fileSystemModel->fileInfo(selectedIndexes().front()); QFileInfo fileInfo = fileSystemModel->fileInfo(selectedIndexes().front());
QPixmap pixmap(fileInfo.absoluteFilePath()); QPixmap pixmap(fileInfo.absoluteFilePath());
if (!pixmap.isNull()) { if (!pixmap.isNull()) {
name = "image^" + fileInfo.absoluteFilePath(); name = QLatin1String("image^") + fileInfo.absoluteFilePath();
emit itemActivated(name); emit itemActivated(name);
} }
} }

16
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -144,8 +144,8 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
setSearchFilter(QString()); setSearchFilter(QString());
/* style sheets */ /* style sheets */
setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css"))); setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/stylesheet.css"))));
m_resourcesView->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css"))); m_resourcesView->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/scrollbar.css"))));
m_qmlSourceUpdateShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F5), this); m_qmlSourceUpdateShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F5), this);
connect(m_qmlSourceUpdateShortcut, SIGNAL(activated()), this, SLOT(reloadQmlSource())); connect(m_qmlSourceUpdateShortcut, SIGNAL(activated()), this, SLOT(reloadQmlSource()));
@@ -180,7 +180,7 @@ void ItemLibraryWidget::updateImports()
foreach (const Import &import, m_model->imports()) foreach (const Import &import, m_model->imports())
if (import.isLibraryImport()) if (import.isLibraryImport())
imports << import.url(); imports << import.url();
if (imports.contains("com.nokia.meego", Qt::CaseInsensitive)) if (imports.contains(QLatin1String("com.nokia.meego"), Qt::CaseInsensitive))
filter = Meego; filter = Meego;
} }
@@ -232,11 +232,11 @@ void ItemLibraryWidget::setSearchFilter(const QString &searchFilter)
m_itemViewQuickWidget->update(); m_itemViewQuickWidget->update();
} else { } else {
QStringList nameFilterList; QStringList nameFilterList;
if (searchFilter.contains('.')) { if (searchFilter.contains(QLatin1Char('.'))) {
nameFilterList.append(QString("*%1*").arg(searchFilter)); nameFilterList.append(QString(QStringLiteral("*%1*")).arg(searchFilter));
} else { } else {
foreach (const QByteArray &extension, QImageReader::supportedImageFormats()) { foreach (const QByteArray &extension, QImageReader::supportedImageFormats()) {
nameFilterList.append(QString("*%1*.%2").arg(searchFilter, QString::fromUtf8(extension))); nameFilterList.append(QString(QStringLiteral("*%1*.%2")).arg(searchFilter, QString::fromUtf8(extension)));
} }
} }
@@ -267,9 +267,9 @@ void ItemLibraryWidget::emitImportChecked()
foreach (const Import &import, m_model->imports()) { foreach (const Import &import, m_model->imports()) {
if (import.isLibraryImport()) { if (import.isLibraryImport()) {
if (import.url().contains(QString("meego"), Qt::CaseInsensitive)) if (import.url().contains(QLatin1String("meego"), Qt::CaseInsensitive))
meegoImport = true; meegoImport = true;
if (import.url().contains(QString("Qt"), Qt::CaseInsensitive) || import.url().contains(QString("QtQuick"), Qt::CaseInsensitive)) if (import.url().contains(QLatin1String("Qt"), Qt::CaseInsensitive) || import.url().contains(QLatin1String("QtQuick"), Qt::CaseInsensitive))
qtOnlyImport = true; qtOnlyImport = true;
} }
} }

18
src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
View File

@@ -138,9 +138,9 @@ Qt::DropActions NavigatorTreeModel::supportedDragActions() const
QStringList NavigatorTreeModel::mimeTypes() const QStringList NavigatorTreeModel::mimeTypes() const
{ {
QStringList types; QStringList types;
types.append("application/vnd.modelnode.list"); types.append(QLatin1String("application/vnd.modelnode.list"));
types.append("application/vnd.bauhaus.itemlibraryinfo"); types.append(QLatin1String("application/vnd.bauhaus.itemlibraryinfo"));
types.append("application/vnd.bauhaus.libraryresource"); types.append(QLatin1String("application/vnd.bauhaus.libraryresource"));
return types; return types;
} }
@@ -170,14 +170,14 @@ QMimeData *NavigatorTreeModel::mimeData(const QModelIndexList &modelIndexList) c
QByteArray encodedModelNodeData = encodeModelNodes(modelIndexList); QByteArray encodedModelNodeData = encodeModelNodes(modelIndexList);
mimeData->setData("application/vnd.modelnode.list", encodedModelNodeData); mimeData->setData(QLatin1String("application/vnd.modelnode.list"), encodedModelNodeData);
return mimeData; return mimeData;
} }
static QList<ModelNode> modelNodesFromMimeData(const QMimeData *mineData, AbstractView *view) static QList<ModelNode> modelNodesFromMimeData(const QMimeData *mineData, AbstractView *view)
{ {
QByteArray encodedModelNodeData = mineData->data("application/vnd.modelnode.list"); QByteArray encodedModelNodeData = mineData->data(QLatin1String("application/vnd.modelnode.list"));
QDataStream modelNodeStream(&encodedModelNodeData, QIODevice::ReadOnly); QDataStream modelNodeStream(&encodedModelNodeData, QIODevice::ReadOnly);
QList<ModelNode> modelNodeList; QList<ModelNode> modelNodeList;
@@ -245,11 +245,11 @@ bool NavigatorTreeModel::dropMimeData(const QMimeData *mimeData,
return true; return true;
if (dropModelIndex.model() == this) { if (dropModelIndex.model() == this) {
if (mimeData->hasFormat("application/vnd.bauhaus.itemlibraryinfo")) { if (mimeData->hasFormat(QLatin1String("application/vnd.bauhaus.itemlibraryinfo"))) {
handleItemLibraryItemDrop(mimeData, rowNumber, dropModelIndex); handleItemLibraryItemDrop(mimeData, rowNumber, dropModelIndex);
} else if (mimeData->hasFormat("application/vnd.bauhaus.libraryresource")) { } else if (mimeData->hasFormat(QLatin1String("application/vnd.bauhaus.libraryresource"))) {
handleItemLibraryImageDrop(mimeData, rowNumber, dropModelIndex); handleItemLibraryImageDrop(mimeData, rowNumber, dropModelIndex);
} else if (mimeData->hasFormat("application/vnd.modelnode.list")) { } else if (mimeData->hasFormat(QLatin1String("application/vnd.modelnode.list"))) {
handleInternalDrop(mimeData, rowNumber, dropModelIndex); handleInternalDrop(mimeData, rowNumber, dropModelIndex);
} }
} }
@@ -765,7 +765,7 @@ void NavigatorTreeModel::handleItemLibraryItemDrop(const QMimeData *mimeData, in
bool foundTarget = computeTarget(rowModelIndex, this, &targetProperty, &targetRowNumber); bool foundTarget = computeTarget(rowModelIndex, this, &targetProperty, &targetRowNumber);
if (foundTarget) { if (foundTarget) {
ItemLibraryEntry itemLibraryEntry = itemLibraryEntryFromData(mimeData->data("application/vnd.bauhaus.itemlibraryinfo")); ItemLibraryEntry itemLibraryEntry = itemLibraryEntryFromData(mimeData->data(QLatin1String("application/vnd.bauhaus.itemlibraryinfo")));
QmlItemNode newQmlItemNode = QmlItemNode::createQmlItemNode(m_view, itemLibraryEntry, QPointF(), targetProperty); QmlItemNode newQmlItemNode = QmlItemNode::createQmlItemNode(m_view, itemLibraryEntry, QPointF(), targetProperty);
if (newQmlItemNode.isValid() && targetProperty.isNodeListProperty()) { if (newQmlItemNode.isValid() && targetProperty.isNodeListProperty()) {

4
src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
View File

@@ -63,8 +63,8 @@ NavigatorWidget::NavigatorWidget(NavigatorView *view) :
setWindowTitle(tr("Navigator", "Title of navigator view")); setWindowTitle(tr("Navigator", "Title of navigator view"));
setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css"))); setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/stylesheet.css"))));
m_treeView->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css"))); m_treeView->setStyleSheet(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/scrollbar.css"))));
} }
void NavigatorWidget::setTreeModel(QAbstractItemModel* model) void NavigatorWidget::setTreeModel(QAbstractItemModel* model)

4
src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
View File

@@ -41,7 +41,7 @@
static QString s_lastBrowserPath; static QString s_lastBrowserPath;
FileResourcesModel::FileResourcesModel(QObject *parent) : FileResourcesModel::FileResourcesModel(QObject *parent) :
QObject(parent), m_filter("(*.*)"), m_lock(false) QObject(parent), m_filter(QLatin1String("(*.*)")), m_lock(false)
{ {
} }
@@ -168,7 +168,7 @@ void FileResourcesModel::setupModel()
dir = QFileInfo(m_path.toLocalFile()).dir(); dir = QFileInfo(m_path.toLocalFile()).dir();
QStringList filterList = m_filter.split(' '); QStringList filterList = m_filter.split(QLatin1Char(' '));
QDirIterator it(dir.absolutePath(), filterList, QDir::Files, QDirIterator::Subdirectories); QDirIterator it(dir.absolutePath(), filterList, QDir::Files, QDirIterator::Subdirectories);
while (it.hasNext()) { while (it.hasNext()) {

18
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
View File

@@ -93,7 +93,7 @@ PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyE
m_view(new Quick2PropertyEditorView), m_propertyEditorTransaction(new PropertyEditorTransaction(propertyEditor)), m_dummyPropertyEditorValue(new PropertyEditorValue()), m_view(new Quick2PropertyEditorView), m_propertyEditorTransaction(new PropertyEditorTransaction(propertyEditor)), m_dummyPropertyEditorValue(new PropertyEditorValue()),
m_contextObject(new PropertyEditorContextObject()) m_contextObject(new PropertyEditorContextObject())
{ {
Q_ASSERT(QFileInfo::exists(":/images/button_normal.png")); Q_ASSERT(QFileInfo(QLatin1String(":/images/button_normal.png")).exists());
m_view->engine()->setOutputWarningsToStandardError( m_view->engine()->setOutputWarningsToStandardError(
!qgetenv("QTCREATOR_QTQUICKDESIGNER_PROPERTYEDITOR_SHOW_WARNINGS").isEmpty()); !qgetenv("QTCREATOR_QTQUICKDESIGNER_PROPERTYEDITOR_SHOW_WARNINGS").isEmpty());
@@ -295,22 +295,22 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q
// anchors // anchors
m_backendAnchorBinding.setup(qmlObjectNode.modelNode()); m_backendAnchorBinding.setup(qmlObjectNode.modelNode());
context()->setContextProperty("anchorBackend", &m_backendAnchorBinding); context()->setContextProperty(QLatin1String("anchorBackend"), &m_backendAnchorBinding);
context()->setContextProperty("transaction", m_propertyEditorTransaction.data()); context()->setContextProperty(QLatin1String("transaction"), m_propertyEditorTransaction.data());
// model node // model node
m_backendModelNode.setup(qmlObjectNode.modelNode()); m_backendModelNode.setup(qmlObjectNode.modelNode());
context()->setContextProperty("modelNodeBackend", &m_backendModelNode); context()->setContextProperty(QLatin1String("modelNodeBackend"), &m_backendModelNode);
contextObject()->setSpecificsUrl(qmlSpecificsFile); contextObject()->setSpecificsUrl(qmlSpecificsFile);
contextObject()->setStateName(stateName); contextObject()->setStateName(stateName);
if (!qmlObjectNode.isValid()) if (!qmlObjectNode.isValid())
return; return;
context()->setContextProperty("propertyCount", QVariant(qmlObjectNode.modelNode().properties().count())); context()->setContextProperty(QLatin1String("propertyCount"), QVariant(qmlObjectNode.modelNode().properties().count()));
contextObject()->setIsBaseState(qmlObjectNode.isInBaseState()); contextObject()->setIsBaseState(qmlObjectNode.isInBaseState());
contextObject()->setSelectionChanged(false); contextObject()->setSelectionChanged(false);
@@ -359,9 +359,9 @@ void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl
QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant))); QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant)));
m_backendValuesPropertyMap.insert("id", QVariant::fromValue(valueObject)); m_backendValuesPropertyMap.insert("id", QVariant::fromValue(valueObject));
context()->setContextProperty("anchorBackend", &m_backendAnchorBinding); context()->setContextProperty(QLatin1String("anchorBackend"), &m_backendAnchorBinding);
context()->setContextProperty("modelNodeBackend", &m_backendModelNode); context()->setContextProperty(QLatin1String("modelNodeBackend"), &m_backendModelNode);
context()->setContextProperty("transaction", m_propertyEditorTransaction.data()); context()->setContextProperty(QLatin1String("transaction"), m_propertyEditorTransaction.data());
contextObject()->setSpecificsUrl(qmlSpecificsFile); contextObject()->setSpecificsUrl(qmlSpecificsFile);
@@ -520,7 +520,7 @@ QUrl PropertyEditorQmlBackend::getQmlUrlForModelNode(const ModelNode &modelNode,
} }
} }
} }
return fileToUrl(QDir(propertyEditorResourcesPath()).filePath("QtQuick/emptyPane.qml")); return fileToUrl(QDir(propertyEditorResourcesPath()).filePath(QLatin1String("QtQuick/emptyPane.qml")));
} }
QString PropertyEditorQmlBackend::locateQmlFile(const NodeMetaInfo &info, const QString &relativePath) QString PropertyEditorQmlBackend::locateQmlFile(const NodeMetaInfo &info, const QString &relativePath)

8
src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
View File

@@ -138,15 +138,15 @@ void StatesEditorView::addState()
QString newStateName; QString newStateName;
int index = 1; int index = 1;
while (true) { while (true) {
newStateName = QString("State%1").arg(index++); newStateName = QString(QStringLiteral("State%1")).arg(index++);
if (!modelStateNames.contains(newStateName)) if (!modelStateNames.contains(newStateName))
break; break;
} }
try { try {
if ((rootStateGroup().allStates().count() < 1) && //QtQuick import might be missing if ((rootStateGroup().allStates().count() < 1) && //QtQuick import might be missing
(!model()->hasImport(Import::createLibraryImport("QtQuick", "1.0"), true, true))) (!model()->hasImport(Import::createLibraryImport(QLatin1String("QtQuick"), QLatin1String("1.0")), true, true)))
model()->changeImports(QList<Import>() << Import::createLibraryImport("QtQuick", "1.0"), QList<Import>()); model()->changeImports(QList<Import>() << Import::createLibraryImport(QLatin1String("QtQuick"), QLatin1String("1.0")), QList<Import>());
ModelNode newState = rootStateGroup().addState(newStateName); ModelNode newState = rootStateGroup().addState(newStateName);
setCurrentState(newState); setCurrentState(newState);
} catch (const RewritingException &e) { } catch (const RewritingException &e) {
@@ -176,7 +176,7 @@ void StatesEditorView::duplicateCurrentState()
QString newName = state.name(); QString newName = state.name();
// Strip out numbers at the end of the string // Strip out numbers at the end of the string
QRegExp regEx(QString("[0-9]+$")); QRegExp regEx(QLatin1String("[0-9]+$"));
int numberIndex = newName.indexOf(regEx); int numberIndex = newName.indexOf(regEx);
if ((numberIndex != -1) && (numberIndex+regEx.matchedLength()==newName.length())) if ((numberIndex != -1) && (numberIndex+regEx.matchedLength()==newName.length()))
newName = newName.left(numberIndex); newName = newName.left(numberIndex);

4
src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
View File

@@ -76,7 +76,7 @@ void StatesEditorWidget::setNodeInstanceView(NodeInstanceView *nodeInstanceView)
void StatesEditorWidget::showAddNewStatesButton(bool showAddNewStatesButton) void StatesEditorWidget::showAddNewStatesButton(bool showAddNewStatesButton)
{ {
rootContext()->setContextProperty("canAddNewStates", showAddNewStatesButton); rootContext()->setContextProperty(QLatin1String("canAddNewStates"), showAddNewStatesButton);
} }
StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, StatesEditorModel *statesEditorModel) StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, StatesEditorModel *statesEditorModel)
@@ -101,7 +101,7 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State
rootContext()->setContextProperty(QStringLiteral("highlightColor"), Utils::StyleHelper::notTooBrightHighlightColor()); rootContext()->setContextProperty(QStringLiteral("highlightColor"), Utils::StyleHelper::notTooBrightHighlightColor());
rootContext()->setContextProperty("canAddNewStates", true); rootContext()->setContextProperty(QLatin1String("canAddNewStates"), true);
setWindowTitle(tr("States", "Title of Editor widget")); setWindowTitle(tr("States", "Title of Editor widget"));