diff options
| author | hjk <hjk@qt.io> | 2020-07-29 14:47:28 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-07-29 14:03:19 +0000 |
| commit | 6c590531b0136bd7e2b16f07e51b566681692124 (patch) | |
| tree | 9bfd519e8de157df9a0dc168462adf837159e0e1 /src/plugins/bookmarks | |
| parent | 77d13f08ba9e465725d1ca3a677aae949732804b (diff) | |
Small Qt 6 migration stuff
- qsizetype vs int
- QJsonValue vs QJsonValueRef
- #include for metatype system
Task-number: QTCREATORBUG-24098
Change-Id: I066d9e3d5c35766b8aa3adc1c5835b23feb20b37
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/bookmarks')
| -rw-r--r-- | src/plugins/bookmarks/bookmarkfilter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/bookmarks/bookmarkfilter.cpp b/src/plugins/bookmarks/bookmarkfilter.cpp index 0c74ceafeb9..ecaa90ff6ad 100644 --- a/src/plugins/bookmarks/bookmarkfilter.cpp +++ b/src/plugins/bookmarks/bookmarkfilter.cpp @@ -89,18 +89,18 @@ QList<LocatorFilterEntry> BookmarkFilter::matchesFor(QFutureInterface<LocatorFil filterEntry.extraInfo = bookmark->fileName().toString(); int highlightIndex = filterEntry.displayName.indexOf(entry, 0, Qt::CaseInsensitive); if (highlightIndex >= 0) { - filterEntry.highlightInfo = {highlightIndex, entry.length()}; + filterEntry.highlightInfo = {highlightIndex, int(entry.length())}; } else { highlightIndex = filterEntry.extraInfo.indexOf(entry, 0, Qt::CaseInsensitive); if (highlightIndex >= 0) { - filterEntry.highlightInfo = {highlightIndex, entry.length(), + filterEntry.highlightInfo = {highlightIndex, int(entry.length()), LocatorFilterEntry::HighlightInfo::ExtraInfo}; } else if (colonIndex >= 0) { const QString fileName = entry.left(colonIndex); const QString lineNumber = entry.mid(colonIndex + 1); highlightIndex = filterEntry.displayName.indexOf(fileName, 0, Qt::CaseInsensitive); if (highlightIndex >= 0) { - filterEntry.highlightInfo = {highlightIndex, fileName.length()}; + filterEntry.highlightInfo = {highlightIndex, int(fileName.length())}; highlightIndex = filterEntry.displayName.indexOf( lineNumber, highlightIndex, Qt::CaseInsensitive); if (highlightIndex >= 0) { |