diff options
8 files changed, 15 insertions, 15 deletions
diff --git a/src/libs/qmljs/qmljscompletioncontextfinder.cpp b/src/libs/qmljs/qmljscompletioncontextfinder.cpp index f95a8d06ca..2142cd05eb 100644 --- a/src/libs/qmljs/qmljscompletioncontextfinder.cpp +++ b/src/libs/qmljs/qmljscompletioncontextfinder.cpp @@ -308,7 +308,7 @@ void CompletionContextFinder::checkImport() if (m_libVersion.isNull()) m_libVersion = QLatin1String(""); } else { - m_libVersion = QString(); + m_libVersion.clear(); } } diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp index 2681059ffb..90204ac4e9 100644 --- a/src/plugins/diffeditor/differ.cpp +++ b/src/plugins/diffeditor/differ.cpp @@ -294,8 +294,8 @@ QList<Diff> Differ::diffNonCharMode(const QString text1, const QString text2) // Rediff here on char basis newDiffList += preprocess1AndDiff(lastDelete, lastInsert); - lastDelete = QString(); - lastInsert = QString(); + lastDelete.clear(); + lastInsert.clear(); } newDiffList.append(diffItem); } @@ -406,8 +406,8 @@ QList<Diff> Differ::merge(const QList<Diff> &diffList) newDiffList.append(Diff(Diff::Insert, lastInsert)); if (diff.text.count()) newDiffList.append(diff); - lastDelete = QString(); - lastInsert = QString(); + lastDelete.clear(); + lastInsert.clear(); } else { // join with last equal diff if (newDiffList.count() && newDiffList.last().command == Diff::Equal) { diff --git a/src/plugins/madde/maemodeviceconfigwizard.cpp b/src/plugins/madde/maemodeviceconfigwizard.cpp index c2baeb8f4a..f80b3b4169 100644 --- a/src/plugins/madde/maemodeviceconfigwizard.cpp +++ b/src/plugins/madde/maemodeviceconfigwizard.cpp @@ -561,7 +561,7 @@ IDevice::Ptr MaemoDeviceConfigWizard::device() sshParams.port = d->wizardData.sshPort; if (d->wizardData.machineType == IDevice::Emulator) { sshParams.authenticationType = QSsh::SshConnectionParameters::AuthenticationByPassword; - sshParams.password = QString(); + sshParams.password.clear(); sshParams.timeout = 30; freePortsSpec = QLatin1String("13219,14168"); doTest = false; diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp index 77fc504bb2..191dce43d8 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp @@ -143,7 +143,7 @@ MetaInfoReader::ParserSate MetaInfoReader::readDocument(const QString &name) { if (name == QLatin1String(rootElementName)) { m_currentClassName.clear(); - m_currentIcon = QString(); + m_currentIcon.clear(); return ParsingMetaInfo; } else { addErrorInvalidType(name); @@ -154,8 +154,8 @@ MetaInfoReader::ParserSate MetaInfoReader::readDocument(const QString &name) MetaInfoReader::ParserSate MetaInfoReader::readMetaInfoRootElement(const QString &name) { if (name == QLatin1String(typeElementName)) { - m_currentClassName .clear(); - m_currentIcon = QString(); + m_currentClassName.clear(); + m_currentIcon.clear(); return ParsingType; } else { addErrorInvalidType(name); @@ -183,7 +183,7 @@ MetaInfoReader::ParserSate MetaInfoReader::readItemLibraryEntryElement(const QSt return ParsingQmlSource; } else if (name == PropertyElementName) { m_currentPropertyName = PropertyName(); - m_currentPropertyType = QString(); + m_currentPropertyType.clear(); m_currentPropertyValue = QVariant(); return ParsingProperty; } else { diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.cpp b/src/plugins/qt4projectmanager/profilehoverhandler.cpp index 16b3ed8568..2aab3a4aad 100644 --- a/src/plugins/qt4projectmanager/profilehoverhandler.cpp +++ b/src/plugins/qt4projectmanager/profilehoverhandler.cpp @@ -69,7 +69,7 @@ bool ProFileHoverHandler::acceptEditor(IEditor *editor) void ProFileHoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos) { - m_docFragment = QString(); + m_docFragment.clear(); m_manualKind = UnknownManual; if (ProFileEditorWidget *proFileEditor = qobject_cast<ProFileEditorWidget *>(editor->widget())) { if (!proFileEditor->extraSelectionTooltip(pos).isEmpty()) { diff --git a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp index 325549db61..6cb3c80b87 100644 --- a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp +++ b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp @@ -74,7 +74,7 @@ void DefaultAssistInterface::prepareForAsyncUse() void DefaultAssistInterface::recreateTextDocument() { m_textDocument = new QTextDocument(m_text); - m_text = QString(); + m_text.clear(); } AssistReason DefaultAssistInterface::reason() const diff --git a/src/plugins/texteditor/codestylepool.cpp b/src/plugins/texteditor/codestylepool.cpp index 102ca1a225..d3c255906e 100644 --- a/src/plugins/texteditor/codestylepool.cpp +++ b/src/plugins/texteditor/codestylepool.cpp @@ -245,7 +245,7 @@ ICodeStylePreferences *CodeStylePool::loadCodeStyle(const Utils::FileName &fileN codeStyle = d->m_factory->createCodeStyle(); codeStyle->setId(id); codeStyle->setDisplayName(displayName); - codeStyle->fromMap(QString::null, map); + codeStyle->fromMap(QString(), map); addCodeStyle(codeStyle); } @@ -284,7 +284,7 @@ void CodeStylePool::saveCodeStyle(ICodeStylePreferences *codeStyle) const void CodeStylePool::exportCodeStyle(const Utils::FileName &fileName, ICodeStylePreferences *codeStyle) const { QVariantMap map; - codeStyle->toMap(QString::null, &map); + codeStyle->toMap(QString(), &map); QVariantMap tmp; tmp.insert(QLatin1String(displayNameKey), codeStyle->displayName()); diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp index 5fbf9fe23c..41437c0c39 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.cpp +++ b/src/plugins/texteditor/codestyleselectorwidget.cpp @@ -343,7 +343,7 @@ void CodeStyleSelectorWidget::slotRemoveClicked() void CodeStyleSelectorWidget::slotImportClicked() { const Utils::FileName fileName = - Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Import Code Style"), QString::null, + Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Import Code Style"), QString(), tr("Code styles (*.xml);;All files (*)"))); if (!fileName.isEmpty()) { CodeStylePool *codeStylePool = m_codeStyle->delegatingPool(); |