diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-12 20:26:13 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 08:17:02 +0100 |
commit | 28113c7c8b74f957be812b61b861efc5bac12c3e (patch) | |
tree | 6f752ea355dc8dc8a79d3be826c8a08617bc1698 /src | |
parent | 700910d938c75c978f765ec8438f81e70676999a (diff) |
don't use CamelCase includes
they are not available during bootstrap.
Change-Id: I5e941f22cd2b9fa622730ba0bf8389394f6a30a5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/qml/parser/qqmljs.g | 17 | ||||
-rw-r--r-- | src/qml/qml/parser/qqmljsast_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/parser/qqmljsengine_p.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/parser/qqmljsengine_p.h | 4 | ||||
-rw-r--r-- | src/qml/qml/parser/qqmljslexer.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/parser/qqmljslexer_p.h | 3 | ||||
-rw-r--r-- | src/qml/qml/parser/qqmljsparser.cpp | 12 | ||||
-rw-r--r-- | src/qml/qml/parser/qqmljsparser_p.h | 4 |
8 files changed, 28 insertions, 26 deletions
diff --git a/src/qml/qml/parser/qqmljs.g b/src/qml/qml/parser/qqmljs.g index b4307909ea..ff4f54374b 100644 --- a/src/qml/qml/parser/qqmljs.g +++ b/src/qml/qml/parser/qqmljs.g @@ -127,16 +127,16 @@ ** ****************************************************************************/ -#include <QtCore/QtDebug> -#include <QtCore/QCoreApplication> - -#include <string.h> - #include "qqmljsengine_p.h" #include "qqmljslexer_p.h" #include "qqmljsast_p.h" #include "qqmljsmemorypool_p.h" +#include <QtCore/qdebug.h> +#include <QtCore/qcoreapplication.h> + +#include <string.h> + ./ /:/**************************************************************************** @@ -212,8 +212,8 @@ #include "qqmljsast_p.h" #include "qqmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QtCore/qlist.h> +#include <QtCore/qstring.h> QT_QML_BEGIN_NAMESPACE @@ -391,7 +391,8 @@ protected: /. #include "qqmljsparser_p.h" -#include <QVarLengthArray> + +#include <QtCore/qvarlengtharray.h> // // W A R N I N G diff --git a/src/qml/qml/parser/qqmljsast_p.h b/src/qml/qml/parser/qqmljsast_p.h index 4c4af9ce9c..01a872f1e8 100644 --- a/src/qml/qml/parser/qqmljsast_p.h +++ b/src/qml/qml/parser/qqmljsast_p.h @@ -57,7 +57,7 @@ #include "qqmljsglobal_p.h" #include "qqmljsmemorypool_p.h" -#include <QtCore/QString> +#include <QtCore/qstring.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/qml/qml/parser/qqmljsengine_p.cpp b/src/qml/qml/parser/qqmljsengine_p.cpp index 9a61a62e3b..7dc3b6f6cb 100644 --- a/src/qml/qml/parser/qqmljsengine_p.cpp +++ b/src/qml/qml/parser/qqmljsengine_p.cpp @@ -42,9 +42,9 @@ #include "qqmljsengine_p.h" #include "qqmljsglobal_p.h" -#include <qnumeric.h> -#include <QHash> -#include <QDebug> +#include <QtCore/qnumeric.h> +#include <QtCore/qhash.h> +#include <QtCore/qdebug.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/qml/qml/parser/qqmljsengine_p.h b/src/qml/qml/parser/qqmljsengine_p.h index f1729c0526..4f58e7f8ea 100644 --- a/src/qml/qml/parser/qqmljsengine_p.h +++ b/src/qml/qml/parser/qqmljsengine_p.h @@ -57,8 +57,8 @@ #include "qqmljsastfwd_p.h" #include "qqmljsmemorypool_p.h" -#include <QString> -#include <QSet> +#include <QtCore/qstring.h> +#include <QtCore/qset.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/qml/qml/parser/qqmljslexer.cpp b/src/qml/qml/parser/qqmljslexer.cpp index 9175efe054..edd85ec878 100644 --- a/src/qml/qml/parser/qqmljslexer.cpp +++ b/src/qml/qml/parser/qqmljslexer.cpp @@ -44,9 +44,9 @@ #include "qqmljsmemorypool_p.h" #include "qqmljskeywords_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QVarLengthArray> -#include <QtCore/QDebug> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qvarlengtharray.h> +#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); diff --git a/src/qml/qml/parser/qqmljslexer_p.h b/src/qml/qml/parser/qqmljslexer_p.h index e7e15cbf94..e1b51da92b 100644 --- a/src/qml/qml/parser/qqmljslexer_p.h +++ b/src/qml/qml/parser/qqmljslexer_p.h @@ -55,7 +55,8 @@ #include "qqmljsglobal_p.h" #include "qqmljsgrammar_p.h" -#include <QtCore/QString> + +#include <QtCore/qstring.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/qml/qml/parser/qqmljsparser.cpp b/src/qml/qml/parser/qqmljsparser.cpp index bc03b57525..a0fa7a4711 100644 --- a/src/qml/qml/parser/qqmljsparser.cpp +++ b/src/qml/qml/parser/qqmljsparser.cpp @@ -39,20 +39,20 @@ ** ****************************************************************************/ -#include <QtCore/QtDebug> -#include <QtCore/QCoreApplication> - -#include <string.h> - #include "qqmljsengine_p.h" #include "qqmljslexer_p.h" #include "qqmljsast_p.h" #include "qqmljsmemorypool_p.h" +#include <QtCore/qdebug.h> +#include <QtCore/qcoreapplication.h> + +#include <string.h> #include "qqmljsparser_p.h" -#include <QVarLengthArray> + +#include <QtCore/qvarlengtharray.h> // // W A R N I N G diff --git a/src/qml/qml/parser/qqmljsparser_p.h b/src/qml/qml/parser/qqmljsparser_p.h index 7becd5f5c8..1b13690547 100644 --- a/src/qml/qml/parser/qqmljsparser_p.h +++ b/src/qml/qml/parser/qqmljsparser_p.h @@ -71,8 +71,8 @@ #include "qqmljsast_p.h" #include "qqmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QtCore/qlist.h> +#include <QtCore/qstring.h> QT_QML_BEGIN_NAMESPACE |