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

Replace uses of qVariantFromValue with QVariant::fromValue

Browse Source 
Deprecated in Qt 5.14, alternative has been around since Qt 4 at least.

Change-Id: I4e3a53c289088368609e0d0ce2405a832d311308
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2019-05-27 13:32:20 +02:00
parent f7d224bf58
commit 19e1cf1520
33 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,7 +310,7 @@ public:
item.path = scope.split(QLatin1String("::"), QString::SkipEmptyParts);
item.text = text;
item.icon = info->icon();
item.userData = qVariantFromValue(info);
item.userData = QVariant::fromValue(info);
resultItems << item;
}

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

@@ -43,7 +43,7 @@ CppClassesFilter::~CppClassesFilter() = default;
Core::LocatorFilterEntry CppClassesFilter::filterEntryFromIndexItem(IndexItem::Ptr info)
{
const QVariant id = qVariantFromValue(info);
const QVariant id = QVariant::fromValue(info);
Core::LocatorFilterEntry filterEntry(this, info->symbolName(), id, info->icon());
filterEntry.extraInfo = info->symbolScope().isEmpty()
? info->shortNativeFilePath()

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

@@ -83,7 +83,7 @@ QList<Core::LocatorFilterEntry> CppCurrentDocumentFilter::matchesFor(
QRegularExpressionMatch match = regexp.match(matchString);
if (match.hasMatch()) {
const bool betterMatch = match.capturedStart() == 0;
QVariant id = qVariantFromValue(info);
QVariant id = QVariant::fromValue(info);
QString name = matchString;
QString extraInfo = info->symbolScope();
if (info->type() == IndexItem::Function) {

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

@@ -351,7 +351,7 @@ void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol,
parameters.prettySymbolName = overview.prettyName(context.path(symbol).constLast());
}
search->setUserData(qVariantFromValue(parameters));
search->setUserData(QVariant::fromValue(parameters));
findAll_helper(search, symbol, context);
}
@@ -571,7 +571,7 @@ static void displayResults(SearchResult *search, QFutureWatcher<CPlusPlus::Usage
parameters.filesToRename.append(node);
}
search->setUserData(qVariantFromValue(parameters));
search->setUserData(QVariant::fromValue(parameters));
}
static void searchFinished(SearchResult *search, QFutureWatcher<CPlusPlus::Usage> *watcher)

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

@@ -45,7 +45,7 @@ CppFunctionsFilter::~CppFunctionsFilter() = default;
Core::LocatorFilterEntry CppFunctionsFilter::filterEntryFromIndexItem(IndexItem::Ptr info)
{
const QVariant id = qVariantFromValue(info);
const QVariant id = QVariant::fromValue(info);
QString name = info->symbolName();
QString extraInfo = info->symbolScope();

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

@@ -50,7 +50,7 @@ CppLocatorFilter::~CppLocatorFilter() = default;
Core::LocatorFilterEntry CppLocatorFilter::filterEntryFromIndexItem(IndexItem::Ptr info)
{
const QVariant id = qVariantFromValue(info);
const QVariant id = QVariant::fromValue(info);
Core::LocatorFilterEntry filterEntry(this, info->scopedSymbolName(), id, info->icon());
if (info->type() == IndexItem::Class || info->type() == IndexItem::Enum)
filterEntry.extraInfo = info->shortNativeFilePath();

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

@@ -119,7 +119,7 @@ void SymbolsFindFilter::findAll(const QString &txt, FindFlags findFlags)
parameters.flags = findFlags;
parameters.types = m_symbolsToSearch;
parameters.scope = m_scope;
search->setUserData(qVariantFromValue(parameters));
search->setUserData(QVariant::fromValue(parameters));
startSearch(search);
}