summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2011-07-03 21:53:27 +0200
committerQt by Nokia <qt-info@nokia.com>2012-01-20 18:48:22 +0100
commit712cfb509484599f1586f68cc379e3e7464e9967 (patch)
treedb87f7142b21f9c4015088d86e20bb6e5cf6044f
parent15e4df7d83fd30e16f014bc1ddc5d55884b388aa (diff)
cosmetic adjustments for files moved to core/codecs
-update old reference to 'plugin' -rename multiple inclusion guards -add private header warning text Change-Id: I4c582dcba549d871bd8d929bee5372586117eabb Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/codecs/cp949codetbl_p.h19
-rw-r--r--src/corelib/codecs/qbig5codec.cpp2
-rw-r--r--src/corelib/codecs/qbig5codec_p.h19
-rw-r--r--src/corelib/codecs/qeucjpcodec.cpp2
-rw-r--r--src/corelib/codecs/qeucjpcodec_p.h19
-rw-r--r--src/corelib/codecs/qeuckrcodec.cpp2
-rw-r--r--src/corelib/codecs/qeuckrcodec_p.h19
-rw-r--r--src/corelib/codecs/qfontjpcodec.cpp2
-rw-r--r--src/corelib/codecs/qfontjpcodec_p.h19
-rw-r--r--src/corelib/codecs/qgb18030codec.cpp2
-rw-r--r--src/corelib/codecs/qgb18030codec_p.h19
-rw-r--r--src/corelib/codecs/qjiscodec.cpp2
-rw-r--r--src/corelib/codecs/qjiscodec_p.h19
-rw-r--r--src/corelib/codecs/qjpunicode.cpp2
-rw-r--r--src/corelib/codecs/qjpunicode_p.h19
-rw-r--r--src/corelib/codecs/qsjiscodec.cpp2
-rw-r--r--src/corelib/codecs/qsjiscodec_p.h19
17 files changed, 143 insertions, 44 deletions
diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h
index 25723c7999..0e608fabc9 100644
--- a/src/corelib/codecs/cp949codetbl_p.h
+++ b/src/corelib/codecs/cp949codetbl_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,19 @@
**
****************************************************************************/
-#ifndef CP949CODETBL_H
-#define CP494CODETBL_H
+#ifndef CP949CODETBL_P_H
+#define CP494CODETBL_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
static const unsigned short cp949_icode_to_unicode[] = {
0xac02, 0xac03, 0xac05, 0xac06, 0xac0b, 0xac0c, 0xac0d, 0xac0e, 0xac0f, 0xac18, 0xac1e, 0xac1f, 0xac21, 0xac22, 0xac23,
@@ -634,4 +645,4 @@ static const unsigned short cp949_icode_to_unicode[] = {
0xd7a2, 0xd7a3
};
-#endif // CP494CODETBL_H
+#endif // CP494CODETBL_P_H
diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
index f5ba20d871..c9b63f5cca 100644
--- a/src/corelib/codecs/qbig5codec.cpp
+++ b/src/corelib/codecs/qbig5codec.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h
index c5b649ef6f..5479308817 100644
--- a/src/corelib/codecs/qbig5codec_p.h
+++ b/src/corelib/codecs/qbig5codec_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -43,8 +43,19 @@
// is included in Qt with the author's permission, and the grateful
// thanks of the Qt team.
-#ifndef QBIG5CODEC_H
-#define QBIG5CODEC_H
+#ifndef QBIG5CODEC_P_H
+#define QBIG5CODEC_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include <QtCore/qtextcodec.h>
#include <QtCore/qlist.h>
@@ -121,4 +132,4 @@ public:
QT_END_NAMESPACE
-#endif // QBIG5CODEC_H
+#endif // QBIG5CODEC_P_H
diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
index f5f42857ba..c681492b2d 100644
--- a/src/corelib/codecs/qeucjpcodec.cpp
+++ b/src/corelib/codecs/qeucjpcodec.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
index 9cc7c3dd0a..d34ac7c2fe 100644
--- a/src/corelib/codecs/qeucjpcodec_p.h
+++ b/src/corelib/codecs/qeucjpcodec_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -68,8 +68,19 @@
* SUCH DAMAGE.
*/
-#ifndef QEUCJPCODEC_H
-#define QEUCJPCODEC_H
+#ifndef QEUCJPCODEC_P_H
+#define QEUCJPCODEC_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include "qjpunicode_p.h"
#include <QtCore/qtextcodec.h>
@@ -103,4 +114,4 @@ protected:
QT_END_NAMESPACE
-#endif // QEUCJPCODEC_H
+#endif // QEUCJPCODEC_P_H
diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
index f0cff54338..14b0b0990a 100644
--- a/src/corelib/codecs/qeuckrcodec.cpp
+++ b/src/corelib/codecs/qeuckrcodec.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h
index d5be33e74b..51895705ae 100644
--- a/src/corelib/codecs/qeuckrcodec_p.h
+++ b/src/corelib/codecs/qeuckrcodec_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -64,8 +64,19 @@
* SUCH DAMAGE.
*/
-#ifndef QEUCKRCODEC_H
-#define QEUCKRCODEC_H
+#ifndef QEUCKRCODEC_P_H
+#define QEUCKRCODEC_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include <QtCore/qtextcodec.h>
#include <QtCore/qlist.h>
@@ -126,4 +137,4 @@ public:
QT_END_NAMESPACE
-#endif // QEUCKRCODEC_H
+#endif // QEUCKRCODEC_P_H
diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
index 7b27e6d630..2196b80416 100644
--- a/src/corelib/codecs/qfontjpcodec.cpp
+++ b/src/corelib/codecs/qfontjpcodec.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h
index 1f577498fb..f22ab38790 100644
--- a/src/corelib/codecs/qfontjpcodec_p.h
+++ b/src/corelib/codecs/qfontjpcodec_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,19 @@
**
****************************************************************************/
-#ifndef QFONTJPCODEC_H
-#define QFONTJPCODEC_H
+#ifndef QFONTJPCODEC_P_H
+#define QFONTJPCODEC_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include <QtCore/qtextcodec.h>
#include <QtCore/qlist.h>
@@ -90,4 +101,4 @@ private:
QT_END_NAMESPACE
-#endif // QFONTJPCODEC_H
+#endif // QFONTJPCODEC_P_H
diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
index 8490a6220f..203d8dc787 100644
--- a/src/corelib/codecs/qgb18030codec.cpp
+++ b/src/corelib/codecs/qgb18030codec.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h
index 492f59b295..5a98c99077 100644
--- a/src/corelib/codecs/qgb18030codec_p.h
+++ b/src/corelib/codecs/qgb18030codec_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -41,8 +41,19 @@
// Contributed by James Su <suzhe@gnuchina.org>
-#ifndef QGB18030CODEC_H
-#define QGB18030CODEC_H
+#ifndef QGB18030CODEC_P_H
+#define QGB18030CODEC_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include <QtCore/qtextcodec.h>
#include <QtCore/qlist.h>
@@ -156,4 +167,4 @@ public:
QT_END_NAMESPACE
-#endif // QGB18030CODEC_H
+#endif // QGB18030CODEC_P_H
diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
index b311646404..7b5fb4ee2d 100644
--- a/src/corelib/codecs/qjiscodec.cpp
+++ b/src/corelib/codecs/qjiscodec.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
index 3cd7c80c3b..4a0fc43354 100644
--- a/src/corelib/codecs/qjiscodec_p.h
+++ b/src/corelib/codecs/qjiscodec_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -68,8 +68,19 @@
* SUCH DAMAGE.
*/
-#ifndef QJISCODEC_H
-#define QJISCODEC_H
+#ifndef QJISCODEC_P_H
+#define QJISCODEC_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include "qjpunicode_p.h"
#include <QtCore/qtextcodec.h>
@@ -103,4 +114,4 @@ protected:
QT_END_NAMESPACE
-#endif // QJISCODEC_H
+#endif // QJISCODEC_P_H
diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
index 67d4630aff..03db950081 100644
--- a/src/corelib/codecs/qjpunicode.cpp
+++ b/src/corelib/codecs/qjpunicode.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h
index 069f49a137..82b3d2caf6 100644
--- a/src/corelib/codecs/qjpunicode_p.h
+++ b/src/corelib/codecs/qjpunicode_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -68,8 +68,19 @@
* SUCH DAMAGE.
*/
-#ifndef QJPUNICODE_H
-#define QJPUNICODE_H
+#ifndef QJPUNICODE_P_H
+#define QJPUNICODE_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include <QtCore/qglobal.h>
@@ -171,4 +182,4 @@ private:
QT_END_NAMESPACE
-#endif // QJPUNICODE_H
+#endif // QJPUNICODE_P_H
diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
index b80b494308..c4438e3fa1 100644
--- a/src/corelib/codecs/qsjiscodec.cpp
+++ b/src/corelib/codecs/qsjiscodec.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
index df1449b8e2..f8efcae6f8 100644
--- a/src/corelib/codecs/qsjiscodec_p.h
+++ b/src/corelib/codecs/qsjiscodec_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -68,8 +68,19 @@
* SUCH DAMAGE.
*/
-#ifndef QSJISCODEC_H
-#define QSJISCODEC_H
+#ifndef QSJISCODEC_P_H
+#define QSJISCODEC_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include "qjpunicode_p.h"
#include <QtCore/qtextcodec.h>
@@ -103,4 +114,4 @@ protected:
QT_END_NAMESPACE
-#endif // QSJISCODEC_H
+#endif // QSJISCODEC_P_H