1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetic adjustments for files moved to core/codecs

Browse Source 
-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>
This commit is contained in:
Mark Brand 2011-07-03 21:53:27 +02:00 committed by Qt by Nokia
parent 15e4df7d83
commit 712cfb5094
17 changed files with 143 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/codecs/cp949codetbl_p.h
View File

@ -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

2
src/corelib/codecs/qbig5codec.cpp
View File

@ -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

19
src/corelib/codecs/qbig5codec_p.h
View File

@ -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

2
src/corelib/codecs/qeucjpcodec.cpp
View File

@ -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

19
src/corelib/codecs/qeucjpcodec_p.h
View File

@ -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

2
src/corelib/codecs/qeuckrcodec.cpp
View File

@ -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

19
src/corelib/codecs/qeuckrcodec_p.h
View File

@ -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

2
src/corelib/codecs/qfontjpcodec.cpp
View File

@ -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

19
src/corelib/codecs/qfontjpcodec_p.h
View File

@ -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

2
src/corelib/codecs/qgb18030codec.cpp
View File

@ -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

19
src/corelib/codecs/qgb18030codec_p.h
View File

@ -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

2
src/corelib/codecs/qjiscodec.cpp
View File

@ -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

19
src/corelib/codecs/qjiscodec_p.h
View File

@ -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

2
src/corelib/codecs/qjpunicode.cpp
View File

@ -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

19
src/corelib/codecs/qjpunicode_p.h
View File

@ -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

2
src/corelib/codecs/qsjiscodec.cpp
View File

@ -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

19
src/corelib/codecs/qsjiscodec_p.h
View File

@ -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