Fix compilation of examples with QStringBuilder

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>

diff --git a/examples/animation/sub-attaq/pixmapitem.cpp b/examples/animation/sub-attaq/pixmapitem.cpp
index b2061dc..077151d 100644 (file)
--- a/examples/animation/sub-attaq/pixmapitem.cpp
+++ b/examples/animation/sub-attaq/pixmapitem.cpp
@@ -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)

diff --git a/examples/itemviews/interview/model.cpp b/examples/itemviews/interview/model.cpp
index 966dc7b..3b20f91 100644 (file)
--- a/examples/itemviews/interview/model.cpp
+++ b/examples/itemviews/interview/model.cpp
@@ -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);

diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp
index 38f9eaf..12f9504 100644 (file)
--- a/examples/network/torrent/trackerclient.cpp
+++ b/examples/network/torrent/trackerclient.cpp
@@ -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);