AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove use of QT_MODULE from library

Browse Source 
These defines were there to aid in the commercial
licensing scheme we used long ago, and are no longer needed.

Keep a QT_MODULE(x) define so other modules continue compiling.

Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Gunnar Sletta 2012-01-09 08:53:17 +01:00 committed by Qt by Nokia
parent 00c8984b4e
commit 4ecf82795d
561 changed files with 25 additions and 732 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/syncqt
View File

@ -1341,7 +1341,6 @@ if($check_includes) {
my $iheader = $subdir . "/" . $header; my $iheader = $subdir . "/" . $header;
if($public_header) { if($public_header) {
if(open(F, "<$iheader")) { if(open(F, "<$iheader")) {
my $qt_module_found = 0;
my $qt_begin_header_found = 0; my $qt_begin_header_found = 0;
my $qt_end_header_found = 0; my $qt_end_header_found = 0;
my $qt_begin_namespace_found = 0; my $qt_begin_namespace_found = 0;
@ -1376,8 +1375,6 @@ if($check_includes) {
$qt_begin_namespace_found = 1; $qt_begin_namespace_found = 1;
} elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) { } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) {
$qt_end_namespace_found = 1; $qt_end_namespace_found = 1;
} elsif ($header_skip_qt_module_test == 0 and $line =~ /^QT_MODULE\(.*\)\s*$/) {
$qt_module_found = 1;
} }
} }
if ($header_skip_qt_begin_header_test == 0) { if ($header_skip_qt_begin_header_test == 0) {
@ -1400,11 +1397,6 @@ if($check_includes) {
} }
} }
if ($header_skip_qt_module_test == 0) {
if ($qt_module_found == 0) {
print "$lib: WARNING: $iheader does not include QT_MODULE\n";
}
}
close(F); close(F);
} }
} }

1
examples/animation/sub-attaq/qanimationstate.h
View File

@ -54,7 +54,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Gui)
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION

1
src/corelib/animation/qabstractanimation.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION

1
src/corelib/animation/qanimationgroup.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION

1
src/corelib/animation/qparallelanimationgroup.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION

1
src/corelib/animation/qpauseanimation.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION

1
src/corelib/animation/qpropertyanimation.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION

1
src/corelib/animation/qsequentialanimationgroup.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION

1
src/corelib/animation/qvariantanimation.h
View File

@ -52,7 +52,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION

10
src/corelib/arch/qatomic_arm.h
View File

@ -42,16 +42,12 @@
#ifndef QATOMIC_ARM_H #ifndef QATOMIC_ARM_H
#define QATOMIC_ARM_H #define QATOMIC_ARM_H
QT_BEGIN_HEADER
#if defined(__ARM_ARCH_7__) \ #if defined(__ARM_ARCH_7__) \
|| defined(__ARM_ARCH_7A__) \ || defined(__ARM_ARCH_7A__) \
|| defined(__ARM_ARCH_7R__) \ || defined(__ARM_ARCH_7R__) \
|| defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7M__)
# define QT_ARCH_ARMV7 # define QT_ARCH_ARMV7
QT_BEGIN_INCLUDE_HEADER
# include "QtCore/qatomic_armv7.h" # include "QtCore/qatomic_armv7.h"
QT_END_INCLUDE_HEADER
#elif defined(__ARM_ARCH_6__) \ #elif defined(__ARM_ARCH_6__) \
|| defined(__ARM_ARCH_6J__) \ || defined(__ARM_ARCH_6J__) \
|| defined(__ARM_ARCH_6T2__) \ || defined(__ARM_ARCH_6T2__) \
@ -61,16 +57,10 @@ QT_END_INCLUDE_HEADER
|| defined(__ARM_ARCH_6M__) \ || defined(__ARM_ARCH_6M__) \
|| (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6)) || (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6))
# define QT_ARCH_ARMV6 # define QT_ARCH_ARMV6
QT_BEGIN_INCLUDE_HEADER
# include "QtCore/qatomic_armv6.h" # include "QtCore/qatomic_armv6.h"
QT_END_INCLUDE_HEADER
#else #else
# define QT_ARCH_ARMV5 # define QT_ARCH_ARMV5
QT_BEGIN_INCLUDE_HEADER
# include "QtCore/qatomic_armv5.h" # include "QtCore/qatomic_armv5.h"
QT_END_INCLUDE_HEADER
#endif #endif
QT_END_HEADER
#endif // QATOMIC_ARM_H #endif // QATOMIC_ARM_H

6
src/corelib/arch/qatomic_armv7.h
View File

@ -42,8 +42,6 @@
#ifndef QATOMIC_ARMV7_H #ifndef QATOMIC_ARMV7_H
#define QATOMIC_ARMV7_H #define QATOMIC_ARMV7_H
QT_BEGIN_HEADER
// use the DMB instruction when compiling for ARMv7, ... // use the DMB instruction when compiling for ARMv7, ...
#ifndef Q_CC_RCVT #ifndef Q_CC_RCVT
# define Q_DATA_MEMORY_BARRIER asm volatile("dmb\n":::"memory") # define Q_DATA_MEMORY_BARRIER asm volatile("dmb\n":::"memory")
@ -52,10 +50,6 @@ QT_BEGIN_HEADER
#endif #endif
// ... but the implementation is otherwise identical to that for ARMv6 // ... but the implementation is otherwise identical to that for ARMv6
QT_BEGIN_INCLUDE_HEADER
#include "QtCore/qatomic_armv6.h" #include "QtCore/qatomic_armv6.h"
QT_END_INCLUDE_HEADER
QT_END_HEADER
#endif // QATOMIC_ARMV7_H #endif // QATOMIC_ARMV7_H

1
src/corelib/codecs/qtextcodec.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_TEXTCODEC #ifndef QT_NO_TEXTCODEC

1
src/corelib/concurrent/qfuture.h
View File

@ -53,7 +53,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
template <typename T> template <typename T>
class QFutureWatcher; class QFutureWatcher;

1
src/corelib/concurrent/qfutureinterface.h
View File

@ -54,7 +54,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
template <typename T> class QFuture; template <typename T> class QFuture;
class QFutureInterfaceBasePrivate; class QFutureInterfaceBasePrivate;

1
src/corelib/concurrent/qfuturesynchronizer.h
View File

@ -49,7 +49,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
template <typename T> template <typename T>
class QFutureSynchronizer class QFutureSynchronizer

1
src/corelib/concurrent/qfuturewatcher.h
View File

@ -51,7 +51,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QEvent; class QEvent;

1
src/corelib/concurrent/qrunnable.h
View File

@ -47,7 +47,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QRunnable class QRunnable
{ {

1
src/corelib/concurrent/qtconcurrentcompilertest.h
View File

@ -49,7 +49,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#if defined (Q_CC_MSVC) && (_MSC_VER < 1300) #if defined (Q_CC_MSVC) && (_MSC_VER < 1300)
# define QT_TYPENAME # define QT_TYPENAME

1
src/corelib/concurrent/qtconcurrentexception.h
View File

@ -56,7 +56,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
namespace QtConcurrent namespace QtConcurrent
{ {

1
src/corelib/concurrent/qtconcurrentfilter.h
View File

@ -52,7 +52,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifdef qdoc #ifdef qdoc

1
src/corelib/concurrent/qtconcurrentfilterkernel.h
View File

@ -53,7 +53,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef qdoc #ifndef qdoc

1
src/corelib/concurrent/qtconcurrentfunctionwrappers.h
View File

@ -49,7 +49,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef qdoc #ifndef qdoc

1
src/corelib/concurrent/qtconcurrentiteratekernel.h
View File

@ -57,7 +57,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef qdoc #ifndef qdoc

1
src/corelib/concurrent/qtconcurrentmap.h
View File

@ -54,7 +54,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifdef qdoc #ifdef qdoc

1
src/corelib/concurrent/qtconcurrentmapkernel.h
View File

@ -52,7 +52,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef qdoc #ifndef qdoc
namespace QtConcurrent { namespace QtConcurrent {

1
src/corelib/concurrent/qtconcurrentmedian.h
View File

@ -52,7 +52,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef qdoc #ifndef qdoc

1
src/corelib/concurrent/qtconcurrentreducekernel.h
View File

@ -57,7 +57,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
namespace QtConcurrent { namespace QtConcurrent {

1
src/corelib/concurrent/qtconcurrentresultstore.h
View File

@ -52,7 +52,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
/* /*
ResultStore stores indexed results. Results can be added and retrieved ResultStore stores indexed results. Results can be added and retrieved

1
src/corelib/concurrent/qtconcurrentrun.h
View File

@ -53,7 +53,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifdef qdoc #ifdef qdoc

1
src/corelib/concurrent/qtconcurrentrunbase.h
View File

@ -53,7 +53,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef qdoc #ifndef qdoc

1
src/corelib/concurrent/qtconcurrentstoredfunctioncall.h
View File

@ -51,7 +51,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef qdoc #ifndef qdoc

1
src/corelib/concurrent/qtconcurrentthreadengine.h
View File

@ -57,7 +57,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef qdoc #ifndef qdoc

1
src/corelib/concurrent/qthreadpool.h
View File

@ -52,7 +52,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QThreadPoolPrivate; class QThreadPoolPrivate;
class Q_CORE_EXPORT QThreadPool : public QObject class Q_CORE_EXPORT QThreadPool : public QObject

1
src/corelib/global/qendian.h
View File

@ -55,7 +55,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
/* /*
* ENDIAN FUNCTIONS * ENDIAN FUNCTIONS

137
src/corelib/global/qglobal.h
View File

@ -143,13 +143,9 @@ namespace QT_NAMESPACE {}
#if defined(Q_OS_MAC) && !defined(Q_CC_INTEL) #if defined(Q_OS_MAC) && !defined(Q_CC_INTEL)
#define QT_BEGIN_HEADER extern "C++" { #define QT_BEGIN_HEADER extern "C++" {
#define QT_END_HEADER } #define QT_END_HEADER }
#define QT_BEGIN_INCLUDE_HEADER }
#define QT_END_INCLUDE_HEADER extern "C++" {
#else #else
#define QT_BEGIN_HEADER #define QT_BEGIN_HEADER
#define QT_END_HEADER #define QT_END_HEADER
#define QT_BEGIN_INCLUDE_HEADER
#define QT_END_INCLUDE_HEADER extern "C++"
#endif #endif
/* /*
@ -2440,138 +2436,7 @@ inline int qIntCast(float f) { return int(f); }
Q_CORE_EXPORT void qsrand(uint seed); Q_CORE_EXPORT void qsrand(uint seed);
Q_CORE_EXPORT int qrand(); Q_CORE_EXPORT int qrand();
/* #define QT_MODULE(x)
This gives us the possibility to check which modules the user can
use. These are purely compile time checks and will generate no code.
*/
/* Qt modules */
#define QT_MODULE_CORE 0x000001
#define QT_MODULE_GUI 0x000002
#define QT_MODULE_NETWORK 0x000004
#define QT_MODULE_OPENGL 0x000008
#define QT_MODULE_SQL 0x000010
#define QT_MODULE_XML 0x000020
#define QT_MODULE_SVG 0x000100
#define QT_MODULE_ACTIVEQT 0x000200
#define QT_MODULE_GRAPHICSVIEW 0x000400
#define QT_MODULE_SCRIPT 0x000800
#define QT_MODULE_XMLPATTERNS 0x001000
#define QT_MODULE_HELP 0x002000
#define QT_MODULE_TEST 0x004000
#define QT_MODULE_DBUS 0x008000
#define QT_MODULE_SCRIPTTOOLS 0x010000
#define QT_MODULE_OPENVG 0x020000
#define QT_MODULE_MULTIMEDIA 0x040000
#define QT_MODULE_DECLARATIVE 0x080000
/* Qt editions */
#define QT_EDITION_CONSOLE (QT_MODULE_CORE \
| QT_MODULE_NETWORK \
| QT_MODULE_SQL \
| QT_MODULE_SCRIPT \
| QT_MODULE_MULTIMEDIA \
| QT_MODULE_XML \
| QT_MODULE_XMLPATTERNS \
| QT_MODULE_TEST \
| QT_MODULE_DBUS)
#define QT_EDITION_DESKTOPLIGHT (QT_MODULE_CORE \
| QT_MODULE_GUI \
| QT_MODULE_TEST \
| QT_MODULE_DBUS)
#define QT_EDITION_OPENSOURCE (QT_MODULE_CORE \
| QT_MODULE_GUI \
| QT_MODULE_NETWORK \
| QT_MODULE_OPENGL \
| QT_MODULE_OPENVG \
| QT_MODULE_SQL \
| QT_MODULE_MULTIMEDIA \
| QT_MODULE_XML \
| QT_MODULE_XMLPATTERNS \
| QT_MODULE_SCRIPT \
| QT_MODULE_SCRIPTTOOLS \
| QT_MODULE_SVG \
| QT_MODULE_DECLARATIVE \
| QT_MODULE_GRAPHICSVIEW \
| QT_MODULE_HELP \
| QT_MODULE_TEST \
| QT_MODULE_DBUS \
| QT_MODULE_ACTIVEQT)
#define QT_EDITION_DESKTOP (QT_EDITION_OPENSOURCE)
#define QT_EDITION_UNIVERSAL QT_EDITION_DESKTOP
#define QT_EDITION_ACADEMIC QT_EDITION_DESKTOP
#define QT_EDITION_EDUCATIONAL QT_EDITION_DESKTOP
#define QT_EDITION_EVALUATION QT_EDITION_DESKTOP
/* Determine which modules can be used */
#ifndef QT_EDITION
# ifdef QT_BUILD_QMAKE
# define QT_EDITION QT_EDITION_DESKTOP
# else
# error "Qt not configured correctly, please run configure"
# endif
#endif
#define QT_LICENSED_MODULE(x) \
enum QtValidLicenseFor##x##Module { Licensed##x = true };
/* qdoc is really unhappy with the following block of preprocessor checks,
making it difficult to document classes properly after this point. */
#if (QT_EDITION & QT_MODULE_CORE)
QT_LICENSED_MODULE(Core)
#endif
#if (QT_EDITION & QT_MODULE_GUI)
QT_LICENSED_MODULE(Gui)
#endif
#if (QT_EDITION & QT_MODULE_NETWORK)
QT_LICENSED_MODULE(Network)
#endif
#if (QT_EDITION & QT_MODULE_OPENGL)
QT_LICENSED_MODULE(OpenGL)
#endif
#if (QT_EDITION & QT_MODULE_OPENVG)
QT_LICENSED_MODULE(OpenVG)
#endif
#if (QT_EDITION & QT_MODULE_SQL)
QT_LICENSED_MODULE(Sql)
#endif
#if (QT_EDITION & QT_MODULE_MULTIMEDIA)
QT_LICENSED_MODULE(Multimedia)
#endif
#if (QT_EDITION & QT_MODULE_XML)
QT_LICENSED_MODULE(Xml)
#endif
#if (QT_EDITION & QT_MODULE_XMLPATTERNS)
QT_LICENSED_MODULE(XmlPatterns)
#endif
#if (QT_EDITION & QT_MODULE_HELP)
QT_LICENSED_MODULE(Help)
#endif
#if (QT_EDITION & QT_MODULE_SCRIPT) || defined(QT_BUILD_QMAKE)
QT_LICENSED_MODULE(Script)
#endif
#if (QT_EDITION & QT_MODULE_SCRIPTTOOLS)
QT_LICENSED_MODULE(ScriptTools)
#endif
#if (QT_EDITION & QT_MODULE_SVG)
QT_LICENSED_MODULE(Svg)
#endif
#if (QT_EDITION & QT_MODULE_DECLARATIVE)
QT_LICENSED_MODULE(Declarative)
#endif
#if (QT_EDITION & QT_MODULE_ACTIVEQT)
QT_LICENSED_MODULE(ActiveQt)
#endif
#if (QT_EDITION & QT_MODULE_TEST)
QT_LICENSED_MODULE(Test)
#endif
#if (QT_EDITION & QT_MODULE_DBUS)
QT_LICENSED_MODULE(DBus)
#endif
#define QT_MODULE(x) \
typedef QtValidLicenseFor##x##Module Qt##x##Module;
#ifdef QT_NO_CONCURRENT #ifdef QT_NO_CONCURRENT
# define QT_NO_QFUTURE # define QT_NO_QFUTURE

1
src/corelib/global/qlibraryinfo.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_SETTINGS #ifndef QT_NO_SETTINGS

1
src/corelib/global/qnamespace.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef Q_MOC_RUN #ifndef Q_MOC_RUN
namespace namespace

1
src/corelib/global/qnumeric.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
Q_CORE_EXPORT bool qIsInf(double d); Q_CORE_EXPORT bool qIsInf(double d);
Q_CORE_EXPORT bool qIsNaN(double d); Q_CORE_EXPORT bool qIsNaN(double d);

1
src/corelib/io/qabstractfileengine.h
View File

@ -52,7 +52,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QFileExtension; class QFileExtension;
class QFileExtensionResult; class QFileExtensionResult;

1
src/corelib/io/qbuffer.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QObject; class QObject;
class QBufferPrivate; class QBufferPrivate;

1
src/corelib/io/qdatastream.h
View File

@ -54,7 +54,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QByteArray; class QByteArray;
class QIODevice; class QIODevice;

1
src/corelib/io/qdebug.h
View File

@ -57,7 +57,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class Q_CORE_EXPORT QDebug class Q_CORE_EXPORT QDebug
{ {

1
src/corelib/io/qdir.h
View File

@ -51,7 +51,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QDirPrivate; class QDirPrivate;

1
src/corelib/io/qdiriterator.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QDirIteratorPrivate; class QDirIteratorPrivate;
class Q_CORE_EXPORT QDirIterator { class Q_CORE_EXPORT QDirIterator {

1
src/corelib/io/qfile.h
View File

@ -57,7 +57,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QAbstractFileEngine; class QAbstractFileEngine;
class QFilePrivate; class QFilePrivate;

1
src/corelib/io/qfileinfo.h
View File

@ -50,7 +50,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QDir; class QDir;
class QDirIteratorPrivate; class QDirIteratorPrivate;

1
src/corelib/io/qfilesystemwatcher.h
View File

@ -50,7 +50,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QFileSystemWatcherPrivate; class QFileSystemWatcherPrivate;

1
src/corelib/io/qfsfileengine.h
View File

@ -53,7 +53,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QFSFileEnginePrivate; class QFSFileEnginePrivate;

1
src/corelib/io/qiodevice.h
View File

@ -58,7 +58,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QByteArray; class QByteArray;
class QIODevicePrivate; class QIODevicePrivate;

1
src/corelib/io/qprocess.h
View File

@ -50,7 +50,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_PROCESS #ifndef QT_NO_PROCESS

1
src/corelib/io/qresource.h
View File

@ -51,7 +51,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QResourcePrivate; class QResourcePrivate;

1
src/corelib/io/qsettings.h
View File

@ -49,7 +49,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
QT_END_NAMESPACE QT_END_NAMESPACE
#ifndef QT_NO_SETTINGS #ifndef QT_NO_SETTINGS

1
src/corelib/io/qstandardpaths.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_STANDARDPATHS #ifndef QT_NO_STANDARDPATHS

1
src/corelib/io/qtemporarydir.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_TEMPORARYFILE #ifndef QT_NO_TEMPORARYFILE

1
src/corelib/io/qtemporaryfile.h
View File

@ -53,7 +53,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_TEMPORARYFILE #ifndef QT_NO_TEMPORARYFILE

1
src/corelib/io/qtextstream.h
View File

@ -58,7 +58,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QTextCodec; class QTextCodec;
class QTextDecoder; class QTextDecoder;

1
src/corelib/io/qurl.h
View File

@ -52,7 +52,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QUrlPrivate; class QUrlPrivate;
class QDataStream; class QDataStream;

1
src/corelib/io/qwindowspipereader_p.h
View File

@ -64,7 +64,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QWinOverlappedIoNotifier; class QWinOverlappedIoNotifier;

1
src/corelib/io/qwindowspipewriter_p.h
View File

@ -63,7 +63,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_THREAD #ifndef QT_NO_THREAD

1
src/corelib/itemmodels/qabstractitemmodel.h
View File

@ -51,7 +51,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QAbstractItemModel; class QAbstractItemModel;
class QPersistentModelIndex; class QPersistentModelIndex;

1
src/corelib/itemmodels/qabstractproxymodel.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_PROXYMODEL #ifndef QT_NO_PROXYMODEL

1
src/corelib/itemmodels/qidentityproxymodel.h
View File

@ -51,7 +51,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QIdentityProxyModelPrivate; class QIdentityProxyModelPrivate;

1
src/corelib/itemmodels/qitemselectionmodel.h
View File

@ -51,7 +51,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_ITEMVIEWS #ifndef QT_NO_ITEMVIEWS

1
src/corelib/itemmodels/qsortfilterproxymodel.h
View File

@ -52,7 +52,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QSortFilterProxyModelPrivate; class QSortFilterProxyModelPrivate;
class QSortFilterProxyModelLessThan; class QSortFilterProxyModelLessThan;

1
src/corelib/itemmodels/qstringlistmodel.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_STRINGLISTMODEL #ifndef QT_NO_STRINGLISTMODEL

1
src/corelib/kernel/qabstracteventdispatcher.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QAbstractEventDispatcherPrivate; class QAbstractEventDispatcherPrivate;
class QSocketNotifier; class QSocketNotifier;

1
src/corelib/kernel/qbasictimer.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QObject; class QObject;

1
src/corelib/kernel/qcoreapplication.h
View File

@ -54,7 +54,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QCoreApplicationPrivate; class QCoreApplicationPrivate;
class QTextCodec; class QTextCodec;

1
src/corelib/kernel/qcoreevent.h
View File

@ -50,7 +50,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QEventPrivate; class QEventPrivate;
class Q_CORE_EXPORT QEvent // event base class class Q_CORE_EXPORT QEvent // event base class

1
src/corelib/kernel/qeventloop.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QEventLoopPrivate; class QEventLoopPrivate;

1
src/corelib/kernel/qfunctions_nacl.h
View File

@ -56,7 +56,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
extern "C" { extern "C" {

1
src/corelib/kernel/qfunctions_vxworks.h
View File

@ -65,7 +65,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QT_BUILD_CORE_LIB #ifdef QT_BUILD_CORE_LIB
QT_MODULE(Core)
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE

1
src/corelib/kernel/qfunctions_wince.h
View File

@ -60,7 +60,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QT_BUILD_CORE_LIB #ifdef QT_BUILD_CORE_LIB
QT_MODULE(Core)
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE

1
src/corelib/kernel/qmath.h
View File

@ -50,7 +50,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#define QT_SINE_TABLE_SIZE 256 #define QT_SINE_TABLE_SIZE 256

1
src/corelib/kernel/qmetaobject.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
template <typename T> class QList; template <typename T> class QList;

1
src/corelib/kernel/qmetatype.h
View File

@ -55,7 +55,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
// F is a tuple: (QMetaType::TypeName, QMetaType::TypeNameID, RealType) // F is a tuple: (QMetaType::TypeName, QMetaType::TypeNameID, RealType)
#define QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(F)\ #define QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(F)\

1
src/corelib/kernel/qmimedata.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QUrl; class QUrl;
class QMimeDataPrivate; class QMimeDataPrivate;

1
src/corelib/kernel/qobject.h
View File

@ -60,7 +60,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QEvent; class QEvent;
class QTimerEvent; class QTimerEvent;

1
src/corelib/kernel/qobject_impl.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
namespace QtPrivate { namespace QtPrivate {
template <typename T> struct RemoveRef { typedef T Type; }; template <typename T> struct RemoveRef { typedef T Type; };

1
src/corelib/kernel/qobjectcleanuphandler.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class Q_CORE_EXPORT QObjectCleanupHandler : public QObject class Q_CORE_EXPORT QObjectCleanupHandler : public QObject
{ {

1
src/corelib/kernel/qobjectdefs.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QByteArray; class QByteArray;

1
src/corelib/kernel/qpointer.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#if QT_DEPRECATED_SINCE(5,0) #if QT_DEPRECATED_SINCE(5,0)

1
src/corelib/kernel/qsharedmemory.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_SHAREDMEMORY #ifndef QT_NO_SHAREDMEMORY

1
src/corelib/kernel/qsignalmapper.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_SIGNALMAPPER #ifndef QT_NO_SIGNALMAPPER
class QSignalMapperPrivate; class QSignalMapperPrivate;

1
src/corelib/kernel/qsocketnotifier.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class Q_CORE_EXPORT QSocketNotifier : public QObject class Q_CORE_EXPORT QSocketNotifier : public QObject
{ {

1
src/corelib/kernel/qsystemsemaphore.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_SYSTEMSEMAPHORE #ifndef QT_NO_SYSTEMSEMAPHORE

1
src/corelib/kernel/qtimer.h
View File

@ -51,7 +51,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class Q_CORE_EXPORT QTimer : public QObject class Q_CORE_EXPORT QTimer : public QObject
{ {

1
src/corelib/kernel/qtranslator.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_TRANSLATION #ifndef QT_NO_TRANSLATION

1
src/corelib/kernel/qvariant.h
View File

@ -54,7 +54,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QBitArray; class QBitArray;
class QDataStream; class QDataStream;

1
src/corelib/kernel/qwineventnotifier.h
View File

@ -54,7 +54,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class Q_CORE_EXPORT QWinEventNotifier : public QObject class Q_CORE_EXPORT QWinEventNotifier : public QObject
{ {

1
src/corelib/plugin/qfactoryinterface.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
struct Q_CORE_EXPORT QFactoryInterface struct Q_CORE_EXPORT QFactoryInterface
{ {

1
src/corelib/plugin/qlibrary.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN) #if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN)
#undef QT_NO_LIBRARY #undef QT_NO_LIBRARY

1
src/corelib/plugin/qplugin.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef Q_EXTERN_C #ifndef Q_EXTERN_C
# ifdef __cplusplus # ifdef __cplusplus

1
src/corelib/plugin/qpluginloader.h
View File

@ -55,7 +55,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QLibraryPrivate; class QLibraryPrivate;

1
src/corelib/plugin/quuid.h
View File

@ -63,7 +63,6 @@ typedef struct _GUID
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class Q_CORE_EXPORT QUuid class Q_CORE_EXPORT QUuid
{ {

1
src/corelib/statemachine/qabstractstate.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_STATEMACHINE #ifndef QT_NO_STATEMACHINE

1
src/corelib/statemachine/qabstracttransition.h
View File

@ -50,7 +50,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_STATEMACHINE #ifndef QT_NO_STATEMACHINE

1
src/corelib/statemachine/qeventtransition.h
View File

@ -49,7 +49,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_STATEMACHINE #ifndef QT_NO_STATEMACHINE

1
src/corelib/statemachine/qfinalstate.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_STATEMACHINE #ifndef QT_NO_STATEMACHINE

1
src/corelib/statemachine/qhistorystate.h
View File

@ -48,7 +48,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Core)
#ifndef QT_NO_STATEMACHINE #ifndef QT_NO_STATEMACHINE

Some files were not shown because too many files have changed in this diff Show More