diff options
Diffstat (limited to 'qtscriptclassic')
75 files changed, 148 insertions, 148 deletions
diff --git a/qtscriptclassic/include/QtScript/QtScript b/qtscriptclassic/include/QtScript/QtScript index fbd3b13..a8c5a65 100644 --- a/qtscriptclassic/include/QtScript/QtScript +++ b/qtscriptclassic/include/QtScript/QtScript @@ -1,6 +1,6 @@ #ifndef QT_QTSCRIPT_MODULE_H #define QT_QTSCRIPT_MODULE_H -#include <QtCore/QtCore> +#include <QtCore> #include "qscriptextensionplugin.h" #include "qscriptvalue.h" #include "qscriptstring.h" diff --git a/qtscriptclassic/src/QtScript b/qtscriptclassic/src/QtScript index fbd3b13..a8c5a65 100644 --- a/qtscriptclassic/src/QtScript +++ b/qtscriptclassic/src/QtScript @@ -1,6 +1,6 @@ #ifndef QT_QTSCRIPT_MODULE_H #define QT_QTSCRIPT_MODULE_H -#include <QtCore/QtCore> +#include <QtCore> #include "qscriptextensionplugin.h" #include "qscriptvalue.h" #include "qscriptstring.h" diff --git a/qtscriptclassic/src/qscriptable.h b/qtscriptclassic/src/qscriptable.h index f57e6f4..c821c50 100644 --- a/qtscriptclassic/src/qscriptable.h +++ b/qtscriptclassic/src/qscriptable.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTABLE_H #define QSCRIPTABLE_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptable_p.h b/qtscriptclassic/src/qscriptable_p.h index 60a0827..8b22a1c 100644 --- a/qtscriptclassic/src/qscriptable_p.h +++ b/qtscriptclassic/src/qscriptable_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTABLE_P_H #define QSCRIPTABLE_P_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> // // W A R N I N G diff --git a/qtscriptclassic/src/qscriptarray_p.h b/qtscriptclassic/src/qscriptarray_p.h index 4454b58..651e1e0 100644 --- a/qtscriptclassic/src/qscriptarray_p.h +++ b/qtscriptclassic/src/qscriptarray_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include <QtCore/QMap> +#include <QMap> -#include <QtCore/QVector> +#include <QVector> #include "qscriptvalueimplfwd_p.h" #include "qscriptenginefwd_p.h" diff --git a/qtscriptclassic/src/qscriptasm.cpp b/qtscriptclassic/src/qscriptasm.cpp index dcb6951..4a822f2 100644 --- a/qtscriptclassic/src/qscriptasm.cpp +++ b/qtscriptclassic/src/qscriptasm.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ -#include <QtCore/QTextStream> +#include <QTextStream> #include "qscriptasm_p.h" diff --git a/qtscriptclassic/src/qscriptasm_p.h b/qtscriptclassic/src/qscriptasm_p.h index d7c04b7..8013673 100644 --- a/qtscriptclassic/src/qscriptasm_p.h +++ b/qtscriptclassic/src/qscriptasm_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> -#include <QtCore/qvector.h> +#include <qvector.h> #include "qscriptvalueimplfwd_p.h" diff --git a/qtscriptclassic/src/qscriptast_p.h b/qtscriptclassic/src/qscriptast_p.h index fc2e4e6..cc09fde 100644 --- a/qtscriptclassic/src/qscriptast_p.h +++ b/qtscriptclassic/src/qscriptast_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/QString> +#include <QString> #include "qscriptastvisitor_p.h" diff --git a/qtscriptclassic/src/qscriptastfwd_p.h b/qtscriptclassic/src/qscriptastfwd_p.h index a764def..1fd4901 100644 --- a/qtscriptclassic/src/qscriptastfwd_p.h +++ b/qtscriptclassic/src/qscriptastfwd_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTAST_FWD_P_H #define QSCRIPTAST_FWD_P_H -#include <QtCore/qglobal.h> +#include <qglobal.h> // // W A R N I N G diff --git a/qtscriptclassic/src/qscriptbuffer_p.h b/qtscriptclassic/src/qscriptbuffer_p.h index 61c7707..022a501 100644 --- a/qtscriptclassic/src/qscriptbuffer_p.h +++ b/qtscriptclassic/src/qscriptbuffer_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTBUFFER_P_H #define QSCRIPTBUFFER_P_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(Q_OS_VXWORKS) && defined(m_data) # undef m_data diff --git a/qtscriptclassic/src/qscriptclass.cpp b/qtscriptclassic/src/qscriptclass.cpp index b68da71..0b76fc3 100644 --- a/qtscriptclassic/src/qscriptclass.cpp +++ b/qtscriptclassic/src/qscriptclass.cpp @@ -42,7 +42,7 @@ #include "qscriptclass.h" -#include <QtCore/qstringlist.h> +#include <qstringlist.h> #include "qscriptclasspropertyiterator.h" #include "qscriptstring.h" diff --git a/qtscriptclassic/src/qscriptclass.h b/qtscriptclassic/src/qscriptclass.h index 179fb19..0c15641 100644 --- a/qtscriptclassic/src/qscriptclass.h +++ b/qtscriptclassic/src/qscriptclass.h @@ -42,10 +42,10 @@ #ifndef QSCRIPTCLASS_H #define QSCRIPTCLASS_H -#include <QtCore/qstring.h> +#include <qstring.h> -#include <QtCore/qvariant.h> +#include <qvariant.h> #include "qscriptvalue.h" QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptclass_p.h b/qtscriptclassic/src/qscriptclass_p.h index 118ebe4..6f1e616 100644 --- a/qtscriptclassic/src/qscriptclass_p.h +++ b/qtscriptclassic/src/qscriptclass_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTCLASS_P_H #define QSCRIPTCLASS_P_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptclassinfo_p.h b/qtscriptclassic/src/qscriptclassinfo_p.h index ec1d1ea..f291b1f 100644 --- a/qtscriptclassic/src/qscriptclassinfo_p.h +++ b/qtscriptclassic/src/qscriptclassinfo_p.h @@ -60,7 +60,7 @@ #include "qscriptclassdata_p.h" -#include <QtCore/qstring.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptclasspropertyiterator.h b/qtscriptclassic/src/qscriptclasspropertyiterator.h index 8aff475..45c3289 100644 --- a/qtscriptclassic/src/qscriptclasspropertyiterator.h +++ b/qtscriptclassic/src/qscriptclasspropertyiterator.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTCLASSPROPERTYITERATOR_H #define QSCRIPTCLASSPROPERTYITERATOR_H -#include <QtCore/qstring.h> +#include <qstring.h> #include "qscriptvalue.h" diff --git a/qtscriptclassic/src/qscriptclasspropertyiterator_p.h b/qtscriptclassic/src/qscriptclasspropertyiterator_p.h index 5759623..46b4bdc 100644 --- a/qtscriptclassic/src/qscriptclasspropertyiterator_p.h +++ b/qtscriptclassic/src/qscriptclasspropertyiterator_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTCLASSPROPERTYITERATOR_P_H #define QSCRIPTCLASSPROPERTYITERATOR_P_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #include "qscriptvalue.h" diff --git a/qtscriptclassic/src/qscriptcompiler.cpp b/qtscriptclassic/src/qscriptcompiler.cpp index 3c55ade..db2a809 100644 --- a/qtscriptclassic/src/qscriptcompiler.cpp +++ b/qtscriptclassic/src/qscriptcompiler.cpp @@ -49,7 +49,7 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptcompiler_p.h b/qtscriptclassic/src/qscriptcompiler_p.h index ad2e595..af540fe 100644 --- a/qtscriptclassic/src/qscriptcompiler_p.h +++ b/qtscriptclassic/src/qscriptcompiler_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include <QtCore/QMap> +#include <QMap> -#include <QtCore/QVector> +#include <QVector> #include "qscriptastvisitor_p.h" #include "qscriptasm_p.h" diff --git a/qtscriptclassic/src/qscriptcontext.h b/qtscriptclassic/src/qscriptcontext.h index f5abdcb..d135105 100644 --- a/qtscriptclassic/src/qscriptcontext.h +++ b/qtscriptclassic/src/qscriptcontext.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTCONTEXT_H #define QSCRIPTCONTEXT_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #include "qscriptvalue.h" diff --git a/qtscriptclassic/src/qscriptcontext_p.cpp b/qtscriptclassic/src/qscriptcontext_p.cpp index a7eab00..8359f88 100644 --- a/qtscriptclassic/src/qscriptcontext_p.cpp +++ b/qtscriptclassic/src/qscriptcontext_p.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ -#include <QtCore/QtDebug> +#include <QtDebug> #include "qscriptcontext_p.h" diff --git a/qtscriptclassic/src/qscriptcontext_p.h b/qtscriptclassic/src/qscriptcontext_p.h index 28d5dce..808c2a5 100644 --- a/qtscriptclassic/src/qscriptcontext_p.h +++ b/qtscriptclassic/src/qscriptcontext_p.h @@ -48,7 +48,7 @@ #include "qscriptenginefwd_p.h" #include "qscriptnameid_p.h" -#include <QtCore/qnumeric.h> +#include <qnumeric.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptcontextfwd_p.h b/qtscriptclassic/src/qscriptcontextfwd_p.h index ac131cd..52cf9e6 100644 --- a/qtscriptclassic/src/qscriptcontextfwd_p.h +++ b/qtscriptclassic/src/qscriptcontextfwd_p.h @@ -58,10 +58,10 @@ #include "qscriptcontext.h" -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #if defined Q_CC_MSVC && !defined Q_CC_MSVC_NET -#include <QtCore/qnumeric.h> +#include <qnumeric.h> #endif QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptcontextinfo.cpp b/qtscriptclassic/src/qscriptcontextinfo.cpp index 4b89f3d..b551f46 100644 --- a/qtscriptclassic/src/qscriptcontextinfo.cpp +++ b/qtscriptclassic/src/qscriptcontextinfo.cpp @@ -48,7 +48,7 @@ #include "qscriptvalueimpl_p.h" #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/qdatastream.h> +#include <qdatastream.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptcontextinfo.h b/qtscriptclassic/src/qscriptcontextinfo.h index 2285412..45eb755 100644 --- a/qtscriptclassic/src/qscriptcontextinfo.h +++ b/qtscriptclassic/src/qscriptcontextinfo.h @@ -42,11 +42,11 @@ #ifndef QSCRIPTCONTEXTINFO_H #define QSCRIPTCONTEXTINFO_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> -#include <QtCore/qlist.h> -#include <QtCore/qstringlist.h> +#include <qlist.h> +#include <qstringlist.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptcontextinfo_p.h b/qtscriptclassic/src/qscriptcontextinfo_p.h index 6b7f46d..b354021 100644 --- a/qtscriptclassic/src/qscriptcontextinfo_p.h +++ b/qtscriptclassic/src/qscriptcontextinfo_p.h @@ -56,8 +56,8 @@ #include "qscriptcontextinfo.h" -#include <QtCore/qatomic.h> -#include <QtCore/qstring.h> +#include <qatomic.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaarray.cpp b/qtscriptclassic/src/qscriptecmaarray.cpp index edde66f..0c85a02 100644 --- a/qtscriptclassic/src/qscriptecmaarray.cpp +++ b/qtscriptclassic/src/qscriptecmaarray.cpp @@ -49,7 +49,7 @@ #include "qscriptobject_p.h" #include "qscriptclassdata_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaboolean.cpp b/qtscriptclassic/src/qscriptecmaboolean.cpp index c38f2af..9adb87c 100644 --- a/qtscriptclassic/src/qscriptecmaboolean.cpp +++ b/qtscriptclassic/src/qscriptecmaboolean.cpp @@ -48,7 +48,7 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmadate.cpp b/qtscriptclassic/src/qscriptecmadate.cpp index 9089900..c449954 100644 --- a/qtscriptclassic/src/qscriptecmadate.cpp +++ b/qtscriptclassic/src/qscriptecmadate.cpp @@ -48,11 +48,11 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QRegExp> -#include <QtCore/QtDebug> -#include <QtCore/QLocale> -#include <QtCore/qnumeric.h> +#include <QDateTime> +#include <QRegExp> +#include <QtDebug> +#include <QLocale> +#include <qnumeric.h> #include <math.h> diff --git a/qtscriptclassic/src/qscriptecmaerror.cpp b/qtscriptclassic/src/qscriptecmaerror.cpp index 9464bfd..febcdff 100644 --- a/qtscriptclassic/src/qscriptecmaerror.cpp +++ b/qtscriptclassic/src/qscriptecmaerror.cpp @@ -48,7 +48,7 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmafunction.cpp b/qtscriptclassic/src/qscriptecmafunction.cpp index 015332f..15ef1a7 100644 --- a/qtscriptclassic/src/qscriptecmafunction.cpp +++ b/qtscriptclassic/src/qscriptecmafunction.cpp @@ -48,11 +48,11 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> #ifndef QT_NO_QOBJECT # include "qscriptextqobject_p.h" -# include <QtCore/QMetaMethod> +# include <QMetaMethod> #endif QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaglobal.cpp b/qtscriptclassic/src/qscriptecmaglobal.cpp index 9d05b00..7f92400 100644 --- a/qtscriptclassic/src/qscriptecmaglobal.cpp +++ b/qtscriptclassic/src/qscriptecmaglobal.cpp @@ -50,8 +50,8 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QVarLengthArray> -#include <QtCore/qnumeric.h> +#include <QVarLengthArray> +#include <qnumeric.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmamath.cpp b/qtscriptclassic/src/qscriptecmamath.cpp index 259b75c..37e6de3 100644 --- a/qtscriptclassic/src/qscriptecmamath.cpp +++ b/qtscriptclassic/src/qscriptecmamath.cpp @@ -48,9 +48,9 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> -#include <QtCore/qnumeric.h> -#include <QtCore/QSysInfo> +#include <QtDebug> +#include <qnumeric.h> +#include <QSysInfo> #include <math.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmanumber.cpp b/qtscriptclassic/src/qscriptecmanumber.cpp index b0d5c93..ce16aaa 100644 --- a/qtscriptclassic/src/qscriptecmanumber.cpp +++ b/qtscriptclassic/src/qscriptecmanumber.cpp @@ -48,8 +48,8 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> -#include <QtCore/qnumeric.h> +#include <QtDebug> +#include <qnumeric.h> #include <math.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaobject.cpp b/qtscriptclassic/src/qscriptecmaobject.cpp index 8801504..23dd323 100644 --- a/qtscriptclassic/src/qscriptecmaobject.cpp +++ b/qtscriptclassic/src/qscriptecmaobject.cpp @@ -48,7 +48,7 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaregexp.cpp b/qtscriptclassic/src/qscriptecmaregexp.cpp index 8c457a8..fb665eb 100644 --- a/qtscriptclassic/src/qscriptecmaregexp.cpp +++ b/qtscriptclassic/src/qscriptecmaregexp.cpp @@ -48,9 +48,9 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QStringList> -#include <QtCore/QRegExp> -#include <QtCore/QtDebug> +#include <QStringList> +#include <QRegExp> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptecmaregexp_p.h b/qtscriptclassic/src/qscriptecmaregexp_p.h index 1e38e40..5f241c5 100644 --- a/qtscriptclassic/src/qscriptecmaregexp_p.h +++ b/qtscriptclassic/src/qscriptecmaregexp_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/QRegExp> +#include <QRegExp> #include "qscriptecmacore_p.h" diff --git a/qtscriptclassic/src/qscriptecmastring.cpp b/qtscriptclassic/src/qscriptecmastring.cpp index 5a3a0cc..ce4b18d 100644 --- a/qtscriptclassic/src/qscriptecmastring.cpp +++ b/qtscriptclassic/src/qscriptecmastring.cpp @@ -49,9 +49,9 @@ #include "qscriptobject_p.h" #include "qscriptclassdata_p.h" -#include <QtCore/QStringList> -#include <QtCore/QtDebug> -#include <QtCore/qnumeric.h> +#include <QStringList> +#include <QtDebug> +#include <qnumeric.h> #include <limits.h> diff --git a/qtscriptclassic/src/qscriptengine.h b/qtscriptclassic/src/qscriptengine.h index 922b7e5..5dde343 100644 --- a/qtscriptclassic/src/qscriptengine.h +++ b/qtscriptclassic/src/qscriptengine.h @@ -42,15 +42,15 @@ #ifndef QSCRIPTENGINE_H #define QSCRIPTENGINE_H -#include <QtCore/qmetatype.h> +#include <qmetatype.h> -#include <QtCore/qvariant.h> +#include <qvariant.h> #ifndef QT_NO_QOBJECT -#include <QtCore/qobject.h> +#include <qobject.h> #else -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #endif #include "qscriptvalue.h" diff --git a/qtscriptclassic/src/qscriptengine_p.cpp b/qtscriptclassic/src/qscriptengine_p.cpp index 420a4de..787167d 100644 --- a/qtscriptclassic/src/qscriptengine_p.cpp +++ b/qtscriptclassic/src/qscriptengine_p.cpp @@ -61,20 +61,20 @@ #include "qscriptclass_p.h" #include "qscriptengineagent.h" -#include <QtCore/QDate> -#include <QtCore/QDateTime> -#include <QtCore/QRegExp> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QDate> +#include <QDateTime> +#include <QRegExp> +#include <QStringList> +#include <QVariant> #ifndef QT_NO_QOBJECT #include "qscriptextensioninterface.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> -#include <QtCore/QPluginLoader> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QTextStream> +#include <QCoreApplication> +#include <QPluginLoader> #endif Q_DECLARE_METATYPE(QScriptValue) diff --git a/qtscriptclassic/src/qscriptengine_p.h b/qtscriptclassic/src/qscriptengine_p.h index 4bb85b4..b719f51 100644 --- a/qtscriptclassic/src/qscriptengine_p.h +++ b/qtscriptclassic/src/qscriptengine_p.h @@ -45,13 +45,13 @@ #include "qscriptenginefwd_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QMutex> -#include <QtCore/QLinkedList> -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtCore/QHash> -#include <QtCore/qnumeric.h> +#include <QDateTime> +#include <QMutex> +#include <QLinkedList> +#include <QString> +#include <QVector> +#include <QHash> +#include <qnumeric.h> #include "qscriptengine.h" #include "qscriptnameid_p.h" diff --git a/qtscriptclassic/src/qscriptengineagent.h b/qtscriptclassic/src/qscriptengineagent.h index ab1b16a..31a38cb 100644 --- a/qtscriptclassic/src/qscriptengineagent.h +++ b/qtscriptclassic/src/qscriptengineagent.h @@ -42,10 +42,10 @@ #ifndef QSCRIPTENGINEAGENT_H #define QSCRIPTENGINEAGENT_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> -#include <QtCore/qvariant.h> +#include <qvariant.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptengineagent_p.h b/qtscriptclassic/src/qscriptengineagent_p.h index 29019df..cc44263 100644 --- a/qtscriptclassic/src/qscriptengineagent_p.h +++ b/qtscriptclassic/src/qscriptengineagent_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTENGINEAGENT_P_H #define QSCRIPTENGINEAGENT_P_H -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> // diff --git a/qtscriptclassic/src/qscriptenginefwd_p.h b/qtscriptclassic/src/qscriptenginefwd_p.h index 34fabfe..0d926fa 100644 --- a/qtscriptclassic/src/qscriptenginefwd_p.h +++ b/qtscriptclassic/src/qscriptenginefwd_p.h @@ -47,15 +47,15 @@ #endif -#include <QtCore/qobjectdefs.h> - -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QStringList> -#include <QtCore/QTime> -#include <QtCore/QVector> +#include <qobjectdefs.h> + +#include <QHash> +#include <QList> +#include <QRegExp> +#include <QSet> +#include <QStringList> +#include <QTime> +#include <QVector> #include "qscriptengine.h" #include "qscriptrepository_p.h" diff --git a/qtscriptclassic/src/qscriptextensioninterface.h b/qtscriptclassic/src/qscriptextensioninterface.h index cd2bc28..b0bfa41 100644 --- a/qtscriptclassic/src/qscriptextensioninterface.h +++ b/qtscriptclassic/src/qscriptextensioninterface.h @@ -42,10 +42,10 @@ #ifndef QSCRIPTEXTENSIONINTERFACE_H #define QSCRIPTEXTENSIONINTERFACE_H -#include <QtCore/qfactoryinterface.h> +#include <qfactoryinterface.h> -#include <QtCore/qobject.h> +#include <qobject.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptextensionplugin.h b/qtscriptclassic/src/qscriptextensionplugin.h index 162c7d4..8718331 100644 --- a/qtscriptclassic/src/qscriptextensionplugin.h +++ b/qtscriptclassic/src/qscriptextensionplugin.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTEXTENSIONPLUGIN_H #define QSCRIPTEXTENSIONPLUGIN_H -#include <QtCore/qplugin.h> +#include <qplugin.h> #include "qscriptextensioninterface.h" diff --git a/qtscriptclassic/src/qscriptextenumeration.cpp b/qtscriptclassic/src/qscriptextenumeration.cpp index 04e2038..957ec68 100644 --- a/qtscriptclassic/src/qscriptextenumeration.cpp +++ b/qtscriptclassic/src/qscriptextenumeration.cpp @@ -49,7 +49,7 @@ #include "qscriptobject_p.h" #include "qscriptvalueiteratorimpl_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptextqobject.cpp b/qtscriptclassic/src/qscriptextqobject.cpp index 665776c..b664698 100644 --- a/qtscriptclassic/src/qscriptextqobject.cpp +++ b/qtscriptclassic/src/qscriptextqobject.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ -#include <QtCore/qglobal.h> +#include <qglobal.h> #include "qscriptengine_p.h" @@ -51,11 +51,11 @@ #include "qscriptable_p.h" #include "qscriptextqobject_p.h" -#include <QtCore/QtDebug> -#include <QtCore/QMetaMethod> -#include <QtCore/QRegExp> -#include <QtCore/QVarLengthArray> -#include <QtCore/QPointer> +#include <QtDebug> +#include <QMetaMethod> +#include <QRegExp> +#include <QVarLengthArray> +#include <QPointer> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptextqobject_p.h b/qtscriptclassic/src/qscriptextqobject_p.h index 4bf6a4a..024aec4 100644 --- a/qtscriptclassic/src/qscriptextqobject_p.h +++ b/qtscriptclassic/src/qscriptextqobject_p.h @@ -63,12 +63,12 @@ #include "qscriptengine.h" #include "qscriptmemberfwd_p.h" -#include <QtCore/QHash> -#include <QtCore/QPointer> -#include <QtCore/QObject> -#include <QtCore/QVariant> -#include <QtCore/QVarLengthArray> -#include <QtCore/QVector> +#include <QHash> +#include <QPointer> +#include <QObject> +#include <QVariant> +#include <QVarLengthArray> +#include <QVector> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptextvariant.cpp b/qtscriptclassic/src/qscriptextvariant.cpp index 99fbbcc..5cc056b 100644 --- a/qtscriptclassic/src/qscriptextvariant.cpp +++ b/qtscriptclassic/src/qscriptextvariant.cpp @@ -48,9 +48,9 @@ #include "qscriptmember_p.h" #include "qscriptobject_p.h" -#include <QtCore/QtDebug> +#include <QtDebug> -#include <QtCore/QStringList> +#include <QStringList> #include <limits.h> diff --git a/qtscriptclassic/src/qscriptextvariant_p.h b/qtscriptclassic/src/qscriptextvariant_p.h index db449f6..03eff96 100644 --- a/qtscriptclassic/src/qscriptextvariant_p.h +++ b/qtscriptclassic/src/qscriptextvariant_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/QVariant> +#include <QVariant> #include "qscriptecmacore_p.h" diff --git a/qtscriptclassic/src/qscriptfunction_p.h b/qtscriptclassic/src/qscriptfunction_p.h index 2bd43f0..e3f57e7 100644 --- a/qtscriptclassic/src/qscriptfunction_p.h +++ b/qtscriptclassic/src/qscriptfunction_p.h @@ -59,11 +59,11 @@ #include "qscriptglobals_p.h" #include "qscriptnodepool_p.h" -#include <QtCore/QList> +#include <QList> #ifndef QT_NO_QOBJECT -# include <QtCore/QPointer> -# include <QtCore/QMetaMethod> +# include <QPointer> +# include <QMetaMethod> #endif QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptgc_p.h b/qtscriptclassic/src/qscriptgc_p.h index ab21691..8b1fd28 100644 --- a/qtscriptclassic/src/qscriptgc_p.h +++ b/qtscriptclassic/src/qscriptgc_p.h @@ -57,10 +57,10 @@ # undef m_free #endif -#include <QtCore/qglobal.h> +#include <qglobal.h> -#include <QtCore/QtDebug> +#include <QtDebug> #include <new> #include "qscriptmemorypool_p.h" diff --git a/qtscriptclassic/src/qscriptglobals_p.h b/qtscriptclassic/src/qscriptglobals_p.h index 3c55557..4966072 100644 --- a/qtscriptclassic/src/qscriptglobals_p.h +++ b/qtscriptclassic/src/qscriptglobals_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptgrammar_p.h b/qtscriptclassic/src/qscriptgrammar_p.h index 11262c2..e715321 100644 --- a/qtscriptclassic/src/qscriptgrammar_p.h +++ b/qtscriptclassic/src/qscriptgrammar_p.h @@ -55,7 +55,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptlexer_p.h b/qtscriptclassic/src/qscriptlexer_p.h index a5b747a..29307d0 100644 --- a/qtscriptclassic/src/qscriptlexer_p.h +++ b/qtscriptclassic/src/qscriptlexer_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptmemberfwd_p.h b/qtscriptclassic/src/qscriptmemberfwd_p.h index 9947125..fa04591 100644 --- a/qtscriptclassic/src/qscriptmemberfwd_p.h +++ b/qtscriptclassic/src/qscriptmemberfwd_p.h @@ -57,7 +57,7 @@ # undef m_flags #endif -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptmemorypool_p.h b/qtscriptclassic/src/qscriptmemorypool_p.h index 6d7f9a7..a619de2 100644 --- a/qtscriptclassic/src/qscriptmemorypool_p.h +++ b/qtscriptclassic/src/qscriptmemorypool_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include <QtCore/qglobal.h> -#include <QtCore/qshareddata.h> +#include <qglobal.h> +#include <qshareddata.h> #include <string.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptnameid_p.h b/qtscriptclassic/src/qscriptnameid_p.h index 7fbd7af..c17329f 100644 --- a/qtscriptclassic/src/qscriptnameid_p.h +++ b/qtscriptclassic/src/qscriptnameid_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptnodepool_p.h b/qtscriptclassic/src/qscriptnodepool_p.h index d98c78a..7115391 100644 --- a/qtscriptclassic/src/qscriptnodepool_p.h +++ b/qtscriptclassic/src/qscriptnodepool_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include <QtCore/QHash> -#include <QtCore/QString> +#include <QHash> +#include <QString> #include "qscriptmemorypool_p.h" diff --git a/qtscriptclassic/src/qscriptobjectdata_p.h b/qtscriptclassic/src/qscriptobjectdata_p.h index c12b7a7..0a1337a 100644 --- a/qtscriptclassic/src/qscriptobjectdata_p.h +++ b/qtscriptclassic/src/qscriptobjectdata_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTOBJECTDATA_P_H #define QSCRIPTOBJECTDATA_P_H -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptobjectfwd_p.h b/qtscriptclassic/src/qscriptobjectfwd_p.h index 95a2c16..4e6d226 100644 --- a/qtscriptclassic/src/qscriptobjectfwd_p.h +++ b/qtscriptclassic/src/qscriptobjectfwd_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> #include "qscriptbuffer_p.h" diff --git a/qtscriptclassic/src/qscriptparser.cpp b/qtscriptclassic/src/qscriptparser.cpp index 8d7e0c0..59c2314 100644 --- a/qtscriptclassic/src/qscriptparser.cpp +++ b/qtscriptclassic/src/qscriptparser.cpp @@ -81,7 +81,7 @@ ** ****************************************************************************/ -#include <QtCore/QtDebug> +#include <QtDebug> #include <string.h> diff --git a/qtscriptclassic/src/qscriptprettypretty.cpp b/qtscriptclassic/src/qscriptprettypretty.cpp index 744c4f5..60eee68 100644 --- a/qtscriptclassic/src/qscriptprettypretty.cpp +++ b/qtscriptclassic/src/qscriptprettypretty.cpp @@ -49,9 +49,9 @@ #include "qscriptobject_p.h" #include "qscriptast_p.h" -#include <QtCore/QString> -#include <QtCore/QTextStream> -#include <QtCore/QtDebug> +#include <QString> +#include <QTextStream> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptprettypretty_p.h b/qtscriptclassic/src/qscriptprettypretty_p.h index 987d00a..e291a95 100644 --- a/qtscriptclassic/src/qscriptprettypretty_p.h +++ b/qtscriptclassic/src/qscriptprettypretty_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <qglobal.h> #include "qscriptastvisitor_p.h" diff --git a/qtscriptclassic/src/qscriptstring.h b/qtscriptclassic/src/qscriptstring.h index 72623fc..12938a5 100644 --- a/qtscriptclassic/src/qscriptstring.h +++ b/qtscriptclassic/src/qscriptstring.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTSTRING_H #define QSCRIPTSTRING_H -#include <QtCore/qstring.h> +#include <qstring.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptstring_p.h b/qtscriptclassic/src/qscriptstring_p.h index 4c9369b..e56a8ad 100644 --- a/qtscriptclassic/src/qscriptstring_p.h +++ b/qtscriptclassic/src/qscriptstring_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTSTRING_P_H #define QSCRIPTSTRING_P_H -#include <QtCore/qatomic.h> +#include <qatomic.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptsyntaxchecker_p.h b/qtscriptclassic/src/qscriptsyntaxchecker_p.h index 2783633..e0d4c95 100644 --- a/qtscriptclassic/src/qscriptsyntaxchecker_p.h +++ b/qtscriptclassic/src/qscriptsyntaxchecker_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qstring.h> +#include <qstring.h> #include "qscriptgrammar_p.h" diff --git a/qtscriptclassic/src/qscriptsyntaxcheckresult_p.h b/qtscriptclassic/src/qscriptsyntaxcheckresult_p.h index 054fd37..292f27a 100644 --- a/qtscriptclassic/src/qscriptsyntaxcheckresult_p.h +++ b/qtscriptclassic/src/qscriptsyntaxcheckresult_p.h @@ -58,8 +58,8 @@ #endif -#include <QtCore/qatomic.h> -#include <QtCore/qstring.h> +#include <qatomic.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptvalue.cpp b/qtscriptclassic/src/qscriptvalue.cpp index 9c1a461..7ab9c5a 100644 --- a/qtscriptclassic/src/qscriptvalue.cpp +++ b/qtscriptclassic/src/qscriptvalue.cpp @@ -51,8 +51,8 @@ #include "qscriptclass.h" #include "qscriptclass_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QRegExp> +#include <QDateTime> +#include <QRegExp> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptvalue.h b/qtscriptclassic/src/qscriptvalue.h index 37a3699..da21f84 100644 --- a/qtscriptclassic/src/qscriptvalue.h +++ b/qtscriptclassic/src/qscriptvalue.h @@ -42,10 +42,10 @@ #ifndef QSCRIPTVALUE_H #define QSCRIPTVALUE_H -#include <QtCore/qstring.h> +#include <qstring.h> -#include <QtCore/qlist.h> +#include <qlist.h> QT_BEGIN_HEADER diff --git a/qtscriptclassic/src/qscriptvaluefwd_p.h b/qtscriptclassic/src/qscriptvaluefwd_p.h index 1596c19..268162a 100644 --- a/qtscriptclassic/src/qscriptvaluefwd_p.h +++ b/qtscriptclassic/src/qscriptvaluefwd_p.h @@ -42,7 +42,7 @@ #ifndef QSCRIPTVALUEFWD_P_H #define QSCRIPTVALUEFWD_P_H -#include <QtCore/qatomic.h> +#include <qatomic.h> #include "qscriptvalueimplfwd_p.h" diff --git a/qtscriptclassic/src/qscriptvalueimpl_p.h b/qtscriptclassic/src/qscriptvalueimpl_p.h index 90025f9..29bfbf3 100644 --- a/qtscriptclassic/src/qscriptvalueimpl_p.h +++ b/qtscriptclassic/src/qscriptvalueimpl_p.h @@ -57,7 +57,7 @@ #include "qscriptenginefwd_p.h" #include "qscriptcontextfwd_p.h" -#include <QtCore/QDateTime> +#include <QDateTime> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptvalueimplfwd_p.h b/qtscriptclassic/src/qscriptvalueimplfwd_p.h index 305fcc5..ff158c2 100644 --- a/qtscriptclassic/src/qscriptvalueimplfwd_p.h +++ b/qtscriptclassic/src/qscriptvalueimplfwd_p.h @@ -47,8 +47,8 @@ #include "qscriptvalue.h" -#include <QtCore/qstring.h> -#include <QtCore/qlist.h> +#include <qstring.h> +#include <qlist.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptxmlgenerator.cpp b/qtscriptclassic/src/qscriptxmlgenerator.cpp index fac0716..bfe2ee7 100644 --- a/qtscriptclassic/src/qscriptxmlgenerator.cpp +++ b/qtscriptclassic/src/qscriptxmlgenerator.cpp @@ -51,8 +51,8 @@ #include "qscriptlexer_p.h" #include "qscriptparser_p.h" -#include <QtCore/qstring.h> -#include <QtCore/qtextstream.h> +#include <qstring.h> +#include <qtextstream.h> QT_BEGIN_NAMESPACE diff --git a/qtscriptclassic/src/qscriptxmlgenerator_p.h b/qtscriptclassic/src/qscriptxmlgenerator_p.h index de2f090..e425671 100644 --- a/qtscriptclassic/src/qscriptxmlgenerator_p.h +++ b/qtscriptclassic/src/qscriptxmlgenerator_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qobjectdefs.h> +#include <qobjectdefs.h> #include "qscriptastvisitor_p.h" |