summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2020-01-21 10:06:04 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2020-01-21 10:07:22 +0000
commit8c6e6d1dbde1967b64f4fdfa708a0f20de9b630c (patch)
tree935627e1143de8525716328d91c9483daeaf6e76
parent6ff762be51d8f4d0d35485fef73aceec31ef91f1 (diff)
downloadqt-creator-8c6e6d1dbde1967b64f4fdfa708a0f20de9b630c.tar.gz
Don't initialize QFlags unnecessarily
And if needed, do it with {} instead of with nullptr or 0. Change-Id: Iae80253cd334494cfe1d69ec1552d710f2a31ad2 Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/libs/utils/savefile.cpp2
-rw-r--r--src/plugins/cpptools/symbolsearcher_test.cpp6
-rw-r--r--src/plugins/help/webenginehelpviewer.cpp2
-rw-r--r--src/plugins/projectexplorer/customwizard/customwizard.cpp2
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp2
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp2
-rw-r--r--src/shared/proparser/qmakebuiltins.cpp2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp
index 3466667509..e96845e74b 100644
--- a/src/libs/utils/savefile.cpp
+++ b/src/libs/utils/savefile.cpp
@@ -36,7 +36,7 @@
namespace Utils {
-static QFile::Permissions m_umask = {};
+static QFile::Permissions m_umask;
SaveFile::SaveFile(const QString &filename) :
m_finalFileName(filename)
diff --git a/src/plugins/cpptools/symbolsearcher_test.cpp b/src/plugins/cpptools/symbolsearcher_test.cpp
index b1793beedd..0e9f5a5804 100644
--- a/src/plugins/cpptools/symbolsearcher_test.cpp
+++ b/src/plugins/cpptools/symbolsearcher_test.cpp
@@ -164,7 +164,7 @@ void CppToolsPlugin::test_builtinsymbolsearcher_data()
// Check All Symbol Types
searchParameters = SymbolSearcher::Parameters();
searchParameters.text = _("");
- searchParameters.flags = nullptr;
+ searchParameters.flags = {};
searchParameters.types = SearchSymbols::AllTypes;
searchParameters.scope = SymbolSearcher::SearchGlobal;
QTest::newRow("BuiltinSymbolSearcher::AllTypes")
@@ -218,7 +218,7 @@ void CppToolsPlugin::test_builtinsymbolsearcher_data()
// Check Classes
searchParameters = SymbolSearcher::Parameters();
searchParameters.text = _("myclass");
- searchParameters.flags = nullptr;
+ searchParameters.flags = {};
searchParameters.types = SymbolSearcher::Classes;
searchParameters.scope = SymbolSearcher::SearchGlobal;
QTest::newRow("BuiltinSymbolSearcher::Classes")
@@ -233,7 +233,7 @@ void CppToolsPlugin::test_builtinsymbolsearcher_data()
// Check Functions
searchParameters = SymbolSearcher::Parameters();
searchParameters.text = _("fun");
- searchParameters.flags = nullptr;
+ searchParameters.flags = {};
searchParameters.types = SymbolSearcher::Functions;
searchParameters.scope = SymbolSearcher::SearchGlobal;
QTest::newRow("BuiltinSymbolSearcher::Functions")
diff --git a/src/plugins/help/webenginehelpviewer.cpp b/src/plugins/help/webenginehelpviewer.cpp
index d641df1ac8..6801bd9b53 100644
--- a/src/plugins/help/webenginehelpviewer.cpp
+++ b/src/plugins/help/webenginehelpviewer.cpp
@@ -260,7 +260,7 @@ bool WebEngineHelpViewer::findText(const QString &text, Core::FindFlags flags, b
Q_UNUSED(fromSearch)
if (wrapped)
*wrapped = false; // missing feature in QWebEngine
- QWebEnginePage::FindFlags webEngineFlags = 0;
+ QWebEnginePage::FindFlags webEngineFlags;
if (flags & Core::FindBackward)
webEngineFlags |= QWebEnginePage::FindBackward;
if (flags & Core::FindCaseSensitively)
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index 1f92543431..538dfbfa61 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -213,7 +213,7 @@ static inline bool createFile(CustomWizardFile cwFile,
generatedFile.setContents(CustomWizardContext::processFile(fm, contentsIn));
}
- Core::GeneratedFile::Attributes attributes = {};
+ Core::GeneratedFile::Attributes attributes;
if (cwFile.openEditor)
attributes |= Core::GeneratedFile::OpenEditorAttribute;
if (cwFile.openProject)
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index 856c4fcd35..a9fb2b54a8 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -660,7 +660,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir,
return false;
}
- WizardFlags flags = {};
+ WizardFlags flags;
if (data.value(QLatin1String(PLATFORM_INDEPENDENT_KEY), false).toBool())
flags |= PlatformIndependent;
setFlags(flags);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
index d510e187fa..117369e10b 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
@@ -141,7 +141,7 @@ Core::GeneratedFile JsonWizardFileGenerator::generateFile(const File &file,
}
}
- Core::GeneratedFile::Attributes attributes = {};
+ Core::GeneratedFile::Attributes attributes;
if (JsonWizard::boolFromVariant(file.openInEditor, expander))
attributes |= Core::GeneratedFile::OpenEditorAttribute;
if (JsonWizard::boolFromVariant(file.openAsProject, expander))
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index 89c097a2fa..f7d2a43038 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -1643,7 +1643,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
return ReturnFalse;
}
QString parseInto;
- LoadFlags flags = {};
+ LoadFlags flags;
if (m_cumulative)
flags = LoadSilent;
if (args.count() >= 2) {