diff options
author | Debao Zhang <dbzhang800@gmail.com> | 2012-04-29 00:11:28 -0700 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 08:30:59 +0200 |
commit | ade888860334d207f5f070b0bc9c4c98deaf3862 (patch) | |
tree | 133a3bde54e8ef5fa8857814a45cc5000ee5b287 /tests/manual | |
parent | 6102ab8d646d76a68bb460885394501e90b4fd1f (diff) |
Don't use obsolete qVariantValue, qVariantCanConvert, etc.
qVariantValue and qVariantCanConvert are Compatibility members, while in
Qt4.8 they are marked as Qt 3 Support Members.
qVariantFromValue and qVariantSetValue are Obsolete members.
Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/bearerex/bearerex.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp index 6826312880..c85fc439e9 100644 --- a/tests/manual/bearerex/bearerex.cpp +++ b/tests/manual/bearerex/bearerex.cpp @@ -90,7 +90,7 @@ void BearerEx::showConfigurations() font.setUnderline(true); listItem->setFont(font); listItem->setText(" UserChoice"); - listItem->setData(Qt::UserRole, qVariantFromValue(defaultConfig)); + listItem->setData(Qt::UserRole, QVariant::fromValue(defaultConfig)); listWidget->addItem(listItem); } @@ -121,7 +121,7 @@ void BearerEx::showConfigurations() listItem->setFont(font); } listItem->setText(text); - listItem->setData(Qt::UserRole, qVariantFromValue(configurations[i])); + listItem->setData(Qt::UserRole, QVariant::fromValue(configurations[i])); listWidget->addItem(listItem); } } @@ -143,7 +143,7 @@ void BearerEx::on_showDetailsButton_clicked() return; } - QNetworkConfiguration networkConfiguration = qVariantValue<QNetworkConfiguration>(item->data(Qt::UserRole)); + QNetworkConfiguration networkConfiguration = qvariant_cast<QNetworkConfiguration>(item->data(Qt::UserRole)); DetailedInfoDialog infoDialog(&networkConfiguration,this); infoDialog.exec(); } @@ -154,7 +154,7 @@ void BearerEx::on_createSessionButton_clicked() if (!item) { return; } - QNetworkConfiguration networkConfiguration = qVariantValue<QNetworkConfiguration>(item->data(Qt::UserRole)); + QNetworkConfiguration networkConfiguration = qvariant_cast<QNetworkConfiguration>(item->data(Qt::UserRole)); int newTabIndex = mainTabWidget->count(); SessionTab* newTab = new SessionTab(&networkConfiguration,&m_NetworkConfigurationManager,eventListWidget,newTabIndex-1); QString label = QString("S")+QString::number(newTabIndex-1); |