Updated examples.

sammy621 · Sep 6, 2021 · a2dd594 · a2dd594
1 parent 1235796
commit a2dd594
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 33 deletions.
diff --git a/docs/ch12-networking/rest-api.md b/docs/ch12-networking/rest-api.md
@@ -1,8 +1,8 @@
 # REST API
 
-To use a web-service, we first need to create one. We will use Flask ([http://flask.pocoo.org](http://flask.pocoo.org)) a simple HTTP app server based on python to create a simple color web-service. You could also use every other web server which accepts and returns JSON data. The idea is to have a list of named colors, which can be managed via the web-service. Managed in this case means CRUD (create-read-update-delete).
+To use a web-service, we first need to create one. We will use Flask ([https://flask.palletsprojects.com](https://flask.palletsprojects.com)) a simple HTTP app server based on python to create a simple color web-service. You could also use every other web server which accepts and returns JSON data. The idea is to have a list of named colors, which can be managed via the web-service. Managed in this case means CRUD (create-read-update-delete).
 
-A simple web-service in Flask can be written in one file. We start with an empty `server.py` file. Inside this file, we create some boiler-code and load our initial colors from an external JSON file. See also the Flask [quickstart](http://flask.pocoo.org/docs/quickstart/) documentation.
+A simple web-service in Flask can be written in one file. We start with an empty `server.py` file. Inside this file, we create some boiler-code and load our initial colors from an external JSON file. See also the Flask [quickstart](https://flask.palletsprojects.com/en/2.0.x/quickstart/) documentation.
 
 ```py
 from flask import Flask, jsonify, request
@@ -38,7 +38,7 @@ This will return the colors under the ‘/colors’ endpoint. To test this we ca
 curl -i -GET http://localhost:5000/colors
 ```
 
-Which will return us the list of colors as JSON data?
+Which will return us the list of colors as JSON data.
 
 ## Read Entry
 

diff --git a/docs/ch12-networking/src/http_v1/Button.qml b/docs/ch12-networking/src/http_v1/Button.qml
@@ -1,7 +1,7 @@
 // M1>>
 // Button.qml
 
-import QtQuick 2.5
+import QtQuick
 
 Rectangle {
     width: 90

diff --git a/docs/ch12-networking/src/http_v1/main.qml b/docs/ch12-networking/src/http_v1/main.qml
@@ -1,6 +1,6 @@
 // M1>>
 // main.qml
-import QtQuick 2.5
+import QtQuick
 
 Rectangle {
     width: 320

diff --git a/docs/ch12-networking/src/http_v1/main2.qml b/docs/ch12-networking/src/http_v1/main2.qml
@@ -1,7 +1,7 @@
 // M1>>
 // main2.qml
-import QtQuick 2.5
-import "http://localhost:8080" 1.0 as Remote
+import QtQuick
+import "http://localhost:8080" as Remote
 
 Rectangle {
     width: 320

diff --git a/docs/ch12-networking/src/http_v1/remote.qml b/docs/ch12-networking/src/http_v1/remote.qml
@@ -1,6 +1,6 @@
 // M1>>
 // remote.qml
-import QtQuick 2.5
+import QtQuick
 
 Loader {
     id: root

diff --git a/docs/ch12-networking/src/http_v1/remote2.qml b/docs/ch12-networking/src/http_v1/remote2.qml
@@ -1,6 +1,6 @@
 // M1>>
 // remote.qml
-import QtQuick 2.5
+import QtQuick
 
 Loader {
     id: root

diff --git a/docs/ch12-networking/src/rest/Button.qml b/docs/ch12-networking/src/rest/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.5
+import QtQuick
 
 MouseArea {
     width: 140

diff --git a/docs/ch12-networking/src/rest/StatusLabel.qml b/docs/ch12-networking/src/rest/StatusLabel.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.5
+import QtQuick
 
 Text {
     id: root

diff --git a/docs/ch12-networking/src/rest/rest.qml b/docs/ch12-networking/src/rest/rest.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.5
+import QtQuick
 import "colorservice.js" as Service
 
 Rectangle {

diff --git a/docs/ch12-networking/src/restservice/server.py b/docs/ch12-networking/src/restservice/server.py
@@ -3,7 +3,8 @@
 from flask import Flask, jsonify, request
 import json
 
-colors = json.load(file('colors.json', 'r'))
+with open('colors.json', 'r') as file:
+    colors = json.load(file)
 
 app = Flask(__name__)
 

diff --git a/docs/ch12-networking/src/ws/ws_client/ChatInput.qml b/docs/ch12-networking/src/ws/ws_client/ChatInput.qml
@@ -1,5 +1,5 @@
 // ChatInput.qml
-import QtQuick 2.5
+import QtQuick
 
 FocusScope {
     id: root

diff --git a/docs/ch12-networking/src/ws/ws_client/ChatView.qml b/docs/ch12-networking/src/ws/ws_client/ChatView.qml
@@ -1,5 +1,5 @@
 // ChatView.qml
-import QtQuick 2.5
+import QtQuick
 
 ListView {
     id: root

diff --git a/docs/ch12-networking/src/ws/ws_client/Label.qml b/docs/ch12-networking/src/ws/ws_client/Label.qml
@@ -1,5 +1,5 @@
 // Label.qml
-import QtQuick 2.5
+import QtQuick
 
 Text {
     color: '#fff'

diff --git a/docs/ch12-networking/src/ws/ws_client/ws_client.qml b/docs/ch12-networking/src/ws/ws_client/ws_client.qml
@@ -1,6 +1,6 @@
 // ws_client.qml
-import QtQuick 2.5
-import Qt.WebSockets 1.0
+import QtQuick
+import QtWebSockets
 
 Rectangle {
     width: 360
@@ -20,7 +20,7 @@ Rectangle {
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         focus: true
-        onAccepted: {
+        onAccepted: function(text) {
             print('send message: ' + text)
             socket.sendTextMessage(text)
             box.append('>', text)
@@ -32,7 +32,7 @@ Rectangle {
 
         url: "ws://localhost:3000"
         active: true
-        onTextMessageReceived: {
+        onTextMessageReceived: function (message) {
             box.append('<', message)
         }
         onStatusChanged: {

diff --git a/docs/ch12-networking/src/wsecho/wsecho.qml b/docs/ch12-networking/src/wsecho/wsecho.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.5
-import Qt.WebSockets 1.0
+import QtQuick
+import QtWebSockets
 
 Text {
     width: 480
@@ -12,7 +12,7 @@ Text {
         id: socket
         url: "ws://echo.websocket.org"
         active: true
-        onTextMessageReceived: {
+        onTextMessageReceived: function (message) {
             text = message
         }
         onStatusChanged: {

diff --git a/docs/ch12-networking/web-sockets.md b/docs/ch12-networking/web-sockets.md
@@ -17,8 +17,8 @@ WebSocket {
 To test your web socket we will use the echo server from [http://websocket.org](http://websocket.org).
 
 ```qml
-import QtQuick 2.5
-import Qt.WebSockets 1.0
+import QtQuick
+import QtWebSockets
 
 Text {
     width: 480
@@ -31,7 +31,7 @@ Text {
         id: socket
         url: "ws://echo.websocket.org"
         active: true
-        onTextMessageReceived: {
+        onTextMessageReceived: function (message) {
             text = message
         }
         onStatusChanged: {
@@ -100,7 +100,7 @@ We will use a label with white color in the example.
 
 ```qml
 // Label.qml
-import QtQuick 2.5
+import QtQuick
 
 Text {
     color: '#fff'
@@ -113,7 +113,7 @@ Our chat view is a list view, where the text is appended to a list model. Each e
 
 ```qml
 // ChatView.qml
-import QtQuick 2.5
+import QtQuick
 
 ListView {
     id: root
@@ -148,7 +148,7 @@ The chat input is just a simple text input wrapped with a colored border.
 
 ```qml
 // ChatInput.qml
-import QtQuick 2.5
+import QtQuick
 
 FocusScope {
     id: root
@@ -183,8 +183,8 @@ When the web socket receives a message it appends the message to the chat view.
 
 ```qml
 // ws_client.qml
-import QtQuick 2.5
-import Qt.WebSockets 1.0
+import QtQuick
+import QtWebSockets
 
 Rectangle {
     width: 360
@@ -204,7 +204,7 @@ Rectangle {
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         focus: true
-        onAccepted: {
+        onAccepted: function (text) {
             print('send message: ' + text)
             socket.sendTextMessage(text)
             box.append('>', text)
@@ -216,7 +216,7 @@ Rectangle {
 
         url: "ws://localhost:3000"
         active: true
-        onTextMessageReceived: {
+        onTextMessageReceived: function (message) {
             box.append('<', message)
         }
         onStatusChanged: {