forked from qt-creator/qt-creator
Core: Work around more deprecations
Change-Id: Ib25134cb823ed14ce82a69aac6f03849b02862fa Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -140,7 +140,7 @@ void BaseTextFind::resetIncrementalSearch()
|
||||
|
||||
void BaseTextFind::clearHighlights()
|
||||
{
|
||||
highlightAll(QString(), nullptr);
|
||||
highlightAll(QString(), {});
|
||||
}
|
||||
|
||||
QString BaseTextFind::currentFindString() const
|
||||
@@ -191,7 +191,7 @@ IFindSupport::Result BaseTextFind::findIncremental(const QString &txt, FindFlags
|
||||
if (found)
|
||||
highlightAll(txt, findFlags);
|
||||
else
|
||||
highlightAll(QString(), nullptr);
|
||||
highlightAll(QString(), {});
|
||||
return found ? Found : NotFound;
|
||||
}
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ bool CurrentDocumentFind::supportsReplace() const
|
||||
|
||||
FindFlags CurrentDocumentFind::supportedFindFlags() const
|
||||
{
|
||||
QTC_ASSERT(m_currentFind, return nullptr);
|
||||
QTC_ASSERT(m_currentFind, return {});
|
||||
return m_currentFind->supportedFindFlags();
|
||||
}
|
||||
|
||||
|
||||
@@ -95,9 +95,9 @@ void ResultData::printFilterEntries(const ResultData::ResultDataList &entries, c
|
||||
{
|
||||
QTextStream out(stdout);
|
||||
if (!msg.isEmpty())
|
||||
out << msg << endl;
|
||||
out << msg << '\n';
|
||||
for (const ResultData &entry : entries) {
|
||||
out << "<< ResultData(_(\"" << entry.textColumn1 << "\"), _(\"" << entry.textColumn2
|
||||
<< "\"))" << endl;
|
||||
<< "\"))\n";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user