Fixed/translated some doc. code snippets.

2 files changed, 16 insertions, 18 deletions

diff --git a/doc/codesnippets/examples/dialogs/classwizard/classwizard.cpp b/doc/codesnippets/examples/dialogs/classwizard/classwizard.cpp
index 0d5c221..bf88928 100644
--- a/doc/codesnippets/examples/dialogs/classwizard/classwizard.cpp
+++ b/doc/codesnippets/examples/dialogs/classwizard/classwizard.cpp
@@ -224,7 +224,7 @@ class CodeStylePage(QWizardPage):
 //! [16]
     def initializePage(self):
         className = self.field("className")
-        self.macroNameLineEdit.setText(className.toUpper() + "_H")
+        self.macroNameLineEdit.setText(className.upper() + "_H")
 
         baseClass = self.field("baseClass")
 
@@ -238,13 +238,13 @@ class CodeStylePage(QWizardPage):
         elsif QRegExp("Q[A-Z].*").exactMatch(baseClass):
             baseIncludeLineEdit.setText("<" + baseClass + ">")
         else:
-            baseIncludeLineEdit.setText("\"" + baseClass.toLower() + ".h\"")
+            baseIncludeLineEdit.setText("\"" + baseClass.lower() + ".h\"")
 //! [16]
 
 //! [17]
     def initializePage(self):
-        className = field("className").toString()
-        self.headerLineEdit.setText(className.toLower() + ".h")
-        self.implementationLineEdit.setText(className.toLower() + ".cpp")
+        className = field("className")
+        self.headerLineEdit.setText(className.lower() + ".h")
+        self.implementationLineEdit.setText(className.lower() + ".cpp")
         self.outputDirLineEdit.setText(QDir.convertSeparators(QDir.tempPath()))
 //! [17]
diff --git a/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp b/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
index da1c2dd..028a5e7 100644
--- a/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
+++ b/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
@@ -64,10 +64,10 @@ def filterAcceptsRow(self, sourceRow, sourceParent):
     index1 = sourceModel().index(sourceRow, 1, sourceParent)
     index2 = sourceModel().index(sourceRow, 2, sourceParent)
 
-    return (sourceModel().data(index0).toString().contains(filterRegExp())
-            || sourceModel().data(index1).toString().contains(filterRegExp()))
-           && dateInRange(sourceModel().data(index2).toDate())
-
+    regex = filterRegExp()
+    return (regex.indexIn(sourceModel().data(index0)) != -1
+            or regex.indexIn(sourceModel().data(index1)) != -1
+           and dateInRange(sourceModel().data(index2))
 //! [3]
 
 //! [4] //! [5]
@@ -77,20 +77,18 @@ def lessThan(self, left, right):
 //! [4]
 
 //! [6]
-    if leftData.type() == QVariant.DateTime:
-        return leftData.toDateTime() < rightData.toDateTime()
+    if isinstance(leftData, QDateTime):
+        return leftData < rightData
     else:
         emailPattern = QRegExp("([\\w\\.]*@[\\w\\.]*)")
 
-        leftString = leftData.toString()
-        if left.column() == 1 && emailPattern.indexIn(leftString) != -1:
-            leftString = emailPattern.cap(1)
+        if left.column() == 1 && emailPattern.indexIn(leftData) != -1:
+            leftData = emailPattern.cap(1)
 
-        rightString = rightData.toString()
-        if right.column() == 1 && emailPattern.indexIn(rightString) != -1:
-            rightString = emailPattern.cap(1)
+        if right.column() == 1 && emailPattern.indexIn(rightData) != -1:
+            rightData = emailPattern.cap(1)
 
-        return QString.localeAwareCompare(leftString, rightString) < 0
+        return leftString < rightString
 
 //! [5] //! [6]