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

Use even less nullptr for default flags

Browse Source 
Change-Id: I5ec30de3e41dfc1c7bf6d5f5e36991eadcbbfb72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-01-17 15:50:46 +01:00
parent a3447f6eb2
commit 7e19d1af7c
12 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/utils/savefile.cpp
View File

@@ -36,7 +36,7 @@
namespace Utils {
QFile::Permissions SaveFile::m_umask = nullptr;
static QFile::Permissions m_umask = {};
SaveFile::SaveFile(const QString &filename) :
m_finalFileName(filename)
@@ -207,15 +207,15 @@ void SaveFile::initializeUmask()
mode_t mask = umask(0); // get current umask
umask(mask); // set it back
m_umask = ((mask & S_IRUSR) ? QFile::ReadOwner : QFlags<QFile::Permission>(nullptr))
| ((mask & S_IWUSR) ? QFile::WriteOwner : QFlags<QFile::Permission>(nullptr))
| ((mask & S_IXUSR) ? QFile::ExeOwner : QFlags<QFile::Permission>(nullptr))
| ((mask & S_IRGRP) ? QFile::ReadGroup : QFlags<QFile::Permission>(nullptr))
| ((mask & S_IWGRP) ? QFile::WriteGroup : QFlags<QFile::Permission>(nullptr))
| ((mask & S_IXGRP) ? QFile::ExeGroup : QFlags<QFile::Permission>(nullptr))
| ((mask & S_IROTH) ? QFile::ReadOther : QFlags<QFile::Permission>(nullptr))
| ((mask & S_IWOTH) ? QFile::WriteOther : QFlags<QFile::Permission>(nullptr))
| ((mask & S_IXOTH) ? QFile::ExeOther : QFlags<QFile::Permission>(nullptr));
m_umask = ((mask & S_IRUSR) ? QFile::ReadOwner : QFlags<QFile::Permission>())
| ((mask & S_IWUSR) ? QFile::WriteOwner : QFlags<QFile::Permission>())
| ((mask & S_IXUSR) ? QFile::ExeOwner : QFlags<QFile::Permission>())
| ((mask & S_IRGRP) ? QFile::ReadGroup : QFlags<QFile::Permission>())
| ((mask & S_IWGRP) ? QFile::WriteGroup : QFlags<QFile::Permission>())
| ((mask & S_IXGRP) ? QFile::ExeGroup : QFlags<QFile::Permission>())
| ((mask & S_IROTH) ? QFile::ReadOther : QFlags<QFile::Permission>())
| ((mask & S_IWOTH) ? QFile::WriteOther : QFlags<QFile::Permission>())
| ((mask & S_IXOTH) ? QFile::ExeOther : QFlags<QFile::Permission>());
#endif
}

1
src/libs/utils/savefile.h
View File

@@ -52,7 +52,6 @@ private:
const QString m_finalFileName;
std::unique_ptr<QTemporaryFile> m_tempFile;
bool m_finalized = true;
static QFile::Permissions m_umask;
};
} // namespace Utils

2
src/plugins/bineditor/bineditorplugin.cpp
View File

@@ -148,7 +148,7 @@ public:
} else {
result = NotFound;
m_contPos = -1;
m_widget->highlightSearchResults(QByteArray(), nullptr);
m_widget->highlightSearchResults(QByteArray(), {});
}
}
return result;

6
src/plugins/bineditor/bineditorwidget.h
View File

@@ -97,8 +97,7 @@ public:
void setReadOnly(bool);
bool isReadOnly() const;
int find(const QByteArray &pattern, qint64 from = 0,
QTextDocument::FindFlags findFlags = nullptr);
int find(const QByteArray &pattern, qint64 from = 0, QTextDocument::FindFlags findFlags = {});
void selectAll();
void clear();
@@ -124,8 +123,7 @@ public:
QList<Markup> markup() const { return m_markup; }
void setFontSettings(const TextEditor::FontSettings &fs);
void highlightSearchResults(const QByteArray &pattern,
QTextDocument::FindFlags findFlags = nullptr);
void highlightSearchResults(const QByteArray &pattern, QTextDocument::FindFlags findFlags = {});
void copy(bool raw = false);
void setMarkup(const QList<Markup> &markup);
void setNewWindowRequestAllowed(bool c);

2
src/plugins/clangrefactoring/clangqueryprojectsfindfilter.h
View File

@@ -62,7 +62,7 @@ public:
bool isEnabled() const override;
void requestSourceRangesAndDiagnostics(const QString &queryText, const QString &exampleContent);
SearchHandle *find(const QString &queryText);
void findAll(const QString &queryText, Core::FindFlags findFlags = nullptr) override;
void findAll(const QString &queryText, Core::FindFlags findFlags = {}) override;
bool showSearchTermInput() const override;
Core::FindFlags supportedFindFlags() const override;

2
src/plugins/clangrefactoring/clangrefactoringplugin.cpp
View File

@@ -88,7 +88,7 @@ public:
ClangPchManager::ProgressManager progressManager{
[] (QFutureInterface<void> &promise) {
auto title = QCoreApplication::translate("ClangRefactoringProgressManager", "C++ Indexing");
Core::ProgressManager::addTask(promise.future(), title, "clang indexing", nullptr);}};
Core::ProgressManager::addTask(promise.future(), title, "clang indexing", {});}};
RefactoringClient refactoringClient{progressManager};
QtCreatorEditorManager editorManager{filePathCache};
ClangBackEnd::RefactoringConnectionClient connectionClient{&refactoringClient};

2
src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
View File

@@ -223,7 +223,7 @@ Qt::ItemFlags ExternalToolModel::flags(const QModelIndex &index) const
return TOOLSMENU_ITEM_FLAGS;
return CATEGORY_ITEM_FLAGS;
}
return nullptr;
return {};
}
bool ExternalToolModel::setData(const QModelIndex &modelIndex, const QVariant &value, int role)

2
src/plugins/coreplugin/find/findplugin.h
View File

@@ -54,7 +54,7 @@ public:
static FindFlags findFlags();
static bool hasFindFlag(FindFlag flag);
static void updateFindCompletion(const QString &text, FindFlags flags = nullptr);
static void updateFindCompletion(const QString &text, FindFlags flags = {});
static void updateReplaceCompletion(const QString &text);
static QAbstractListModel *findCompletionModel();
static QStringListModel *replaceCompletionModel();

2
src/plugins/cpptools/cppcodestylesettingspage.cpp
View File

@@ -75,7 +75,7 @@ static void applyRefactorings(QTextDocument *textDocument, TextEditorWidget *edi
// Run the formatter
Overview overview;
overview.showReturnTypes = true;
overview.starBindFlags = Overview::StarBindFlags(nullptr);
overview.starBindFlags = {};
if (settings.bindStarToIdentifier)
overview.starBindFlags |= Overview::BindToIdentifier;

4
src/plugins/cpptools/symbolsearcher_test.cpp
View File

@@ -258,7 +258,7 @@ void CppToolsPlugin::test_builtinsymbolsearcher_data()
// Check Enums
searchParameters = SymbolSearcher::Parameters();
searchParameters.text = _("enum");
searchParameters.flags = nullptr;
searchParameters.flags = {};
searchParameters.types = SymbolSearcher::Enums;
searchParameters.scope = SymbolSearcher::SearchGlobal;
QTest::newRow("BuiltinSymbolSearcher::Enums")
@@ -273,7 +273,7 @@ void CppToolsPlugin::test_builtinsymbolsearcher_data()
// Check Declarations
searchParameters = SymbolSearcher::Parameters();
searchParameters.text = _("myvar");
searchParameters.flags = nullptr;
searchParameters.flags = {};
searchParameters.types = SymbolSearcher::Declarations;
searchParameters.scope = SymbolSearcher::SearchGlobal;
QTest::newRow("BuiltinSymbolSearcher::Declarations")

2
src/plugins/help/helpwidget.cpp
View File

@@ -975,7 +975,7 @@ void HelpWidget::highlightSearchTerms()
auto viewer = qobject_cast<HelpViewer *>(sender());
QTC_ASSERT(viewer, return);
foreach (const QString& term, m_searchTerms)
viewer->findText(term, nullptr, false, true);
viewer->findText(term, {}, false, true);
m_searchTerms.clear();
}

2
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -1643,7 +1643,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
return ReturnFalse;
}
QString parseInto;
LoadFlags flags = 0;
LoadFlags flags = {};
if (m_cumulative)
flags = LoadSilent;
if (args.count() >= 2) {