Fixed/translated some doc. code snippets.

4 files changed, 24 insertions, 27 deletions

diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
index f07dc8b0c..213d257e2 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -117,8 +117,8 @@ class Login:
     for i in range(size):
         settings.setArrayIndex(i)
         login = Login()
-        login.userName = settings.value("userName").toString()
-        login.password = settings.value("password").toString()
+        login.userName = settings.value("userName")
+        login.password = settings.value("password")
         logins.append(login)
 
     settings.endArray()
@@ -148,8 +148,8 @@ class Login:
 settings = QSettings()
 settings.setValue("fridge/color", Qt.white)
 settings.setValue("fridge/size", QSize(32, 96))
-settings.setValue("sofa", true)
-settings.setValue("tv", false)
+settings.setValue("sofa", True)
+settings.setValue("tv", False)
 
 keys = settings.allKeys();
 # keys: ["fridge/color", "fridge/size", "sofa", "tv"]
@@ -167,8 +167,8 @@ keys = settings.allKeys()
 settings = QSettings()
 settings.setValue("fridge/color", Qt.white)
 settings.setValue("fridge/size", QSize(32, 96))
-settings.setValue("sofa", true)
-settings.setValue("tv", false)
+settings.setValue("sofa", True)
+settings.setValue("tv", False)
 
 keys = settings.childKeys()
 # keys: ["sofa", "tv"]
@@ -186,8 +186,8 @@ keys = settings.childKeys()
 settings = QSettings()
 settings.setValue("fridge/color", Qt.white)
 settings.setValue("fridge/size", QSize(32, 96));
-settings.setValue("sofa", true)
-settings.setValue("tv", false)
+settings.setValue("sofa", True)
+settings.setValue("tv", False)
 
 groups = settings.childGroups()
 # group: ["fridge"]
@@ -204,10 +204,10 @@ groups = settings.childGroups()
 //! [23]
 settings = QSettings()
 settings.setValue("interval", 30)
-settings.value("interval").toInt()      # returns 30
+settings.value("interval")      # returns 30
 
 settings.setValue("interval", 6.55)
-settings.value("interval").toDouble()  # returns 6.55
+settings.value("interval")  # returns 6.55
 //! [23]
 
 
@@ -243,9 +243,9 @@ keys = settings.allKeys()
 //! [26]
 settings = QSettings()
 settings.setValue("animal/snake", 58)
-settings.value("animal/snake", 1024).toInt()   # returns 58
-settings.value("animal/zebra", 1024).toInt()   # returns 1024
-settings.value("animal/zebra").toInt()         # returns 0
+settings.value("animal/snake", 1024)   # returns 58
+settings.value("animal/zebra", 1024)   # returns 1024
+settings.value("animal/zebra")         # returns 0
 //! [26]
 
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
index 1f1ff39ae..4fc5541c2 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
@@ -102,7 +102,7 @@ def paint(self, painter, option, widget):
 ObjectName = 0;
 
 item = scene.itemAt(100, 50)
-if item.data(ObjectName).toString().isEmpty():
+if len(item.data(ObjectName)) == 0:
     if isinstance(ButtonItem, item):
         item.setData(ObjectName, "Button")
 //! [11]
@@ -145,13 +145,12 @@ def dragEnterEvent(self, event):
 def itemChange(self, change, value):
     if change == ItemPositionChange && scene():
         # value is the new position.
-        newPos = value.toPointF()
         rect = scene()->sceneRect()
-        if !rect.contains(newPos):
+        if !rect.contains(value):
             # Keep the item inside the scene rect.
-            newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left())))
-            newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top())))
-            return newPos
+            value.setX(qMin(rect.right(), qMax(value.x(), rect.left())))
+            value.setY(qMin(rect.bottom(), qMax(value.y(), rect.top())))
+            return value
     return QGraphicsItem.itemChange(self, change, value)
 //! [15]
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp b/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp
index 769f0be6c..8ad4c2e0e 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp
@@ -11,7 +11,7 @@ print "Number of columns: %d" % rec.count()
 
 nameCol = rec.indexOf("name") # index of the field "name"
 while q.next():
-    print q.value(nameCol).toString() # output all names
+    print q.value(nameCol) # output all names
 //! [1]
 
 
@@ -19,12 +19,10 @@ while q.next():
 q = QSqlQuery()
 q.prepare("insert into myTable values (?, ?)")
 
-QVariantList ints
-ints << 1 << 2 << 3 << 4
+ints = [1, 2, 3, 4]
 q.addBindValue(ints)
 
-QVariantList names
-names << "Harald" << "Boris" << "Trond" << QVariant(QVariant.String)
+names = ["Harald", "Boris", "Trond", ""]
 q.addBindValue(names)
 
 if not q.execBatch():
diff --git a/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp b/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp
index 81d665641..222324290 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp
@@ -2,9 +2,9 @@
 q = QSqlQuery()
 q.prepare("insert into test (i1, i2, s) values (?, ?, ?)")
 
-col1 = QVariant([1, 3])
-col2 = QVariant([2, 4])
-col3 = QVariant(["hello", "world"])
+col1 = [1, 3]
+col2 = [2, 4]
+col3 = ["hello", "world"]
 
 q.bindValue(0, col1)
 q.bindValue(1, col2)