Fix Krazy warnings about QString::null/clear().

Change-Id: I11faa5af0c186a9126c4af6f86e56250030d6cd9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Friedemann Kleint
2013-03-08 16:09:03 +01:00
parent 0d3b54f410
commit 9f7a1e3d65
8 changed files with 15 additions and 15 deletions

View File

@@ -308,7 +308,7 @@ void CompletionContextFinder::checkImport()
if (m_libVersion.isNull()) if (m_libVersion.isNull())
m_libVersion = QLatin1String(""); m_libVersion = QLatin1String("");
} else { } else {
m_libVersion = QString(); m_libVersion.clear();
} }
} }

View File

@@ -294,8 +294,8 @@ QList<Diff> Differ::diffNonCharMode(const QString text1, const QString text2)
// Rediff here on char basis // Rediff here on char basis
newDiffList += preprocess1AndDiff(lastDelete, lastInsert); newDiffList += preprocess1AndDiff(lastDelete, lastInsert);
lastDelete = QString(); lastDelete.clear();
lastInsert = QString(); lastInsert.clear();
} }
newDiffList.append(diffItem); newDiffList.append(diffItem);
} }
@@ -406,8 +406,8 @@ QList<Diff> Differ::merge(const QList<Diff> &diffList)
newDiffList.append(Diff(Diff::Insert, lastInsert)); newDiffList.append(Diff(Diff::Insert, lastInsert));
if (diff.text.count()) if (diff.text.count())
newDiffList.append(diff); newDiffList.append(diff);
lastDelete = QString(); lastDelete.clear();
lastInsert = QString(); lastInsert.clear();
} else { // join with last equal diff } else { // join with last equal diff
if (newDiffList.count() if (newDiffList.count()
&& newDiffList.last().command == Diff::Equal) { && newDiffList.last().command == Diff::Equal) {

View File

@@ -561,7 +561,7 @@ IDevice::Ptr MaemoDeviceConfigWizard::device()
sshParams.port = d->wizardData.sshPort; sshParams.port = d->wizardData.sshPort;
if (d->wizardData.machineType == IDevice::Emulator) { if (d->wizardData.machineType == IDevice::Emulator) {
sshParams.authenticationType = QSsh::SshConnectionParameters::AuthenticationByPassword; sshParams.authenticationType = QSsh::SshConnectionParameters::AuthenticationByPassword;
sshParams.password = QString(); sshParams.password.clear();
sshParams.timeout = 30; sshParams.timeout = 30;
freePortsSpec = QLatin1String("13219,14168"); freePortsSpec = QLatin1String("13219,14168");
doTest = false; doTest = false;

View File

@@ -143,7 +143,7 @@ MetaInfoReader::ParserSate MetaInfoReader::readDocument(const QString &name)
{ {
if (name == QLatin1String(rootElementName)) { if (name == QLatin1String(rootElementName)) {
m_currentClassName.clear(); m_currentClassName.clear();
m_currentIcon = QString(); m_currentIcon.clear();
return ParsingMetaInfo; return ParsingMetaInfo;
} else { } else {
addErrorInvalidType(name); addErrorInvalidType(name);
@@ -155,7 +155,7 @@ MetaInfoReader::ParserSate MetaInfoReader::readMetaInfoRootElement(const QString
{ {
if (name == QLatin1String(typeElementName)) { if (name == QLatin1String(typeElementName)) {
m_currentClassName.clear(); m_currentClassName.clear();
m_currentIcon = QString(); m_currentIcon.clear();
return ParsingType; return ParsingType;
} else { } else {
addErrorInvalidType(name); addErrorInvalidType(name);
@@ -183,7 +183,7 @@ MetaInfoReader::ParserSate MetaInfoReader::readItemLibraryEntryElement(const QSt
return ParsingQmlSource; return ParsingQmlSource;
} else if (name == PropertyElementName) { } else if (name == PropertyElementName) {
m_currentPropertyName = PropertyName(); m_currentPropertyName = PropertyName();
m_currentPropertyType = QString(); m_currentPropertyType.clear();
m_currentPropertyValue = QVariant(); m_currentPropertyValue = QVariant();
return ParsingProperty; return ParsingProperty;
} else { } else {

View File

@@ -69,7 +69,7 @@ bool ProFileHoverHandler::acceptEditor(IEditor *editor)
void ProFileHoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos) void ProFileHoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos)
{ {
m_docFragment = QString(); m_docFragment.clear();
m_manualKind = UnknownManual; m_manualKind = UnknownManual;
if (ProFileEditorWidget *proFileEditor = qobject_cast<ProFileEditorWidget *>(editor->widget())) { if (ProFileEditorWidget *proFileEditor = qobject_cast<ProFileEditorWidget *>(editor->widget())) {
if (!proFileEditor->extraSelectionTooltip(pos).isEmpty()) { if (!proFileEditor->extraSelectionTooltip(pos).isEmpty()) {

View File

@@ -74,7 +74,7 @@ void DefaultAssistInterface::prepareForAsyncUse()
void DefaultAssistInterface::recreateTextDocument() void DefaultAssistInterface::recreateTextDocument()
{ {
m_textDocument = new QTextDocument(m_text); m_textDocument = new QTextDocument(m_text);
m_text = QString(); m_text.clear();
} }
AssistReason DefaultAssistInterface::reason() const AssistReason DefaultAssistInterface::reason() const

View File

@@ -245,7 +245,7 @@ ICodeStylePreferences *CodeStylePool::loadCodeStyle(const Utils::FileName &fileN
codeStyle = d->m_factory->createCodeStyle(); codeStyle = d->m_factory->createCodeStyle();
codeStyle->setId(id); codeStyle->setId(id);
codeStyle->setDisplayName(displayName); codeStyle->setDisplayName(displayName);
codeStyle->fromMap(QString::null, map); codeStyle->fromMap(QString(), map);
addCodeStyle(codeStyle); addCodeStyle(codeStyle);
} }
@@ -284,7 +284,7 @@ void CodeStylePool::saveCodeStyle(ICodeStylePreferences *codeStyle) const
void CodeStylePool::exportCodeStyle(const Utils::FileName &fileName, ICodeStylePreferences *codeStyle) const void CodeStylePool::exportCodeStyle(const Utils::FileName &fileName, ICodeStylePreferences *codeStyle) const
{ {
QVariantMap map; QVariantMap map;
codeStyle->toMap(QString::null, &map); codeStyle->toMap(QString(), &map);
QVariantMap tmp; QVariantMap tmp;
tmp.insert(QLatin1String(displayNameKey), codeStyle->displayName()); tmp.insert(QLatin1String(displayNameKey), codeStyle->displayName());

View File

@@ -343,7 +343,7 @@ void CodeStyleSelectorWidget::slotRemoveClicked()
void CodeStyleSelectorWidget::slotImportClicked() void CodeStyleSelectorWidget::slotImportClicked()
{ {
const Utils::FileName fileName = 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 (*)"))); tr("Code styles (*.xml);;All files (*)")));
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
CodeStylePool *codeStylePool = m_codeStyle->delegatingPool(); CodeStylePool *codeStylePool = m_codeStyle->delegatingPool();