Include Qt classes by module and remove unnecessary comments

2024-11-21 18:24:29 +08:00 · 2020-02-11 21:21:18 +01:00 · 2020-02-11 21:21:18 +01:00 · 2c1e631aed
commit 2c1e631aed
parent d5a82518f9
43 changed files with 29 additions and 148 deletions
--- a/src/qtpromise/qpromise.h
+++ b/src/qtpromise/qpromise.h
@ -13,10 +13,8 @@
 #include "qpromiseglobal.h"
 #include "qpromiseresolver.h"

-// Qt
-#include <QExplicitlySharedDataPointer>
+#include <QtCore/QExplicitlySharedDataPointer>

-// C++ Standard Library
 #include <chrono>

 namespace QtPromise {
@ -79,7 +77,7 @@ public:
    template <typename E = QPromiseTimeoutException>
    inline QPromise<T> timeout(std::chrono::milliseconds msec, E&& error = E()) const;

-    inline QPromise<T> delay(int msec) const;    
+    inline QPromise<T> delay(int msec) const;
    inline QPromise<T> delay(std::chrono::milliseconds msec) const;

    inline QPromise<T> wait() const;
--- a/src/qtpromise/qpromise.inl
+++ b/src/qtpromise/qpromise.inl
@ -8,10 +8,9 @@
 #include "qpromise.h"
 #include "qpromisehelpers.h"

-// Qt
-#include <QCoreApplication>
-#include <QSharedPointer>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QTimer>

 namespace QtPromise {

--- a/src/qtpromise/qpromise_p.h
+++ b/src/qtpromise/qpromise_p.h
@ -10,15 +10,14 @@

 #include "qpromiseglobal.h"

-// Qt
-#include <QCoreApplication>
-#include <QAbstractEventDispatcher>
-#include <QThread>
-#include <QVector>
-#include <QReadWriteLock>
-#include <QSharedPointer>
-#include <QSharedData>
-#include <QPointer>
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QPointer>
+#include <QtCore/QReadWriteLock>
+#include <QtCore/QSharedData>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QThread>
+#include <QtCore/QVector>

 namespace QtPromise {

--- a/src/qtpromise/qpromiseconnections.h
+++ b/src/qtpromise/qpromiseconnections.h
@ -8,8 +8,7 @@
 #ifndef QTPROMISE_QPROMISECONNECTIONS_H
 #define QTPROMISE_QPROMISECONNECTIONS_H

-// Qt
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>

 namespace QtPromise {

--- a/src/qtpromise/qpromiseexceptions.h
+++ b/src/qtpromise/qpromiseexceptions.h
@ -11,8 +11,7 @@
 #include "qpromise_p.h"
 #include "qpromiseglobal.h"

-// Qt
-#include <QException>
+#include <QtCore/QException>

 namespace QtPromise {

--- a/src/qtpromise/qpromisefuture.h
+++ b/src/qtpromise/qpromisefuture.h
@ -10,9 +10,8 @@

 #include "qpromiseexceptions.h"

-// Qt
-#include <QFutureWatcher>
-#include <QFuture>
+#include <QtCore/QFuture>
+#include <QtCore/QFutureWatcher>

 namespace QtPromisePrivate {

--- a/src/qtpromise/qpromiseglobal.h
+++ b/src/qtpromise/qpromiseglobal.h
@ -8,12 +8,10 @@
 #ifndef QTPROMISE_QPROMISEGLOBAL_H
 #define QTPROMISE_QPROMISEGLOBAL_H

-// QtCore
 #include <QtGlobal>

-// STL
-#include <functional>
 #include <array>
+#include <functional>

 namespace QtPromisePrivate
 {
--- a/src/qtpromise/qpromiseresolver.h
+++ b/src/qtpromise/qpromiseresolver.h
@ -10,8 +10,7 @@

 #include "qpromiseexceptions.h"

-// Qt
-#include <QExplicitlySharedDataPointer>
+#include <QtCore/QExplicitlySharedDataPointer>

 namespace QtPromise {

--- a/tests/auto/qtpromise/benchmark/tst_benchmark.cpp
+++ b/tests/auto/qtpromise/benchmark/tst_benchmark.cpp
@ -7,10 +7,7 @@

 #include "../shared/data.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 #ifdef Q_CC_MSVC
--- a/tests/auto/qtpromise/deprecations/tst_helpers_qpromise.cpp
+++ b/tests/auto/qtpromise/deprecations/tst_helpers_qpromise.cpp
@ -8,14 +8,10 @@
 #include "../shared/data.h"
 #include "../shared/utils.h"

-// QtPromise
-#include <QtPromise>
-
-// Qt
 #include <QtConcurrent>
+#include <QtPromise>
 #include <QtTest>

-// STL
 #include <memory>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/deprecations/tst_helpers_qpromiseall.cpp
+++ b/tests/auto/qtpromise/deprecations/tst_helpers_qpromiseall.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/deprecations/tst_qpromise_all.cpp
+++ b/tests/auto/qtpromise/deprecations/tst_qpromise_all.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/exceptions/tst_exceptions.cpp
+++ b/tests/auto/qtpromise/exceptions/tst_exceptions.cpp
@ -7,11 +7,8 @@

 #include "../shared/utils.h"

-// QtPromise
-#include <QtPromise>
-
-// Qt
 #include <QtConcurrent>
+#include <QtPromise>
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/future/tst_future.cpp
+++ b/tests/auto/qtpromise/future/tst_future.cpp
@ -5,11 +5,8 @@
 * the LICENSE file in the root directory of this source tree.
 */

-// QtPromise
-#include <QtPromise>
-
-// Qt
 #include <QtConcurrent>
+#include <QtPromise>
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_all.cpp
+++ b/tests/auto/qtpromise/helpers/tst_all.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_attempt.cpp
+++ b/tests/auto/qtpromise/helpers/tst_attempt.cpp
@ -7,14 +7,10 @@

 #include "../shared/utils.h"

-// QtPromise
-#include <QtPromise>
-
-// Qt
 #include <QtConcurrent>
+#include <QtPromise>
 #include <QtTest>

-// STL
 #include <memory>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_connect.cpp
+++ b/tests/auto/qtpromise/helpers/tst_connect.cpp
@ -8,10 +8,7 @@
 #include "../shared/object.h"
 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_each.cpp
+++ b/tests/auto/qtpromise/helpers/tst_each.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_filter.cpp
+++ b/tests/auto/qtpromise/helpers/tst_filter.cpp
@ -7,11 +7,8 @@

 #include "../shared/utils.h"

-// QtPromise
-#include <QtPromise>
-
-// Qt
 #include <QtConcurrent>
+#include <QtPromise>
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_map.cpp
+++ b/tests/auto/qtpromise/helpers/tst_map.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_reduce.cpp
+++ b/tests/auto/qtpromise/helpers/tst_reduce.cpp
@ -8,10 +8,7 @@
 #include "../shared/data.h"
 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_reject.cpp
+++ b/tests/auto/qtpromise/helpers/tst_reject.cpp
@ -7,13 +7,9 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

-// STL
 #include <memory>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/helpers/tst_resolve.cpp
+++ b/tests/auto/qtpromise/helpers/tst_resolve.cpp
@ -8,14 +8,10 @@
 #include "../shared/data.h"
 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtConcurrent>
 #include <QtTest>

-// STL
 #include <memory>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/internals/tst_argsof.cpp
+++ b/tests/auto/qtpromise/internals/tst_argsof.cpp
@ -5,10 +5,7 @@
 * the LICENSE file in the root directory of this source tree.
 */

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromisePrivate;
--- a/tests/auto/qtpromise/qpromise/tst_construct.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_construct.cpp
@ -7,13 +7,9 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

-// STL
 #include <memory>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_delay.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_delay.cpp
@ -7,13 +7,9 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

-// C++ Standard Library
 #include <chrono>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_each.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_each.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_fail.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_fail.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_filter.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_filter.cpp
@ -7,11 +7,8 @@

 #include "../shared/utils.h"

-// QtPromise
-#include <QtPromise>
-
-// Qt
 #include <QtConcurrent>
+#include <QtPromise>
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_finally.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_finally.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_map.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_map.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_operators.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_operators.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_reduce.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_reduce.cpp
@ -8,10 +8,7 @@
 #include "../shared/data.h"
 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_resolve.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_resolve.cpp
@ -8,13 +8,9 @@
 #include "../shared/data.h"
 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

-// STL
 #include <memory>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_tap.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_tap.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_tapfail.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_tapfail.cpp
@ -7,10 +7,7 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromise/tst_then.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_then.cpp
@ -7,14 +7,11 @@

 #include "../shared/utils.h"

-#include <functional>
-
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

+#include <functional>
+
 using namespace QtPromise;

 class tst_qpromise_then : public QObject
--- a/tests/auto/qtpromise/qpromise/tst_timeout.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_timeout.cpp
@ -7,13 +7,9 @@

 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

-// C++ Standard Library
 #include <chrono>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/qpromiseconnections/tst_qpromiseconnections.cpp
+++ b/tests/auto/qtpromise/qpromiseconnections/tst_qpromiseconnections.cpp
@ -8,10 +8,7 @@
 #include "../shared/object.h"
 #include "../shared/utils.h"

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/requirements/tst_requirements.cpp
+++ b/tests/auto/qtpromise/requirements/tst_requirements.cpp
@ -5,10 +5,7 @@
 * the LICENSE file in the root directory of this source tree.
 */

-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>

 using namespace QtPromise;
--- a/tests/auto/qtpromise/shared/data.h
+++ b/tests/auto/qtpromise/shared/data.h
@ -8,7 +8,6 @@
 #ifndef QTPROMISE_TESTS_AUTO_SHARED_DATA_H
 #define QTPROMISE_TESTS_AUTO_SHARED_DATA_H

-// STL
 #include <utility>

 struct Logs {
--- a/tests/auto/qtpromise/shared/object.h
+++ b/tests/auto/qtpromise/shared/object.h
@ -8,8 +8,7 @@
 #ifndef QTPROMISE_TESTS_AUTO_SHARED_SENDER_H
 #define QTPROMISE_TESTS_AUTO_SHARED_SENDER_H

-// Qt
-#include <QObject>
+#include <QtCore/QObject>

 class Object : public QObject
 {
--- a/tests/auto/qtpromise/thread/tst_thread.cpp
+++ b/tests/auto/qtpromise/thread/tst_thread.cpp
@ -5,11 +5,8 @@
 * the LICENSE file in the root directory of this source tree.
 */

-// QtPromise
-#include <QtPromise>
-
-// Qt
 #include <QtConcurrent>
+#include <QtPromise>
 #include <QtTest>

 using namespace QtPromise;