AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of examples with QStringBuilder

Browse Source 
In sub-attack an interview, one can't make two implicit conversions at
once, so explicitly convert to the right type.

The change in the torrent example is required because of
https://codereview.qt-project.org/16168 (commit 9491272)
But in that case, using a QByteArray is better anyway.

Change-Id: Ieed22ac7f0d700d5ba5d1e70af3db4dd6c139c8f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Olivier Goffart 2012-02-25 19:23:06 +01:00 committed by Qt by Nokia
parent d91add71e7
commit ffa072655d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/animation/sub-attaq/pixmapitem.cpp
View File

@ -48,9 +48,9 @@
PixmapItem::PixmapItem(const QString &fileName,GraphicsScene::Mode mode, QGraphicsItem * parent) : QGraphicsObject(parent)
{
if (mode == GraphicsScene::Big)
pix = ":/big/" + fileName;
pix = QPixmap(QStringLiteral(":/big/") + fileName);
else
pix = ":/small/" + fileName;
pix = QPixmap(QStringLiteral(":/small/") + fileName);
}
PixmapItem::PixmapItem(const QString &fileName, QGraphicsScene *scene) : QGraphicsObject(), pix(fileName)

2
examples/itemviews/interview/model.cpp
View File

@ -95,7 +95,7 @@ QVariant Model::data(const QModelIndex &index, int role) const
if (!index.isValid())
return QVariant();
if (role == Qt::DisplayRole)
return "Item " + QString::number(index.row()) + ":" + QString::number(index.column());
return QVariant("Item " + QString::number(index.row()) + ":" + QString::number(index.column()));
if (role == Qt::DecorationRole) {
if (index.column() == 0)
return iconProvider.icon(QFileIconProvider::Folder);

4
examples/network/torrent/trackerclient.cpp
View File

@ -108,10 +108,10 @@ void TrackerClient::fetchPeerList()
// Percent encode the hash
QByteArray infoHash = torrentDownloader->infoHash();
QString encodedSum;
QByteArray encodedSum;
for (int i = 0; i < infoHash.size(); ++i) {
encodedSum += '%';
encodedSum += QString::number(infoHash[i], 16).right(2).rightJustified(2, '0');
encodedSum += QByteArray::number(infoHash[i], 16).right(2).rightJustified(2, '0');
}
bool seeding = (torrentDownloader->state() == TorrentClient::Seeding);