summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h116
1 files changed, 0 insertions, 116 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 64baf3a026..e769c43cef 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1046,18 +1046,10 @@ redefine to built-in booleans to make autotests work properly */
#endif
#if defined(QT_NO_DEPRECATED)
-/* disable Qt3 support as well */
-# undef QT3_SUPPORT_WARNINGS
-# undef QT3_SUPPORT
# undef QT_DEPRECATED
# undef QT_DEPRECATED_VARIABLE
# undef QT_DEPRECATED_CONSTRUCTOR
#elif defined(QT_DEPRECATED_WARNINGS)
-# ifdef QT3_SUPPORT
-/* enable Qt3 support warnings as well */
-# undef QT3_SUPPORT_WARNINGS
-# define QT3_SUPPORT_WARNINGS
-# endif
# undef QT_DEPRECATED
# define QT_DEPRECATED Q_DECL_DEPRECATED
# undef QT_DEPRECATED_VARIABLE
@@ -1073,28 +1065,6 @@ redefine to built-in booleans to make autotests work properly */
# define QT_DEPRECATED_CONSTRUCTOR
#endif
-#if defined(QT3_SUPPORT_WARNINGS)
-# if !defined(QT_COMPAT_WARNINGS) /* also enable compat */
-# define QT_COMPAT_WARNINGS
-# endif
-# undef QT3_SUPPORT
-# define QT3_SUPPORT Q_DECL_DEPRECATED
-# undef QT3_SUPPORT_VARIABLE
-# define QT3_SUPPORT_VARIABLE Q_DECL_VARIABLE_DEPRECATED
-# undef QT3_SUPPORT_CONSTRUCTOR
-# define QT3_SUPPORT_CONSTRUCTOR explicit Q_DECL_CONSTRUCTOR_DEPRECATED
-#elif defined(QT3_SUPPORT) /* define back to nothing */
-# if !defined(QT_COMPAT) /* also enable qt3 support */
-# define QT_COMPAT
-# endif
-# undef QT3_SUPPORT
-# define QT3_SUPPORT
-# undef QT3_SUPPORT_VARIABLE
-# define QT3_SUPPORT_VARIABLE
-# undef QT3_SUPPORT_CONSTRUCTOR
-# define QT3_SUPPORT_CONSTRUCTOR explicit
-#endif
-
/* moc compats (signals/slots) */
#ifndef QT_MOC_COMPAT
# if defined(QT3_SUPPORT)
@@ -1188,31 +1158,6 @@ template <typename T>
inline const T &qBound(const T &min, const T &val, const T &max)
{ return qMax(min, qMin(max, val)); }
-#ifdef QT3_SUPPORT
-typedef qint8 Q_INT8;
-typedef quint8 Q_UINT8;
-typedef qint16 Q_INT16;
-typedef quint16 Q_UINT16;
-typedef qint32 Q_INT32;
-typedef quint32 Q_UINT32;
-typedef qint64 Q_INT64;
-typedef quint64 Q_UINT64;
-
-typedef qint64 Q_LLONG;
-typedef quint64 Q_ULLONG;
-#if defined(Q_OS_WIN64)
-typedef __int64 Q_LONG; /* word up to 64 bit signed */
-typedef unsigned __int64 Q_ULONG; /* word up to 64 bit unsigned */
-#else
-typedef long Q_LONG; /* word up to 64 bit signed */
-typedef unsigned long Q_ULONG; /* word up to 64 bit unsigned */
-#endif
-
-# define QABS(a) qAbs(a)
-# define QMAX(a, b) qMax((a), (b))
-# define QMIN(a, b) qMin((a), (b))
-#endif
-
/*
Data stream functions are provided by many classes (defined in qdatastream.h)
*/
@@ -1659,27 +1604,6 @@ Q_CORE_EXPORT bool qSharedBuild();
inline int qMacVersion() { return QSysInfo::MacintoshVersion; }
#endif
-#ifdef QT3_SUPPORT
-inline QT3_SUPPORT bool qSysInfo(int *wordSize, bool *bigEndian)
-{
- *wordSize = QSysInfo::WordSize;
- *bigEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian);
- return true;
-}
-#endif
-
-#if defined(Q_WS_WIN) || defined(Q_OS_CYGWIN)
-#if defined(QT3_SUPPORT)
-inline QT3_SUPPORT bool qt_winUnicode() { return true; }
-inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; }
-#endif
-
-// ### Qt 5: remove Win9x support macros QT_WA and QT_WA_INLINE.
-#define QT_WA(unicode, ansi) unicode
-#define QT_WA_INLINE(unicode, ansi) (unicode)
-
-#endif /* Q_WS_WIN */
-
#ifndef Q_OUTOFLINE_TEMPLATE
# define Q_OUTOFLINE_TEMPLATE
#endif
@@ -1749,9 +1673,6 @@ Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */
#endif
;
-#ifdef QT3_SUPPORT
-Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
-#endif /* QT3_SUPPORT */
Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
@@ -1853,11 +1774,6 @@ Q_CORE_EXPORT void qt_message_output(QtMsgType, const char *buf);
typedef void (*QtMsgHandler)(QtMsgType, const char *);
Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler);
-#ifdef QT3_SUPPORT
-inline QT3_SUPPORT void qSuppressObsoleteWarnings(bool = true) {}
-inline QT3_SUPPORT void qObsolete(const char *, const char * = 0, const char * = 0) {}
-#endif
-
#if !defined(Q_UNIMPLEMENTED)
# define Q_UNIMPLEMENTED() qWarning("%s:%d: %s: Unimplemented code.", __FILE__, __LINE__, Q_FUNC_INFO)
#endif
@@ -2508,27 +2424,6 @@ inline int qIntCast(float f) { return int(f); }
Q_CORE_EXPORT void qsrand(uint seed);
Q_CORE_EXPORT int qrand();
-/*
- Compat functions that were generated by configure
-*/
-#ifdef QT3_SUPPORT
-#ifndef QT_PRODUCT_LICENSEE
-# define QT_PRODUCT_LICENSEE QLibraryInfo::licensee()
-#endif
-#ifndef QT_PRODUCT_LICENSE
-# define QT_PRODUCT_LICENSE QLibraryInfo::licensedProducts()
-#endif
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPath();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathDocs();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathHeaders();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathLibs();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathBins();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathPlugins();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathData();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathTranslations();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
-#endif
-
#if defined(Q_OS_SYMBIAN)
#ifdef SYMBIAN_BUILD_GCE
@@ -2612,8 +2507,6 @@ Q_CORE_EXPORT int qt_symbian_exception2Error(const std::exception& ex);
#define QT_MODULE_OPENGL 0x000008
#define QT_MODULE_SQL 0x000010
#define QT_MODULE_XML 0x000020
-#define QT_MODULE_QT3SUPPORTLIGHT 0x000040
-#define QT_MODULE_QT3SUPPORT 0x000080
#define QT_MODULE_SVG 0x000100
#define QT_MODULE_ACTIVEQT 0x000200
#define QT_MODULE_GRAPHICSVIEW 0x000400
@@ -2641,7 +2534,6 @@ Q_CORE_EXPORT int qt_symbian_exception2Error(const std::exception& ex);
| QT_MODULE_DBUS)
#define QT_EDITION_DESKTOPLIGHT (QT_MODULE_CORE \
| QT_MODULE_GUI \
- | QT_MODULE_QT3SUPPORTLIGHT \
| QT_MODULE_TEST \
| QT_MODULE_DBUS)
#define QT_EDITION_OPENSOURCE (QT_MODULE_CORE \
@@ -2655,8 +2547,6 @@ Q_CORE_EXPORT int qt_symbian_exception2Error(const std::exception& ex);
| QT_MODULE_XMLPATTERNS \
| QT_MODULE_SCRIPT \
| QT_MODULE_SCRIPTTOOLS \
- | QT_MODULE_QT3SUPPORTLIGHT \
- | QT_MODULE_QT3SUPPORT \
| QT_MODULE_SVG \
| QT_MODULE_DECLARATIVE \
| QT_MODULE_GRAPHICSVIEW \
@@ -2723,12 +2613,6 @@ QT_LICENSED_MODULE(Script)
#if (QT_EDITION & QT_MODULE_SCRIPTTOOLS)
QT_LICENSED_MODULE(ScriptTools)
#endif
-#if (QT_EDITION & QT_MODULE_QT3SUPPORTLIGHT)
-QT_LICENSED_MODULE(Qt3SupportLight)
-#endif
-#if (QT_EDITION & QT_MODULE_QT3SUPPORT)
-QT_LICENSED_MODULE(Qt3Support)
-#endif
#if (QT_EDITION & QT_MODULE_SVG)
QT_LICENSED_MODULE(Svg)
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 06:18:48 +0000