From 67a08d237d5b64ddca2f32b68dd4beae0d6f421c Mon Sep 17 00:00:00 2001 From: nowrep Date: Tue, 5 Feb 2013 22:33:54 +0100 Subject: [PATCH] [code] Using QVariant::fromValue instead of obsolted qVariantFromValue. --- src/lib/adblock/adblockicon.cpp | 6 +++--- src/lib/bookmarks/bookmarkstoolbar.cpp | 4 ++-- src/lib/bookmarksimport/bookmarksimportdialog.cpp | 4 ++-- src/lib/bookmarksimport/bookmarksimporticonfetcher.cpp | 4 ++-- src/lib/cookies/cookiemanager.cpp | 2 +- src/lib/preferences/pluginsmanager.cpp | 8 ++++---- src/lib/webview/webpage.cpp | 2 +- src/lib/webview/webview.cpp | 2 +- src/plugins/GreaseMonkey/settings/gm_settings.cpp | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lib/adblock/adblockicon.cpp b/src/lib/adblock/adblockicon.cpp index 5e651b80e..50cd9e674 100644 --- a/src/lib/adblock/adblockicon.cpp +++ b/src/lib/adblock/adblockicon.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2012 David Rosca +* Copyright (C) 2010-2013 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -140,7 +140,7 @@ void AdBlockIcon::createMenu(QMenu* menu) QString actionText = tr("%1 with (%2)").arg(address, pair.first.filter()).replace(QLatin1Char('&'), QLatin1String("&&")); QAction* action = menu->addAction(actionText, manager, SLOT(showRule())); - action->setData(qVariantFromValue((void*)&pair.first)); + action->setData(QVariant::fromValue((void*)&pair.first)); } } @@ -156,7 +156,7 @@ void AdBlockIcon::createMenu(QMenu* menu) QString actionText = tr("%1 with (%2)").arg(address, entry.rule->filter()).replace(QLatin1Char('&'), QLatin1String("&&")); QAction* action = menu->addAction(actionText, manager, SLOT(showRule())); - action->setData(qVariantFromValue((void*)entry.rule)); + action->setData(QVariant::fromValue((void*)entry.rule)); } } } diff --git a/src/lib/bookmarks/bookmarkstoolbar.cpp b/src/lib/bookmarks/bookmarkstoolbar.cpp index 9ac72e429..17caba5b3 100644 --- a/src/lib/bookmarks/bookmarkstoolbar.cpp +++ b/src/lib/bookmarks/bookmarkstoolbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2012 David Rosca +* Copyright (C) 2010-2013 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -106,7 +106,7 @@ void BookmarksToolbar::showBookmarkContextMenu(const QPoint &pos) return; } - QVariant buttonPointer = qVariantFromValue((void*) button); + QVariant buttonPointer = QVariant::fromValue((void*) button); QMenu menu; menu.addAction(tr("Open bookmark"), this, SLOT(loadClickedBookmark()))->setData(buttonPointer); diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.cpp b/src/lib/bookmarksimport/bookmarksimportdialog.cpp index afd3d688e..5071f9595 100644 --- a/src/lib/bookmarksimport/bookmarksimportdialog.cpp +++ b/src/lib/bookmarksimport/bookmarksimportdialog.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2012 David Rosca +* Copyright (C) 2010-2013 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -123,7 +123,7 @@ void BookmarksImportDialog::startFetchingIcons() item = new QTreeWidgetItem(newParent); } - QVariant bookmarkVariant = qVariantFromValue(b); + QVariant bookmarkVariant = QVariant::fromValue(b); item->setText(0, b.title); if (b.image.isNull()) { item->setIcon(0, defaultIcon); diff --git a/src/lib/bookmarksimport/bookmarksimporticonfetcher.cpp b/src/lib/bookmarksimport/bookmarksimporticonfetcher.cpp index 62f34cde1..67809c751 100644 --- a/src/lib/bookmarksimport/bookmarksimporticonfetcher.cpp +++ b/src/lib/bookmarksimport/bookmarksimporticonfetcher.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2012 David Rosca +* Copyright (C) 2010-2013 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,7 +69,7 @@ void BookmarksImportIconFetcher::slotStartFetching() QNetworkAccessManager* manager = new QNetworkAccessManager(this); foreach(const Pair & pair, m_pairs) { - QVariant itemPointer = qVariantFromValue((void*) pair.item); + QVariant itemPointer = QVariant::fromValue((void*) pair.item); IconFetcher* fetcher = new IconFetcher(this); fetcher->setNetworkAccessManager(manager); diff --git a/src/lib/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp index ebe2e2ecc..3644c6612 100644 --- a/src/lib/cookies/cookiemanager.cpp +++ b/src/lib/cookies/cookiemanager.cpp @@ -198,7 +198,7 @@ void CookieManager::slotRefreshTable() item->setText(0, "." + cookieDomain); item->setText(1, cookie.name()); - item->setData(0, Qt::UserRole + 10, qVariantFromValue(cookie)); + item->setData(0, Qt::UserRole + 10, QVariant::fromValue(cookie)); ui->cookieTree->addTopLevelItem(item); ++counter; diff --git a/src/lib/preferences/pluginsmanager.cpp b/src/lib/preferences/pluginsmanager.cpp index 7eee8f353..76afe7d39 100644 --- a/src/lib/preferences/pluginsmanager.cpp +++ b/src/lib/preferences/pluginsmanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2012 David Rosca +* Copyright (C) 2010-2013 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -187,7 +187,7 @@ void PluginsManager::refresh() item->setFlags(item->flags() | Qt::ItemIsUserCheckable); item->setCheckState(plugin.isLoaded() ? Qt::Checked : Qt::Unchecked); - item->setData(Qt::UserRole + 10, qVariantFromValue(plugin)); + item->setData(Qt::UserRole + 10, QVariant::fromValue(plugin)); ui->list->addItem(item); } @@ -259,7 +259,7 @@ void PluginsManager::itemChanged(QListWidgetItem* item) QMessageBox::critical(this, tr("Error!"), tr("Cannot load extension!")); } - item->setData(Qt::UserRole + 10, qVariantFromValue(plugin)); + item->setData(Qt::UserRole + 10, QVariant::fromValue(plugin)); connect(ui->list, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); @@ -279,7 +279,7 @@ void PluginsManager::settingsClicked() if (!plugin.isLoaded()) { mApp->plugins()->loadPlugin(&plugin); - item->setData(Qt::UserRole + 10, qVariantFromValue(plugin)); + item->setData(Qt::UserRole + 10, QVariant::fromValue(plugin)); } if (plugin.isLoaded() && plugin.pluginSpec.hasSettings) { diff --git a/src/lib/webview/webpage.cpp b/src/lib/webview/webpage.cpp index 8dd358f9b..9bc4bba58 100644 --- a/src/lib/webview/webpage.cpp +++ b/src/lib/webview/webpage.cpp @@ -527,7 +527,7 @@ void WebPage::populateNetworkRequest(QNetworkRequest &request) { WebPage* pagePointer = this; - QVariant variant = qVariantFromValue((void*) pagePointer); + QVariant variant = QVariant::fromValue((void*) pagePointer); request.setAttribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100), variant); if (m_lastRequestUrl == request.url()) { diff --git a/src/lib/webview/webview.cpp b/src/lib/webview/webview.cpp index 356411f4d..09c9cabf8 100644 --- a/src/lib/webview/webview.cpp +++ b/src/lib/webview/webview.cpp @@ -1001,7 +1001,7 @@ void WebView::createSelectedTextContextMenu(QMenu* menu, const QWebHitTestResult SearchEnginesManager* searchManager = mApp->searchEnginesManager(); foreach(const SearchEngine & en, searchManager->allEngines()) { Action* act = new Action(en.icon, en.name); - act->setData(qVariantFromValue(en)); + act->setData(QVariant::fromValue(en)); connect(act, SIGNAL(triggered()), this, SLOT(searchSelectedText())); connect(act, SIGNAL(middleClicked()), this, SLOT(searchSelectedTextInBackgroundTab())); diff --git a/src/plugins/GreaseMonkey/settings/gm_settings.cpp b/src/plugins/GreaseMonkey/settings/gm_settings.cpp index a87efd981..365f3a543 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settings.cpp +++ b/src/plugins/GreaseMonkey/settings/gm_settings.cpp @@ -119,7 +119,7 @@ void GM_Settings::loadScripts() item->setFlags(item->flags() | Qt::ItemIsUserCheckable); item->setCheckState(script->isEnabled() ? Qt::Checked : Qt::Unchecked); - item->setData(Qt::UserRole + 10, qVariantFromValue((void*)script)); + item->setData(Qt::UserRole + 10, QVariant::fromValue((void*)script)); ui->listWidget->addItem(item); }