Include Qt classes by module and remove unnecessary comments

src/qtpromise/qpromise.h

@@ -13,10 +13,8 @@
 #include "qpromiseglobal.h"
 #include "qpromiseresolver.h"
 
-// Qt
+#include <QtCore/QExplicitlySharedDataPointer>
-#include <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;

src/qtpromise/qpromise.inl

@@ -8,10 +8,9 @@
 #include "qpromise.h"
 #include "qpromisehelpers.h"
 
-// Qt
+#include <QtCore/QCoreApplication>
-#include <QCoreApplication>
+#include <QtCore/QSharedPointer>
-#include <QSharedPointer>
+#include <QtCore/QTimer>
-#include <QTimer>
 
 namespace QtPromise {
 

src/qtpromise/qpromise_p.h

@@ -10,15 +10,14 @@
 
 #include "qpromiseglobal.h"
 
-// Qt
+#include <QtCore/QAbstractEventDispatcher>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
-#include <QAbstractEventDispatcher>
+#include <QtCore/QPointer>
-#include <QThread>
+#include <QtCore/QReadWriteLock>
-#include <QVector>
+#include <QtCore/QSharedData>
-#include <QReadWriteLock>
+#include <QtCore/QSharedPointer>
-#include <QSharedPointer>
+#include <QtCore/QThread>
-#include <QSharedData>
+#include <QtCore/QVector>
-#include <QPointer>
 
 namespace QtPromise {
 

src/qtpromise/qpromiseconnections.h

@@ -8,8 +8,7 @@
 #ifndef QTPROMISE_QPROMISECONNECTIONS_H
 #define QTPROMISE_QPROMISECONNECTIONS_H
 
-// Qt
+#include <QtCore/QSharedPointer>
-#include <QSharedPointer>
 
 namespace QtPromise {
 

src/qtpromise/qpromiseexceptions.h

@@ -11,8 +11,7 @@
 #include "qpromise_p.h"
 #include "qpromiseglobal.h"
 
-// Qt
+#include <QtCore/QException>
-#include <QException>
 
 namespace QtPromise {
 

src/qtpromise/qpromisefuture.h

@@ -10,9 +10,8 @@
 
 #include "qpromiseexceptions.h"
 
-// Qt
+#include <QtCore/QFuture>
-#include <QFutureWatcher>
+#include <QtCore/QFutureWatcher>
-#include <QFuture>
 
 namespace QtPromisePrivate {
 

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
 {

src/qtpromise/qpromiseresolver.h

@@ -10,8 +10,7 @@
 
 #include "qpromiseexceptions.h"
 
-// Qt
+#include <QtCore/QExplicitlySharedDataPointer>
-#include <QExplicitlySharedDataPointer>
 
 namespace QtPromise {
 

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

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;

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;

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;

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;

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;

tests/auto/qtpromise/helpers/tst_all.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

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;

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;

tests/auto/qtpromise/helpers/tst_each.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

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;

tests/auto/qtpromise/helpers/tst_map.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

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;

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;

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;

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;

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;

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;

tests/auto/qtpromise/qpromise/tst_each.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

tests/auto/qtpromise/qpromise/tst_fail.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

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;

tests/auto/qtpromise/qpromise/tst_finally.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

tests/auto/qtpromise/qpromise/tst_map.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

tests/auto/qtpromise/qpromise/tst_operators.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

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;

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;

tests/auto/qtpromise/qpromise/tst_tap.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

tests/auto/qtpromise/qpromise/tst_tapfail.cpp

@@ -7,10 +7,7 @@
 
 #include "../shared/utils.h"
 
-// QtPromise
 #include <QtPromise>
-
-// Qt
 #include <QtTest>
 
 using namespace QtPromise;

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

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;

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;

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;

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 {

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 <QtCore/QObject>
-#include <QObject>
 
 class Object : public QObject
 {

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;