diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-11-30 16:39:20 -0800 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-01-04 10:41:49 +0000 |
| commit | 00a3f9a3ba44dda2257a226c620f7cfcdc3a62a8 (patch) | |
| tree | ed8115eb9810288ab3d76bebd0c0c36e8b5d72cd /src/lib/corelib/logging | |
| parent | 1b01fd8d1b7729ebeb071fe1cec6dd65256f132e (diff) | |
Change style of #includes of Qt headers
By using q<lowercase>.h headers, we become more bootstrap-friendly, as no
full syncqt is required any more.
In the same go, prefix all includes with the module name. This helps
grep-based analysis of which parts of Qt are used and where. It's also
consistent with Qt's public headers (where syncqt enforces the style).
Testdata and examples are excluded from the change, as they are not
relevant for bootstrapping.
Change-Id: I9539b1d795e87fca6e5fc6c91acbb775b79208d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/logging')
| -rw-r--r-- | src/lib/corelib/logging/ilogsink.cpp | 4 | ||||
| -rw-r--r-- | src/lib/corelib/logging/ilogsink.h | 2 | ||||
| -rw-r--r-- | src/lib/corelib/logging/logger.cpp | 10 | ||||
| -rw-r--r-- | src/lib/corelib/logging/logger.h | 6 | ||||
| -rw-r--r-- | src/lib/corelib/logging/translator.h | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/corelib/logging/ilogsink.cpp b/src/lib/corelib/logging/ilogsink.cpp index 4bec7f612..34abca24e 100644 --- a/src/lib/corelib/logging/ilogsink.cpp +++ b/src/lib/corelib/logging/ilogsink.cpp @@ -40,8 +40,8 @@ #include <tools/error.h> -#include <QByteArray> -#include <QMutex> +#include <QtCore/qbytearray.h> +#include <QtCore/qmutex.h> namespace qbs { diff --git a/src/lib/corelib/logging/ilogsink.h b/src/lib/corelib/logging/ilogsink.h index c5c310723..4b25aa7b8 100644 --- a/src/lib/corelib/logging/ilogsink.h +++ b/src/lib/corelib/logging/ilogsink.h @@ -41,7 +41,7 @@ #include "../tools/qbs_export.h" -#include <QString> +#include <QtCore/qstring.h> namespace qbs { class ErrorInfo; diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp index 7aadd785b..c1d9f619a 100644 --- a/src/lib/corelib/logging/logger.cpp +++ b/src/lib/corelib/logging/logger.cpp @@ -43,11 +43,11 @@ #include "logger.h" -#include <QByteArray> -#include <QElapsedTimer> -#include <QMutex> -#include <QSet> -#include <QVariant> +#include <QtCore/qbytearray.h> +#include <QtCore/qelapsedtimer.h> +#include <QtCore/qmutex.h> +#include <QtCore/qset.h> +#include <QtCore/qvariant.h> #include <cstdarg> #include <stdio.h> diff --git a/src/lib/corelib/logging/logger.h b/src/lib/corelib/logging/logger.h index ef35198be..be0c1de3d 100644 --- a/src/lib/corelib/logging/logger.h +++ b/src/lib/corelib/logging/logger.h @@ -44,9 +44,9 @@ #include <tools/error.h> -#include <QByteArray> -#include <QString> -#include <QStringList> +#include <QtCore/qbytearray.h> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE class QVariant; diff --git a/src/lib/corelib/logging/translator.h b/src/lib/corelib/logging/translator.h index 4eca789e0..122457e54 100644 --- a/src/lib/corelib/logging/translator.h +++ b/src/lib/corelib/logging/translator.h @@ -41,7 +41,7 @@ #include <tools/qbs_export.h> -#include <QCoreApplication> +#include <QtCore/qcoreapplication.h> namespace qbs { namespace Internal { |