Replace uses of qVariantFromValue with QVariant::fromValue

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>

src/libs/extensionsystem/pluginerroroverview.cpp

@@ -45,7 +45,7 @@ PluginErrorOverview::PluginErrorOverview(QWidget *parent) :
         // only show errors on startup if plugin is enabled.
         if (spec->hasError() && spec->isEffectivelyEnabled()) {
             QListWidgetItem *item = new QListWidgetItem(spec->name());
-            item->setData(Qt::UserRole, qVariantFromValue(spec));
+            item->setData(Qt::UserRole, QVariant::fromValue(spec));
             m_ui->pluginList->addItem(item);
         }
     }

src/libs/qmldebug/baseenginedebugclient.cpp

@@ -121,7 +121,7 @@ void BaseEngineDebugClient::decode(QDataStream &ds,
         {
             ObjectReference obj;
             obj.m_debugId = prop.m_value.toInt();
-            prop.m_value = qVariantFromValue(obj);
+            prop.m_value = QVariant::fromValue(obj);
             break;
         }
         case QmlObjectProperty::Unknown:

src/plugins/baremetal/gdbserverproviderchooser.cpp

@@ -110,7 +110,7 @@ void GdbServerProviderChooser::populate()
     for (const GdbServerProvider *p : GdbServerProviderManager::providers()) {
         if (!providerMatches(p))
             continue;
-        m_chooser->addItem(providerText(p), qVariantFromValue(p->id()));
+        m_chooser->addItem(providerText(p), QVariant::fromValue(p->id()));
     }
 }
 

src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp

@@ -76,7 +76,7 @@ static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter,
     const ClangBackEnd::ExtraInfo &extraInfo = info.extraInfo;
     QString displayName = extraInfo.token;
     ::Utils::LineColumn lineColumn(static_cast<int>(info.line), static_cast<int>(info.column));
-    Core::LocatorFilterEntry entry(filter, displayName, qVariantFromValue(lineColumn));
+    Core::LocatorFilterEntry entry(filter, displayName, QVariant::fromValue(lineColumn));
     QString extra;
     ClangBackEnd::HighlightingType mainType = info.types.mainHighlightingType;
     if (mainType == ClangBackEnd::HighlightingType::VirtualFunction

src/plugins/coreplugin/dialogs/saveitemsdialog.cpp

@@ -81,7 +81,7 @@ SaveItemsDialog::SaveItemsDialog(QWidget *parent,
                                                     << visibleName << QDir::toNativeSeparators(directory));
         if (!fileName.isEmpty())
             item->setIcon(0, FileIconProvider::icon(fileName));
-        item->setData(0, Qt::UserRole, qVariantFromValue(document));
+        item->setData(0, Qt::UserRole, QVariant::fromValue(document));
     }
 
     m_ui.treeWidget->resizeColumnToContents(0);

src/plugins/coreplugin/dialogs/shortcutsettings.cpp

@@ -514,7 +514,7 @@ void ShortcutSettingsWidget::initialize()
         if (s->m_cmd->defaultKeySequence() != s->m_key)
             setModified(item, true);
 
-        item->setData(0, Qt::UserRole, qVariantFromValue(s));
+        item->setData(0, Qt::UserRole, QVariant::fromValue(s));
 
         markCollisions(s);
     }

src/plugins/coreplugin/find/searchresulttreemodel.cpp

@@ -258,7 +258,7 @@ QVariant SearchResultTreeModel::data(const SearchResultTreeItem *row, int role)
         result = row->item.text;
         break;
     case ItemDataRoles::ResultItemRole:
-        result = qVariantFromValue(row->item);
+        result = QVariant::fromValue(row->item);
         break;
     case ItemDataRoles::ResultBeginLineNumberRole:
         result = row->item.mainRange.begin.line;

src/plugins/coreplugin/locator/locatorwidget.cpp

@@ -210,7 +210,7 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const
             return QColor(Qt::darkGray);
         break;
     case LocatorEntryRole:
-        return qVariantFromValue(mEntries.at(index.row()));
+        return QVariant::fromValue(mEntries.at(index.row()));
     case int(HighlightingItemRole::StartColumn):
     case int(HighlightingItemRole::Length): {
         LocatorFilterEntry &entry = mEntries[index.row()];

src/plugins/coreplugin/mimetypesettings.cpp

@@ -157,9 +157,9 @@ QVariant MimeTypeSettingsModel::data(const QModelIndex &modelIndex, int role) co
             return defaultHandler ? defaultHandler->displayName() : QString();
         }
     } else if (role == Qt::EditRole) {
-        return qVariantFromValue(handlersForMimeType(m_mimeTypes.at(modelIndex.row())));
+        return QVariant::fromValue(handlersForMimeType(m_mimeTypes.at(modelIndex.row())));
     } else if (role == int(Role::DefaultHandler)) {
-        return qVariantFromValue(defaultHandlerForMimeType(m_mimeTypes.at(modelIndex.row())));
+        return QVariant::fromValue(defaultHandlerForMimeType(m_mimeTypes.at(modelIndex.row())));
     } else if (role == Qt::FontRole) {
         if (column == 1) {
             const Utils::MimeType &type = m_mimeTypes.at(modelIndex.row());
@@ -397,7 +397,7 @@ void MimeTypeSettingsPrivate::editMagicHeaderRowData(const int row, const MagicD
     item->setText(1, QString::fromLatin1(Utils::Internal::MimeMagicRule::typeName(data.m_rule.type())));
     item->setText(2, QString::fromLatin1("%1:%2").arg(data.m_rule.startPos()).arg(data.m_rule.endPos()));
     item->setText(3, QString::number(data.m_priority));
-    item->setData(0, Qt::UserRole, qVariantFromValue(data));
+    item->setData(0, Qt::UserRole, QVariant::fromValue(data));
     m_ui.magicHeadersTreeWidget->takeTopLevelItem(row);
     m_ui.magicHeadersTreeWidget->insertTopLevelItem(row, item);
     m_ui.magicHeadersTreeWidget->setCurrentItem(item);
@@ -690,7 +690,7 @@ void MimeEditorDelegate::setEditorData(QWidget *editor, const QModelIndex &index
     auto box = static_cast<QComboBox *>(editor);
     const auto factories = index.model()->data(index, Qt::EditRole).value<QList<IEditorFactory *>>();
     for (IEditorFactory *factory : factories)
-        box->addItem(factory->displayName(), qVariantFromValue(factory));
+        box->addItem(factory->displayName(), QVariant::fromValue(factory));
     int currentIndex = factories.indexOf(
         index.model()
             ->data(index, int(MimeTypeSettingsModel::Role::DefaultHandler))

src/plugins/coreplugin/navigationwidget.cpp

@@ -260,7 +260,7 @@ void NavigationWidget::setFactories(const QList<INavigationWidgetFactory *> &fac
         }
 
         QStandardItem *newRow = new QStandardItem(factory->displayName());
-        newRow->setData(qVariantFromValue(factory), FactoryObjectRole);
+        newRow->setData(QVariant::fromValue(factory), FactoryObjectRole);
         newRow->setData(QVariant::fromValue(factory->id()), FactoryIdRole);
         newRow->setData(factory->priority(), FactoryPriorityRole);
         d->m_factoryModel->appendRow(newRow);

src/plugins/coreplugin/systemsettings.cpp

@@ -74,7 +74,7 @@ QWidget *SystemSettings::widget()
         if (HostOsInfo::isAnyUnixHost()) {
             const QVector<TerminalCommand> availableTerminals = ConsoleProcess::availableTerminalEmulators();
             for (const TerminalCommand &term : availableTerminals)
-                m_page->terminalComboBox->addItem(term.command, qVariantFromValue(term));
+                m_page->terminalComboBox->addItem(term.command, QVariant::fromValue(term));
             updateTerminalUi(ConsoleProcess::terminalEmulator(ICore::settings()));
             connect(m_page->terminalComboBox,
                     QOverload<int>::of(&QComboBox::currentIndexChanged),

src/plugins/cpptools/builtinindexingsupport.cpp

@@ -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;
                     }
 

src/plugins/cpptools/cppclassesfilter.cpp

@@ -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()

src/plugins/cpptools/cppcurrentdocumentfilter.cpp

@@ -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) {

src/plugins/cpptools/cppfindreferences.cpp

@@ -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)

src/plugins/cpptools/cppfunctionsfilter.cpp

@@ -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();

src/plugins/cpptools/cpplocatorfilter.cpp

@@ -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();

src/plugins/cpptools/symbolsfindfilter.cpp

@@ -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);
 }
 

src/plugins/git/gerrit/gerritmodel.cpp

@@ -842,7 +842,7 @@ QList<QStandardItem *> GerritModel::changeToRow(const GerritChangePtr &c) const
 {
     QList<QStandardItem *> row;
     const QVariant filterV = QVariant(c->filterString());
-    const QVariant changeV = qVariantFromValue(c);
+    const QVariant changeV = QVariant::fromValue(c);
     for (int i = 0; i < GerritModel::ColumnCount; ++i) {
         auto item = new QStandardItem;
         item->setData(changeV, GerritModel::GerritChangeRole);

src/plugins/git/gitgrep.cpp

@@ -291,7 +291,7 @@ QVariant GitGrep::parameters() const
     params.ref = m_treeLineEdit->text();
     if (m_recurseSubmodules)
         params.recurseSubmodules = m_recurseSubmodules->isChecked();
-    return qVariantFromValue(params);
+    return QVariant::fromValue(params);
 }
 
 void GitGrep::readSettings(QSettings *settings)

src/plugins/help/helpplugin.cpp

@@ -400,7 +400,7 @@ void HelpPluginPrivate::saveExternalWindowSettings()
         return;
     m_externalWindowState = m_externalWindow->geometry();
     QSettings *settings = ICore::settings();
-    settings->setValue(kExternalWindowStateKey, qVariantFromValue(m_externalWindowState));
+    settings->setValue(kExternalWindowStateKey, QVariant::fromValue(m_externalWindowState));
 }
 
 HelpWidget *HelpPluginPrivate::createHelpWidget(const Context &context, HelpWidget::WidgetStyle style)

src/plugins/languageclient/locatorfilter.cpp

@@ -106,7 +106,7 @@ Core::LocatorFilterEntry generateLocatorEntry(const SymbolInformation &info,
     if (Utils::optional<QString> container = info.containerName())
         entry.extraInfo = container.value_or(QString());
     entry.displayIcon = symbolIcon(info.kind());
-    entry.internalData = qVariantFromValue(info.location().toLink());
+    entry.internalData = QVariant::fromValue(info.location().toLink());
     return entry;
 }
 
@@ -120,7 +120,7 @@ Core::LocatorFilterEntry generateLocatorEntry(const DocumentSymbol &info,
         entry.extraInfo = detail.value_or(QString());
     entry.displayIcon = symbolIcon(info.kind());
     const Position &pos = info.range().start();
-    entry.internalData = qVariantFromValue(Utils::LineColumn(pos.line(), pos.character()));
+    entry.internalData = QVariant::fromValue(Utils::LineColumn(pos.line(), pos.character()));
     return entry;
 }
 

src/plugins/projectexplorer/currentprojectfind.cpp

@@ -73,7 +73,7 @@ QVariant CurrentProjectFind::additionalParameters() const
 {
     Project *project = ProjectTree::currentProject();
     if (project && project->document())
-        return qVariantFromValue(project->projectFilePath().toString());
+        return QVariant::fromValue(project->projectFilePath().toString());
     return QVariant();
 }
 

src/plugins/projectexplorer/foldernavigationwidget.cpp

@@ -482,7 +482,7 @@ void FolderNavigationWidget::insertRootDirectory(
     m_rootSelector->insertItem(index, directory.displayName);
     if (index <= previousIndex) // item was inserted, update previousIndex
         ++previousIndex;
-    m_rootSelector->setItemData(index, qVariantFromValue(directory.path), PATH_ROLE);
+    m_rootSelector->setItemData(index, QVariant::fromValue(directory.path), PATH_ROLE);
     m_rootSelector->setItemData(index, directory.id, ID_ROLE);
     m_rootSelector->setItemData(index, directory.sortValue, SORT_ROLE);
     m_rootSelector->setItemData(index, directory.path.toUserOutput(), Qt::ToolTipRole);

src/plugins/qmljstools/qmljsfunctionfilter.cpp

@@ -79,7 +79,7 @@ QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor(
 
             const QRegularExpressionMatch match = regexp.match(info.symbolName);
             if (match.hasMatch()) {
-                QVariant id = qVariantFromValue(info);
+                QVariant id = QVariant::fromValue(info);
                 Core::LocatorFilterEntry filterEntry(this, info.displayName, id/*, info.icon*/);
                 filterEntry.extraInfo = info.extraInfo;
                 filterEntry.highlightInfo = highlightInfo(match);

src/plugins/silversearcher/findinfilessilversearcher.cpp

@@ -190,7 +190,7 @@ QVariant FindInFilesSilverSearcher::parameters() const
 {
     SilverSearcherSearchOptions silverSearcherSearchOptions;
     silverSearcherSearchOptions.searchOptions = m_searchOptionsLineEdit->text();
-    return qVariantFromValue(silverSearcherSearchOptions);
+    return QVariant::fromValue(silverSearcherSearchOptions);
 }
 
 QString FindInFilesSilverSearcher::title() const

src/plugins/texteditor/basefilefind.cpp

@@ -272,7 +272,7 @@ void BaseFileFind::runNewSearch(const QString &txt, FindFlags findFlags,
     parameters.additionalParameters = additionalParameters();
     parameters.searchEngineParameters = currentSearchEngine()->parameters();
     parameters.searchEngineIndex = d->m_currentSearchEngineIndex;
-    search->setUserData(qVariantFromValue(parameters));
+    search->setUserData(QVariant::fromValue(parameters));
     connect(search, &SearchResult::activated, this, [this, search](const SearchResultItem &item) {
         openEditor(search, item);
     });

src/plugins/texteditor/basehoverhandler.cpp

@@ -162,7 +162,7 @@ void BaseHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPoi
         Utils::ToolTip::show(point,
                              m_toolTip,
                              editorWidget,
-                             qVariantFromValue(m_lastHelpItemIdentified));
+                             QVariant::fromValue(m_lastHelpItemIdentified));
 }
 
 } // namespace TextEditor

src/plugins/texteditor/findincurrentfile.cpp

@@ -71,7 +71,7 @@ Utils::FileIterator *FindInCurrentFile::files(const QStringList &nameFilters,
 
 QVariant FindInCurrentFile::additionalParameters() const
 {
-    return qVariantFromValue(m_currentDocument->filePath().toString());
+    return QVariant::fromValue(m_currentDocument->filePath().toString());
 }
 
 QString FindInCurrentFile::label() const

src/plugins/texteditor/findinfiles.cpp

@@ -87,7 +87,7 @@ FileIterator *FindInFiles::files(const QStringList &nameFilters,
 
 QVariant FindInFiles::additionalParameters() const
 {
-    return qVariantFromValue(path().toString());
+    return QVariant::fromValue(path().toString());
 }
 
 QString FindInFiles::label() const

src/plugins/vcsbase/vcsbaseeditor.cpp

@@ -979,11 +979,11 @@ void VcsBaseEditorWidget::contextMenuEvent(QContextMenuEvent *e)
         // the user has "Open With" and choose the right diff editor so that
         // fileNameFromDiffSpecification() works.
         QAction *applyAction = menu->addAction(tr("Apply Chunk..."));
-        applyAction->setData(qVariantFromValue(Internal::DiffChunkAction(chunk, false)));
+        applyAction->setData(QVariant::fromValue(Internal::DiffChunkAction(chunk, false)));
         connect(applyAction, &QAction::triggered, this, &VcsBaseEditorWidget::slotApplyDiffChunk);
         // Revert a chunk from a VCS diff, which might be linked to reloading the diff.
         QAction *revertAction = menu->addAction(tr("Revert Chunk..."));
-        revertAction->setData(qVariantFromValue(Internal::DiffChunkAction(chunk, true)));
+        revertAction->setData(QVariant::fromValue(Internal::DiffChunkAction(chunk, true)));
         connect(revertAction, &QAction::triggered, this, &VcsBaseEditorWidget::slotApplyDiffChunk);
         // Custom diff actions
         addDiffActions(menu, chunk);

tests/auto/debugger/tst_dumpers.cpp

@@ -3685,7 +3685,7 @@ void tst_Dumpers::dumper_data()
 
                     "QList<int> list;\n"
                     "list << 1 << 2 << 3;\n"
-                    "QVariant v3 = qVariantFromValue(list);\n"
+                    "QVariant v3 = QVariant::fromValue(list);\n"
                     "unused(&list, &v3);\n\n")
 
                + CoreProfile()

tests/manual/debugger/simple/simple_test_app.cpp

@@ -4566,7 +4566,7 @@ namespace qvariant {
 #if QT_VERSION > 0x050000
         QList<int> list;
         list << 1 << 2 << 3;
-        QVariant variant = qVariantFromValue(list);
+        QVariant variant = QVariant::fromValue(list);
         BREAK_HERE;
         // Expand list variant variant.data.
         // Check list <3 items> QList<int>.