Initial fixes of the doc snippets

Fix some findings obtained by comparing to the corresponding
C++ snippets.

Task-number: PYSIDE-363
Change-Id: I41b8a0b12f322ea9c44d58f82cb9cd497413c9d8
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

17 files changed, 33 insertions, 46 deletions

diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
index 2297e6894..9ddf2d602 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -92,11 +92,8 @@ settings.value("HKEY_CURRENT_USER\\MySoft\\Star Runner\\Galaxy\\Default")   # re
 
 
 //! [7]
-#ifdef Q_WS_MAC
-    settings = QSettings("grenoullelogique.fr", "Squash")
-#else
-    settings = QSettings("Grenoulle Logique", "Squash")
-#endif
+    organizationName = "grenoullelogique.fr" if sys.platform.startswith('darwin') else "Grenoulle Logique"
+    settings = QSettings(organizationName, "Squash")
 //! [7]
 
 
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
index 5910bc67b..7328a41c0 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -253,7 +253,7 @@ ba.lastIndexOf("X")        # returns -1
 
 
 //! [25]
-url = QByteArray("ftp://ftp.trolltech.com/")
+url = QByteArray("ftp://ftp.qt-project.org/")
 if url.startsWith("ftp:"):
     ...
 //! [25]
@@ -288,16 +288,16 @@ z = x.mid(5)        # z == "pineapples"
 
 
 //! [30]
-x = QByteArray("TROlltECH")
+x = QByteArray("Qt by THE QT COMPANY")
 y = x.toLower()
-# y == "trolltech"
+# y == "qt by the qt company"
 //! [30]
 
 
 //! [31]
-x = QByteArray("TROlltECH")
+x = QByteArray("Qt by THE QT COMPANY")
 y = x.toUpper()
-# y == "TROLLTECH"
+# y == "QT BY THE QT COMPANY"
 //! [31]
 
 
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qregexp.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
index 338582651..7afefee7c 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
@@ -136,7 +136,7 @@ while pos >= 0:
 
 
 //! [10]
-txt = "Nokia Corporation and/or its subsidiary(-ies)\tqtsoftware.com\tNorway"
+txt = "The Qt Company Ltd\tqt.io\tFinland"
 rx.setPattern("^([^\t]+)\t([^\t]+)\t([^\t]+)$");
 if rx.indexIn(txt) != -1:
     company = rx.cap(1)
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qapplication.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qapplication.cpp
index d3e371b1e..3ea9bb495 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qapplication.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qapplication.cpp
@@ -50,19 +50,9 @@
 
 //! [0]
 def main():
-    if Qt.Q_WS_X11
-        useGUI = getenv("DISPLAY") != 0
-    else:
-        useGUI = True
-
-    app = QApplication(sys.argv, useGUI)
-
-    if useGUI:
-       # start GUI version
-       ...
-    else:
-       # start non-GUI version
-       ...
+    useGUI = not '-no-gui' in sys.argv
+    app = QApplication(sys.argv) if useGUI else QCoreApplication(sys.argv)
+    ...
     return app.exec_()
 //! [0]
 
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp
index e69152401..47369ee8b 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 //! [0]
-clipboard = QApplication.clipboard()
+clipboard = QGuiApplication.clipboard()
 originalText = clipboard.text()
 ...
 clipboard.setText(newText)
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp
index e702214f7..0d0807971 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp
@@ -216,7 +216,7 @@ painter.drawPixmap(target, image, source)
 
 //! [17]
 painter = QPainter(self)
-painter.drawText(rect, Qt.AlignCenter, tr("Qt by\nTrolltech"))
+painter.drawText(rect, Qt.AlignCenter, tr("Qt\nProject"))
 //! [17]
 
 
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_styles_qstyle.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_styles_qstyle.cpp
index ba8719dc3..bdbdbad73 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_styles_qstyle.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_styles_qstyle.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 //! [0]
-python myapplication.py -style motif
+python myapplication.py -style windows
 //! [0]
 
 
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qftp.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qftp.cpp
index b227b5797..26177869a 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qftp.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qftp.cpp
@@ -50,13 +50,13 @@
 
 //! [0]
 ftp = QFtp(parent)
-ftp.connectToHost("ftp.trolltech.com")
+ftp.connectToHost("ftp.qt-project.org")
 ftp.login()
 //! [0]
 
 
 //! [1]
-ftp.connectToHost("ftp.trolltech.com") # id == 1
+ftp.connectToHost("ftp.qt-project.org") # id == 1
 ftp.login()                            # id == 2
 ftp.cd("qt")                           # id == 3
 ftp.get("INSTALL")                     # id == 4
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
index 0c7afec10..962733aa6 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
@@ -52,13 +52,13 @@
 manager = QNetworkAccessManager(self)
 manager.finished[QNetworkReply].connect(self.replyFinished)
 
-manager.get(QNetworkRequest(QUrl("http://qt.nokia.com")))
+manager.get(QNetworkRequest(QUrl("http://qt-project.org")))
 //! [0]
 
 
 //! [1]
 request = QNetworkRequest()
-request.setUrl(QUrl("http://qt.nokia.com"))
+request.setUrl(QUrl("http://qt-project.org"))
 request.setRawHeader("User-Agent", "MyOwnBrowser 1.0")
 
 reply = manager.get(request)
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
index 7e2aea326..53d0de06e 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
@@ -57,11 +57,11 @@ manager.setCache(diskCache)
 
 //! [1]
 # do a normal request (preferred from network, as this is the default)
-request = QNetworkRequest(QUrl("http://qt.nokia.com"))
+request = QNetworkRequest(QUrl("http://qt-project.org"))
 manager.get(request)
 
 # do a request preferred from cache
-request2 = QNetworkRequest(QUrl("http://qt.nokia.com"))
+request2 = QNetworkRequest(QUrl("http://qt-project.org"))
 request2.setAttribute(QNetworkRequest.CacheLoadControlAttribute, QNetworkRequest.PreferCache)
 manager.get(request2)
 //! [1]
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
index c1971b0ba..87e773863 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
@@ -49,8 +49,8 @@
 ****************************************************************************/
 
 //! [0]
-# To find the IP address of qtsoftware.com
-QHostInfo.lookupHost("qtsoftware.com", self, SLOT("printResults(QHostInfo)"))
+# To find the IP address of qt-project.org
+QHostInfo.lookupHost("qt-project.org", self, SLOT("printResults(QHostInfo)"))
 
 # To find the host name for 4.2.2.1
 QHostInfo.lookupHost("4.2.2.1", self, SLOT("printResults(QHostInfo)"))
@@ -58,7 +58,7 @@ QHostInfo.lookupHost("4.2.2.1", self, SLOT("printResults(QHostInfo)"))
 
 
 //! [1]
-info = QHostInfo.fromName("qtsoftware.com")
+info = QHostInfo.fromName("qt-project.org")
 //! [1]
 
 
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_xml_dom_qdom.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_xml_dom_qdom.cpp
index 741a75245..33f639c84 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_xml_dom_qdom.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_xml_dom_qdom.cpp
@@ -116,7 +116,7 @@ QDomElement element4 = document.createElement("MyElement")
 
 
 //! [7]
-<link href="http://qtsoftware.com" color="red" />
+<link href="http://qt-project.org" color="red" />
 //! [7]
 
 
@@ -124,10 +124,10 @@ QDomElement element4 = document.createElement("MyElement")
 e = # some QDomElement...
 #...
 a = e.attributeNode("href")
-print a.value()                         # prints "http://qtsoftware.com"
-a.setValue("http://doc.trolltech.com")  # change the node's attribute
+print a.value()                         # prints "http://qt-project.org.com"
+a.setValue("http://qt-project.org/doc")  # change the node's attribute
 a2 = e.attributeNode("href")
-print a2.value()                        # prints "http://doc.trolltech.com"
+print a2.value()                        # prints "http://qt-project.org/doc"
 //! [8]
 
 
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/customstyle/customstyle.h b/sources/pyside2/doc/codesnippets/doc/src/snippets/customstyle/customstyle.h
index a89c621a1..89e324cb3 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/customstyle/customstyle.h
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/customstyle/customstyle.h
@@ -51,10 +51,10 @@
 #ifndef CUSTOMSTYLE_H
 #define CUSTOMSTYLE_H
 
-#include <QWindowsStyle>
+#include <QProxyStyle>
 
 //! [0]
-class CustomStyle(QWindowsStyle):
+class CustomStyle(QProxyStyle):
     ...
 
     def drawPrimitive(PrimitiveElement element, const QStyleOption *option,
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/customviewstyle.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/customviewstyle.cpp
index 240f9ab88..f21ec7c89 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/customviewstyle.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/customviewstyle.cpp
@@ -73,7 +73,7 @@ void CustomViewStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
         break;
         }    
         default:
-            QWindowsStyle::drawPrimitive(element, option, painter, widget);
+            QProxyStyle::drawPrimitive(element, option, painter, widget);
     }
 //![0]
 }
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp
index 160064627..954feb402 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp
@@ -98,7 +98,7 @@ void DropArea.dropEvent(QDropEvent *event)
 
 //![0]
 def paste(self):
-    clipboard = QApplication.clipboard()
+    clipboard = QGuiApplication.clipboard()
     mimeData = clipboard.mimeData()
 
     if mimeData.hasImage():
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp
index 03ce62bea..8236ec6c5 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
     program = "./../../../../examples/widgets/analogclock/analogclock";
 
 //! [2]
-    arguments = ["-style", "motif"]
+    arguments = ["-style", "fusion"]
 
     myProcess = QProcess(parent)
     myProcess.start(program, arguments)
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/main.cpp
index 9838dab1d..e3a24968e 100644
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/main.cpp
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
     stream.writeAttribute("folded", "no");
 //! [write element]
     stream.writeStartElement("bookmark");
-    stream.writeAttribute("href", "http://www.qtsoftware.com/");
+    stream.writeAttribute("href", "http://qt-project.org/");
     stream.writeTextElement("title", "Qt Home");
     stream.writeEndElement(); // bookmark
 //! [write element]