[Development] Header diff for QtScript
Thiago Macieira
thiago.macieira at intel.com
Wed Jun 26 22:50:10 CEST 2013
diff --git a/src/script/api/qscriptable.h b/src/script/api/qscriptable.h
index 82fa250..4f4fdc2 100644
--- a/src/script/api/qscriptable.h
+++ b/src/script/api/qscriptable.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -65,6 +63,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTABLE_H
diff --git a/src/script/api/qscriptclass.h b/src/script/api/qscriptclass.h
index d7d2011..fbc7699 100644
--- a/src/script/api/qscriptclass.h
+++ b/src/script/api/qscriptclass.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -30,8 +30,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtScript/qscriptvalue.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -94,6 +92,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptClass::QueryFlags)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptclasspropertyiterator.h b/src/script/api/qscriptclasspropertyiterator.h
index 96a49ef..3a946bd 100644
--- a/src/script/api/qscriptclasspropertyiterator.h
+++ b/src/script/api/qscriptclasspropertyiterator.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtScript/qscriptvalue.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -69,6 +67,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptcontext.h b/src/script/api/qscriptcontext.h
index 81b23a2..8cbfad8 100644
--- a/src/script/api/qscriptcontext.h
+++ b/src/script/api/qscriptcontext.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -28,8 +28,6 @@
#include <QtScript/qscriptvalue.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -98,6 +96,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptcontextinfo.h b/src/script/api/qscriptcontextinfo.h
index 28baf70..148f09a 100644
--- a/src/script/api/qscriptcontextinfo.h
+++ b/src/script/api/qscriptcontextinfo.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -31,8 +31,6 @@
#include <QtCore/qsharedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -69,9 +67,7 @@ public:
qint64 scriptId() const;
QString fileName() const;
int lineNumber() const;
-#ifdef QT_DEPRECATED
- QT_DEPRECATED int columnNumber() const;
-#endif
+ int columnNumber() const;
QString functionName() const;
FunctionType functionType() const;
@@ -101,6 +97,4 @@ Q_SCRIPT_EXPORT QDataStream &operator>>(QDataStream &, QScriptContextInfo &);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index 951053f..fcfb4a2 100644
--- a/src/script/api/qscriptengine.h
+++ b/src/script/api/qscriptengine.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -40,8 +40,6 @@
#include <QtScript/qscriptstring.h>
#include <QtScript/qscriptprogram.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -445,6 +443,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptEngine::QObjectWrapOptions)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTENGINE_H
diff --git a/src/script/api/qscriptengineagent.h b/src/script/api/qscriptengineagent.h
index 14e551f..289ce52 100644
--- a/src/script/api/qscriptengineagent.h
+++ b/src/script/api/qscriptengineagent.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -30,8 +30,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -86,6 +84,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptextensioninterface.h b/src/script/api/qscriptextensioninterface.h
index 39fd5e1..ea9af81 100644
--- a/src/script/api/qscriptextensioninterface.h
+++ b/src/script/api/qscriptextensioninterface.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
#include <QtCore/qobject.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -48,6 +46,4 @@ Q_DECLARE_INTERFACE(QScriptExtensionInterface, QScriptExtensionInterface_iid)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTEXTENSIONINTERFACE_H
diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h
index e59c398..5fad2e4 100644
--- a/src/script/api/qscriptextensionplugin.h
+++ b/src/script/api/qscriptextensionplugin.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -28,8 +28,6 @@
#include <QtScript/qscriptextensioninterface.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -52,6 +50,4 @@ public:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTEXTENSIONPLUGIN_H
diff --git a/src/script/api/qscriptprogram.h b/src/script/api/qscriptprogram.h
index 18a303c..0d3d413 100644
--- a/src/script/api/qscriptprogram.h
+++ b/src/script/api/qscriptprogram.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
#include <QtCore/qstring.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -63,6 +61,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTPROGRAM_H
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index 42a8d2f..f763de2 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
#include <QtCore/qsharedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -64,6 +62,4 @@ Q_SCRIPT_EXPORT uint qHash(const QScriptString &key);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTSTRING_H
diff --git a/src/script/api/qscriptvalue.h b/src/script/api/qscriptvalue.h
index 670f928..9ea69c1 100644
--- a/src/script/api/qscriptvalue.h
+++ b/src/script/api/qscriptvalue.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -30,8 +30,6 @@
#include <QtCore/qsharedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -218,6 +216,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptValue::PropertyFlags)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptvalueiterator.h b/src/script/api/qscriptvalueiterator.h
index 84bf30a..19019b5 100644
--- a/src/script/api/qscriptvalueiterator.h
+++ b/src/script/api/qscriptvalueiterator.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.
@@ -28,8 +28,6 @@
#include <QtCore/qscopedpointer.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -73,6 +71,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTVALUEITERATOR_H
diff --git a/src/script/api/qtscriptglobal.h b/src/script/api/qtscriptglobal.h
index 4bc3b31..1b74cf6 100644
--- a/src/script/api/qtscriptglobal.h
+++ b/src/script/api/qtscriptglobal.h
@@ -44,8 +44,6 @@
#include <QtCore/qglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
#ifndef QT_STATIC
@@ -66,6 +64,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
More information about the Development
mailing list