From 6a67f00e06c20a8141dfd1cf71d400f444d28add Mon Sep 17 00:00:00 2001 From: Christiaan Janssen Date: Tue, 9 Feb 2010 10:44:38 +0100 Subject: [PATCH] QmlDesigner: Fixed minor issues --- src/plugins/qmldesigner/components/logger/logger.cpp | 4 ++-- src/plugins/qmldesigner/components/logger/logger.h | 2 +- .../qmldesigner/components/stateseditor/stateslist.qml | 1 - src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp | 2 +- .../qmldesigner/core/filemanager/moveobjectvisitor.cpp | 2 +- src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp | 2 +- src/plugins/qmldesigner/core/include/rewriterview.h | 2 +- src/plugins/qmldesigner/core/metainfo/itemlibraryinfo.cpp | 2 +- src/plugins/qmldesigner/core/model/internalproperty.cpp | 2 +- src/plugins/qmldesigner/core/model/qmlanchors.cpp | 4 ++-- src/plugins/qmldesigner/core/model/qmltextgenerator.cpp | 2 +- src/plugins/qmldesigner/core/model/rewriterview.cpp | 2 +- src/plugins/qmldesigner/designmodewidget.cpp | 2 +- src/tools/qmldesigner/standalone/mainwindow.cpp | 4 ++-- 14 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/plugins/qmldesigner/components/logger/logger.cpp b/src/plugins/qmldesigner/components/logger/logger.cpp index 93c91944d23..71668f3a8de 100644 --- a/src/plugins/qmldesigner/components/logger/logger.cpp +++ b/src/plugins/qmldesigner/components/logger/logger.cpp @@ -71,9 +71,9 @@ void QLogger::setSilent(bool silent) instance()->m_silent = silent; } -void QLogger::setModul(const QString &modul) +void QLogger::setModul(const QString &module) { - instance()->m_modul = modul; + instance()->m_modul = module; } void QLogger::setFilename(const QString &filename) diff --git a/src/plugins/qmldesigner/components/logger/logger.h b/src/plugins/qmldesigner/components/logger/logger.h index 73f13cdb72a..ab6a93eca4f 100644 --- a/src/plugins/qmldesigner/components/logger/logger.h +++ b/src/plugins/qmldesigner/components/logger/logger.h @@ -49,7 +49,7 @@ public: setEnabled(false); } static void setLevel(int level); - static void setModul(const QString &modul); + static void setModul(const QString &module); static void setFilename(const QString &filename); static void setEnabled(bool enabled); static void setFlush(int msec); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml index fd3bb0b57df..b5e791e1461 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml +++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml @@ -76,7 +76,6 @@ Rectangle { anchors.horizontalCenter:parent.horizontalCenter anchors.bottom:parent.bottom anchors.bottomMargin:12 - y:18 } } diff --git a/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp index 731b15808ab..f2b0c43d90a 100644 --- a/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp +++ b/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp @@ -72,7 +72,7 @@ bool AddObjectVisitor::visit(QmlJS::AST::UiObjectDefinition *ast) void AddObjectVisitor::insertInto(QmlJS::AST::UiObjectInitializer *ast) { - UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, QString::null, m_propertyOrder); + UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, QString(), m_propertyOrder); int insertionPoint; int indentDepth; diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp index e902d2a348d..85dee276662 100644 --- a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp +++ b/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp @@ -87,7 +87,7 @@ private: { if (targetPropertyName.isEmpty()) { // insert as UiObjectDefinition: - UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, QString::null, propertyOrder); + UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, QString(), propertyOrder); if (insertAfter && insertAfter->member) { moveInfo.destination = insertAfter->member->lastSourceLocation().end(); diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp index 95d5aa579d6..c06aa7b27ad 100644 --- a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp +++ b/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp @@ -294,7 +294,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m int idx = propertyOrder.indexOf(propertyName); if (idx == -1) - idx = propertyOrder.indexOf(QString::null); + idx = propertyOrder.indexOf(QString()); if (idx == -1) idx = propertyOrder.size() - 1; diff --git a/src/plugins/qmldesigner/core/include/rewriterview.h b/src/plugins/qmldesigner/core/include/rewriterview.h index 1724fbab1b7..17568e6b70d 100644 --- a/src/plugins/qmldesigner/core/include/rewriterview.h +++ b/src/plugins/qmldesigner/core/include/rewriterview.h @@ -145,7 +145,7 @@ public: void enterErrorState(const QString &errorMessage); bool inErrorState() const { return !m_rewritingErrorMessage.isEmpty(); } - void leaveErrorState() { m_rewritingErrorMessage = QString::null; } + void leaveErrorState() { m_rewritingErrorMessage.clear(); } void resetToLastCorrectQml(); QMap extractText(const QList &nodes) const; diff --git a/src/plugins/qmldesigner/core/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/core/metainfo/itemlibraryinfo.cpp index e7981e99a87..f05a749e26c 100644 --- a/src/plugins/qmldesigner/core/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/core/metainfo/itemlibraryinfo.cpp @@ -92,7 +92,7 @@ QList ItemLibraryInfo::properties() const ItemLibraryInfo::ItemLibraryInfo() : m_data(new Internal::ItemLibraryInfoData) { - m_data->name = QString(); + m_data->name.clear(); } ItemLibraryInfo::~ItemLibraryInfo() diff --git a/src/plugins/qmldesigner/core/model/internalproperty.cpp b/src/plugins/qmldesigner/core/model/internalproperty.cpp index afb1831dfe8..6039362ef99 100644 --- a/src/plugins/qmldesigner/core/model/internalproperty.cpp +++ b/src/plugins/qmldesigner/core/model/internalproperty.cpp @@ -166,7 +166,7 @@ void InternalProperty::setDynamicTypeName(const QString &name) void InternalProperty::resetDynamicTypeName() { - m_dynamicType = QString(); + m_dynamicType.clear(); } diff --git a/src/plugins/qmldesigner/core/model/qmlanchors.cpp b/src/plugins/qmldesigner/core/model/qmlanchors.cpp index bf4b31eefc1..1504c58a3d0 100644 --- a/src/plugins/qmldesigner/core/model/qmlanchors.cpp +++ b/src/plugins/qmldesigner/core/model/qmlanchors.cpp @@ -53,7 +53,7 @@ static QString lineTypeToString(AnchorLine::Type lineType) case AnchorLine::Baseline: return QLatin1String("baseline"); case AnchorLine::Fill: return QLatin1String("fill"); case AnchorLine::Center: return QLatin1String("centerIn"); - default: return QString::null; + default: return QString(); } } @@ -101,7 +101,7 @@ static QString marginPropertyName(AnchorLine::Type lineType) case AnchorLine::Bottom: return QLatin1String("anchors.bottomMargin"); case AnchorLine::HorizontalCenter: return QLatin1String("anchors.horizontalCenterOffset"); case AnchorLine::VerticalCenter: return QLatin1String("anchors.verticalCenterOffset"); - default: return QString::null; + default: return QString(); } } diff --git a/src/plugins/qmldesigner/core/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/core/model/qmltextgenerator.cpp index 4da1e2ad31e..daf4f74e087 100644 --- a/src/plugins/qmldesigner/core/model/qmltextgenerator.cpp +++ b/src/plugins/qmldesigner/core/model/qmltextgenerator.cpp @@ -101,7 +101,7 @@ QString QmlTextGenerator::toQml(const AbstractProperty &property, int indentDept } } else { Q_ASSERT("Unknown property type"); - return QString::null; + return QString(); } } diff --git a/src/plugins/qmldesigner/core/model/rewriterview.cpp b/src/plugins/qmldesigner/core/model/rewriterview.cpp index 61194d1e609..b36a898471f 100644 --- a/src/plugins/qmldesigner/core/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/core/model/rewriterview.cpp @@ -449,7 +449,7 @@ QMap RewriterView::extractText(const QList &nodes const int nodeLocation = m_positionStorage->nodeOffset(node); if (nodeLocation == ModelNodePositionStorage::INVALID_LOCATION) - result.insert(node, QString::null); + result.insert(node, QString()); else result.insert(node, extract(nodeLocation)); } diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 986a8b868f7..d075d28ee52 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -529,7 +529,7 @@ void DesignModeWidget::showEditor(Core::IEditor *editor) m_currentTextEdit = textEdit; DocumentWidget *documentWidget = 0; - if (textEdit && textEditor && fileName.endsWith(".qml")) { + if (textEdit && textEditor && fileName.endsWith(QLatin1String(".qml"))) { if (m_documentHash.contains(textEdit)) { documentWidget = m_documentHash.value(textEdit); } else { diff --git a/src/tools/qmldesigner/standalone/mainwindow.cpp b/src/tools/qmldesigner/standalone/mainwindow.cpp index 77fe96551dd..e2e256bc7f2 100644 --- a/src/tools/qmldesigner/standalone/mainwindow.cpp +++ b/src/tools/qmldesigner/standalone/mainwindow.cpp @@ -62,7 +62,7 @@ class StyleAction: public QAction { public: StyleAction(const QString& text, const QString& styleName, QObject* parent): QAction(text, parent), m_styleName(styleName) {} - StyleAction(const QString& text, QObject* parent): QAction(text, parent), m_styleName(QString::null) {} + StyleAction(const QString& text, QObject* parent): QAction(text, parent), m_styleName(QString()) {} QString styleName() const { return m_styleName; } @@ -73,7 +73,7 @@ private: MainWindow::MainWindow(QWidget* parent): QMainWindow(parent), m_shutdown(false), - m_lastPath(QString::null), + m_lastPath(QString()), m_documentCount(0), m_menuBar(new QMenuBar(this)), m_itemLibraryController(new ItemLibraryController(this)),