diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2018-07-19 16:39:41 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-07-20 13:36:22 +0000 |
| commit | e38410b76c40ffde33cf1ab405926cd243c4e48c (patch) | |
| tree | 309d0b90474b3eebfbdeb2f30a9f923393b28069 /src/libs/utils/filesearch.cpp | |
| parent | 1d894c0f7a41512005c3ddaa3705e3fdc639c6db (diff) | |
| download | qt-creator-e38410b76c40ffde33cf1ab405926cd243c4e48c.tar.gz | |
Utils: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default
Change-Id: I8d44d9405011a1878353baf9325f7af90b89db02
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/utils/filesearch.cpp')
| -rw-r--r-- | src/libs/utils/filesearch.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 4243ce7d7c..c34532a1de 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -42,14 +42,14 @@ static inline QString msgCanceled(const QString &searchTerm, int numMatches, int { return QCoreApplication::translate("Utils::FileSearch", "%1: canceled. %n occurrences found in %2 files.", - 0, numMatches).arg(searchTerm).arg(numFilesSearched); + nullptr, numMatches).arg(searchTerm).arg(numFilesSearched); } static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched) { return QCoreApplication::translate("Utils::FileSearch", "%1: %n occurrences found in %2 files.", - 0, numMatches).arg(searchTerm).arg(numFilesSearched); + nullptr, numMatches).arg(searchTerm).arg(numFilesSearched); } namespace { @@ -301,7 +301,7 @@ struct SearchState { SearchState(const QString &term, FileIterator *iterator) : searchTerm(term), files(iterator) {} QString searchTerm; - FileIterator *files = 0; + FileIterator *files = nullptr; FileSearchResultList cachedResults; int numFilesSearched = 0; int numMatches = 0; @@ -649,7 +649,7 @@ SubDirFileIterator::SubDirFileIterator(const QStringList &directories, const QSt : m_filterFiles(filterFilesFunction(filters, exclusionFilters)), m_progress(0) { - m_encoding = (encoding == 0 ? QTextCodec::codecForLocale() : encoding); + m_encoding = (encoding == nullptr ? QTextCodec::codecForLocale() : encoding); qreal maxPer = qreal(MAX_PROGRESS) / directories.count(); foreach (const QString &directoryEntry, directories) { if (!directoryEntry.isEmpty()) { |