重写多线程例子

Battery/Battery.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

BubbleWindow/BubbleWindow.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

CMakeLists.txt

@@ -16,7 +16,7 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt6 REQUIRED COMPONENTS Widgets Charts Network Concurrent Sql)
+find_package(Qt6 REQUIRED COMPONENTS Core Widgets Charts Network Concurrent Sql)
 
 add_subdirectory(Battery)
 add_subdirectory(BubbleWindow)

Chart/Chart.pro

@@ -2,7 +2,7 @@ QT       += core gui charts
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

Clock/Clock.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

DashBoard/DashBoard.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

DragDrop/DragDrop.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

FlowLayout/FlowLayout.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.

GridViewModel/GridViewModel.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.

HttpClient/HttpClient.pro

@@ -2,7 +2,7 @@ QT       += core gui network concurrent
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

LogAsynchronous/LogAsynchronous.pro

@@ -2,7 +2,7 @@ QT       += core gui concurrent
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

MulClient/MulClient.pro

@@ -2,7 +2,7 @@ QT       += core gui network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

MulServer/MulServer.pro

@@ -2,7 +2,7 @@ QT       += core gui network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

NavigationProgressBar/NavigationProgressBar.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

ProgressArc/ProgressArc.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

ProgressBar/ProgressBar.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.

README.md

@@ -100,9 +100,7 @@
 
 <div align=center><img src="TableViewModel/picture/TabViewModelDelegate.png"></div>
 
-## 23. [Thread](Thread/)——多线程例子，四种写法，控件更新在子线程；
-
-<div align=center><img src="Thread/picture/Thread.png"></div>
+## 23. [Thread](Thread/)——多线程例子，6种写法；
 
 ## 24. [TreeViewModel](TreeViewModel/)——树形视图（MVC），QtCreator源码；
 

ReactorServer/ReactorServer.pro

@@ -2,7 +2,7 @@ QT       += core gui network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

SimpleUdp/SimpleUdp.pro

@@ -1,7 +1,7 @@
 QT -= gui
 QT += network
 
-CONFIG += c++11 console
+CONFIG += c++17 console
 CONFIG -= app_bundle
 
 # You can make your code fail to compile if it uses deprecated APIs.

SlipButton/SlipButton.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

SqlTabview/SqlTabview.pro

@@ -2,7 +2,7 @@ QT       += core gui sql
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

TableViewModel/TableViewModel.pro

@@ -2,7 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += c++11
+CONFIG += c++17
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

Thread/CMakeLists.txt

@@ -1,16 +1,12 @@
 set(PROJECT_SOURCES
-        main.cpp
-        mainwindow.cpp
-        mainwindow.h
-        test.h
-        test.cpp
-        thread1.h
-        thread1.cpp
-        thread2.h
-        thread2.cpp
-        thread3.h
-        thread3.cpp)
+        functions.cc
+        functions.hpp
+        main.cc
+        task.cc
+        task.hpp
+        thread.cc
+        thread.hpp)
 
 qt_add_executable(Thread MANUAL_FINALIZATION ${PROJECT_SOURCES})
-target_link_libraries(Thread PRIVATE Qt6::Widgets Qt6::Concurrent)
-qt_finalize_executable(Thread)
+target_link_libraries(Thread PRIVATE Qt6::Core Qt6::Concurrent) 
+qt_finalize_executable(Thread)

Thread/Thread.pro

@@ -1,36 +1,26 @@
-QT       += core gui concurrent
+QT -= gui
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += concurrent
 
-CONFIG += c++11
+CONFIG += c++17 console
+CONFIG -= app_bundle
 
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
+# You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
-    main.cpp \
-    mainwindow.cpp \
-    test.cpp \
-    thread1.cpp \
-    thread2.cpp \
-    thread3.cpp
-
-HEADERS += \
-    mainwindow.h \
-    test.h \
-    thread1.h \
-    thread2.h \
-    thread3.h
+        functions.cc \
+        main.cc \
+        task.cc \
+        thread.cc
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
+
+HEADERS += \
+    functions.hpp \
+    task.hpp \
+    thread.hpp

Thread/functions.cc

@@ -0,0 +1,9 @@
+#include "functions.hpp"
+
+#include <QThread>
+
+QString Functions::getCurrentThreadIDStr()
+{
+    return QString("Current Thread ID: %1.")
+        .arg(reinterpret_cast<qint64>(QThread::currentThreadId()));
+}

Thread/functions.hpp

@@ -0,0 +1,12 @@
+#ifndef FUNCTIONS_HPP
+#define FUNCTIONS_HPP
+
+#include <QtCore/qglobal.h>
+
+namespace Functions {
+
+QString getCurrentThreadIDStr();
+
+}
+
+#endif // FUNCTIONS_HPP

Thread/main.cc

@@ -0,0 +1,30 @@
+#include <QTimer>
+#include <QtCore/QCoreApplication>
+
+#include "thread.hpp"
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    QScopedPointer<Thread1> t1(new Thread1);
+    t1->start();
+
+    QScopedPointer<Thread2> t2(new Thread2);
+    t2->start();
+    QObject::connect(t2.data(), &Thread2::started, t2.data(), &Thread2::onDo);
+
+    QScopedPointer<Thread3> t3(new Thread3);
+    t3->dooo();
+
+    runThread4();
+
+    runThread5();
+
+    QScopedPointer<QThread> t6(runThread6());
+    t6->start();
+
+    QTimer::singleShot(1000, &a, &QCoreApplication::quit);
+
+    return a.exec();
+}