summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qglobal.cpp53
-rw-r--r--src/corelib/global/qglobal.h116
-rw-r--r--src/corelib/global/qnamespace.h305
-rw-r--r--src/corelib/global/qnamespace.qdoc46
4 files changed, 0 insertions, 520 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index e5626b4632..ca8b30fc00 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2471,11 +2471,6 @@ void qCritical(const char *msg, ...)
va_end(ap);
}
-#ifdef QT3_SUPPORT
-void qSystemWarning(const char *msg, int code)
- { qCritical("%s (%s)", msg, qt_error_string(code).toLocal8Bit().constData()); }
-#endif // QT3_SUPPORT
-
void qErrnoWarning(const char *msg, ...)
{
// qt_error_string() will allocate anyway, so we don't have
@@ -3031,54 +3026,6 @@ int qrand()
with meaningful parameter names in their signatures.
*/
-#if defined(QT3_SUPPORT) && !defined(QT_NO_SETTINGS)
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <qlibraryinfo.h>
-QT_END_INCLUDE_NAMESPACE
-
-static const char *qInstallLocation(QLibraryInfo::LibraryLocation loc)
-{
- static QByteArray ret;
- ret = QLibraryInfo::location(loc).toLatin1();
- return ret.constData();
-}
-const char *qInstallPath()
-{
- return qInstallLocation(QLibraryInfo::PrefixPath);
-}
-const char *qInstallPathDocs()
-{
- return qInstallLocation(QLibraryInfo::DocumentationPath);
-}
-const char *qInstallPathHeaders()
-{
- return qInstallLocation(QLibraryInfo::HeadersPath);
-}
-const char *qInstallPathLibs()
-{
- return qInstallLocation(QLibraryInfo::LibrariesPath);
-}
-const char *qInstallPathBins()
-{
- return qInstallLocation(QLibraryInfo::BinariesPath);
-}
-const char *qInstallPathPlugins()
-{
- return qInstallLocation(QLibraryInfo::PluginsPath);
-}
-const char *qInstallPathData()
-{
- return qInstallLocation(QLibraryInfo::DataPath);
-}
-const char *qInstallPathTranslations()
-{
- return qInstallLocation(QLibraryInfo::TranslationsPath);
-}
-const char *qInstallPathSysconf()
-{
- return qInstallLocation(QLibraryInfo::SettingsPath);
-}
-#endif
struct QInternal_CallBackTable {
QVector<QList<qInternalCallback> > callbacks;
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
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index d63eb7ad50..4f638e10ae 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -66,7 +66,6 @@ Qt {
Q_ENUMS(ScrollBarPolicy FocusPolicy ContextMenuPolicy)
Q_ENUMS(ArrowType ToolButtonStyle PenStyle PenCapStyle PenJoinStyle BrushStyle)
Q_ENUMS(FillRule MaskMode BGMode ClipOperation SizeMode)
- Q_ENUMS(BackgroundMode) // Qt3
Q_ENUMS(Axis Corner LayoutDirection SizeHint Orientation DropAction)
Q_FLAGS(Alignment Orientations DropActions)
Q_FLAGS(DockWidgetAreas ToolBarAreas)
@@ -159,18 +158,6 @@ public:
};
Q_DECLARE_FLAGS(MouseButtons, MouseButton)
-#ifdef QT3_SUPPORT
- enum ButtonState_enum {
- ShiftButton = Qt::ShiftModifier,
- ControlButton = Qt::ControlModifier,
- AltButton = Qt::AltModifier,
- MetaButton = Qt::MetaModifier,
- Keypad = Qt::KeypadModifier,
- KeyButtonMask = Qt::KeyboardModifierMask
- };
- typedef int ButtonState;
-#endif
-
enum Orientation {
Horizontal = 0x1,
Vertical = 0x2
@@ -189,10 +176,6 @@ public:
enum SortOrder {
AscendingOrder,
DescendingOrder
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- ,Ascending = AscendingOrder,
- Descending = DescendingOrder
-#endif
};
enum TileRule {
@@ -221,9 +204,6 @@ public:
AlignVertical_Mask = AlignTop | AlignBottom | AlignVCenter,
AlignCenter = AlignVCenter | AlignHCenter
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- , AlignAuto = AlignLeft
-#endif
};
Q_DECLARE_FLAGS(Alignment, AlignmentFlag)
@@ -243,22 +223,7 @@ public:
TextForceRightToLeft = 0x40000,
TextLongestVariant = 0x80000,
TextBypassShaping = 0x100000
-
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- ,SingleLine = TextSingleLine,
- DontClip = TextDontClip,
- ExpandTabs = TextExpandTabs,
- ShowPrefix = TextShowMnemonic,
- WordBreak = TextWordWrap,
- BreakAnywhere = TextWrapAnywhere,
- DontPrint = TextDontPrint,
- IncludeTrailingSpaces = TextIncludeTrailingSpaces,
- NoAccel = TextHideMnemonic
-#endif
};
-#ifdef QT3_SUPPORT
- typedef TextFlag TextFlags;
-#endif
enum TextElideMode {
ElideLeft,
@@ -309,56 +274,6 @@ public:
WindowCancelButtonHint = 0x00100000,
WindowSoftkeysVisibleHint = 0x40000000,
WindowSoftkeysRespondHint = 0x80000000
-
-#ifdef QT3_SUPPORT
- ,
- WMouseNoMask = 0x00080000,
- WDestructiveClose = 0x00100000,
- WStaticContents = 0x00200000,
- WGroupLeader = 0x00400000,
- WShowModal = 0x00800000,
- WNoMousePropagation = 0x01000000,
-
- WType_TopLevel = Window,
- WType_Dialog = Dialog,
- WType_Popup = Popup,
- WType_Desktop = Desktop,
- WType_Mask = WindowType_Mask,
-
- WStyle_Customize = 0,
- WStyle_NormalBorder = 0,
- WStyle_DialogBorder = MSWindowsFixedSizeDialogHint,
- WStyle_NoBorder = FramelessWindowHint,
- WStyle_Title = WindowTitleHint,
- WStyle_SysMenu = WindowSystemMenuHint,
- WStyle_Minimize = WindowMinimizeButtonHint,
- WStyle_Maximize = WindowMaximizeButtonHint,
- WStyle_MinMax = WStyle_Minimize | WStyle_Maximize,
- WStyle_Tool = Tool,
- WStyle_StaysOnTop = WindowStaysOnTopHint,
- WStyle_ContextHelp = WindowContextHelpButtonHint,
-
- // misc flags
- WPaintDesktop = 0,
- WPaintClever = 0,
-
- WX11BypassWM = X11BypassWindowManagerHint,
- WWinOwnDC = MSWindowsOwnDC,
- WMacSheet = Sheet,
- WMacDrawer = Drawer,
-
- WStyle_Splash = SplashScreen,
-
- WNoAutoErase = 0,
- WRepaintNoErase = 0,
- WNorthWestGravity = WStaticContents,
- WType_Modal = Dialog | WShowModal,
- WStyle_Dialog = Dialog,
- WStyle_NoBorderEx = FramelessWindowHint,
- WResizeNoErase = 0,
- WMacNoSheet = 0
-#endif
-
};
Q_DECLARE_FLAGS(WindowFlags, WindowType)
@@ -589,36 +504,11 @@ public:
OpaqueMode
};
-#ifdef QT3_SUPPORT
- enum PaintUnit { // paint unit
- PixelUnit,
- LoMetricUnit, // obsolete
- HiMetricUnit, // obsolete
- LoEnglishUnit, // obsolete
- HiEnglishUnit, // obsolete
- TwipsUnit // obsolete
- };
-
- enum GUIStyle {
- MacStyle,
- WindowsStyle,
- Win3Style,
- PMStyle,
- MotifStyle
- };
-#endif
-
enum Key {
Key_Escape = 0x01000000, // misc keys
Key_Tab = 0x01000001,
Key_Backtab = 0x01000002,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- Key_BackTab = Key_Backtab,
-#endif
Key_Backspace = 0x01000003,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- Key_BackSpace = Key_Backspace,
-#endif
Key_Return = 0x01000004,
Key_Enter = 0x01000005,
Key_Insert = 0x01000006,
@@ -634,13 +524,7 @@ public:
Key_Right = 0x01000014,
Key_Down = 0x01000015,
Key_PageUp = 0x01000016,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- Key_Prior = Key_PageUp,
-#endif
Key_PageDown = 0x01000017,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- Key_Next = Key_PageDown,
-#endif
Key_Shift = 0x01000020, // modifiers
Key_Control = 0x01000021,
Key_Meta = 0x01000022,
@@ -826,41 +710,7 @@ public:
Key_Yacute = 0x0dd,
Key_THORN = 0x0de,
Key_ssharp = 0x0df,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- Key_agrave = Key_Agrave,
- Key_aacute = Key_Aacute,
- Key_acircumflex = Key_Acircumflex,
- Key_atilde = Key_Atilde,
- Key_adiaeresis = Key_Adiaeresis,
- Key_aring = Key_Aring,
- Key_ae = Key_AE,
- Key_ccedilla = Key_Ccedilla,
- Key_egrave = Key_Egrave,
- Key_eacute = Key_Eacute,
- Key_ecircumflex = Key_Ecircumflex,
- Key_ediaeresis = Key_Ediaeresis,
- Key_igrave = Key_Igrave,
- Key_iacute = Key_Iacute,
- Key_icircumflex = Key_Icircumflex,
- Key_idiaeresis = Key_Idiaeresis,
- Key_eth = Key_ETH,
- Key_ntilde = Key_Ntilde,
- Key_ograve = Key_Ograve,
- Key_oacute = Key_Oacute,
- Key_ocircumflex = Key_Ocircumflex,
- Key_otilde = Key_Otilde,
- Key_odiaeresis = Key_Odiaeresis,
-#endif
Key_division = 0x0f7,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- Key_oslash = Key_Ooblique,
- Key_ugrave = Key_Ugrave,
- Key_uacute = Key_Uacute,
- Key_ucircumflex = Key_Ucircumflex,
- Key_udiaeresis = Key_Udiaeresis,
- Key_yacute = Key_Yacute,
- Key_thorn = Key_THORN,
-#endif
Key_ydiaeresis = 0x0ff,
// International input method support (X keycode - 0xEE00, the
@@ -960,9 +810,6 @@ public:
Key_MediaPlay = 0x01000080,
Key_MediaStop = 0x01000081,
Key_MediaPrevious = 0x01000082,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- Key_MediaPrev = Key_MediaPrevious,
-#endif
Key_MediaNext = 0x01000083,
Key_MediaRecord = 0x01000084,
Key_MediaPause = 0x1000085,
@@ -1178,9 +1025,6 @@ public:
RadialGradientPattern,
ConicalGradientPattern,
TexturePattern = 24
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- , CustomPattern = TexturePattern
-#endif
};
enum SizeMode {
@@ -1188,66 +1032,6 @@ public:
RelativeSize
};
-#if defined(QT3_SUPPORT)
-#if defined(Q_OS_MAC)
-#ifndef qdoc
- typedef int MacintoshVersion;
-
- enum
-#else
- enum MacintoshVersion
-#endif
- {
- //Unknown
- MV_Unknown = 0x0000,
-
- //Version numbers
- MV_9 = QSysInfo::MV_9,
- MV_10_DOT_0 = QSysInfo::MV_10_0,
- MV_10_DOT_1 = QSysInfo::MV_10_1,
- MV_10_DOT_2 = QSysInfo::MV_10_2,
- MV_10_DOT_3 = QSysInfo::MV_10_3,
- MV_10_DOT_4 = QSysInfo::MV_10_4,
-
- //Code names
- MV_CHEETAH = QSysInfo::MV_CHEETAH,
- MV_PUMA = QSysInfo::MV_PUMA,
- MV_JAGUAR = QSysInfo::MV_JAGUAR,
- MV_PANTHER = QSysInfo::MV_PANTHER,
- MV_TIGER = QSysInfo::MV_TIGER
- };
-#endif // Q_OS_MAC
-
-#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
-#ifndef qdoc
- typedef int WindowsVersion;
-
- enum
-#else
- enum WindowsVersion
-#endif
- {
- WV_32s = QSysInfo::WV_32s,
- WV_95 = QSysInfo::WV_95,
- WV_98 = QSysInfo::WV_98,
- WV_Me = QSysInfo::WV_Me,
- WV_DOS_based= QSysInfo::WV_DOS_based,
-
- WV_NT = QSysInfo::WV_NT,
- WV_2000 = QSysInfo::WV_2000,
- WV_XP = QSysInfo::WV_XP,
- WV_2003 = QSysInfo::WV_2003,
- WV_NT_based = QSysInfo::WV_NT_based,
-
- WV_CE = QSysInfo::WV_CE,
- WV_CENET = QSysInfo::WV_CENET,
- WV_CE_5 = QSysInfo::WV_CE_5,
- WV_CE_6 = QSysInfo::WV_CE_6,
- WV_CE_based = QSysInfo::WV_CE_based
- };
-#endif // Q_OS_WIN
-#endif // QT3_SUPPORT
-
enum UIEffect {
UI_General,
UI_AnimateMenu,
@@ -1284,26 +1068,6 @@ public:
LastCursor = DragLinkCursor,
BitmapCursor = 24,
CustomCursor = 25
-
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- ,
- arrowCursor = ArrowCursor,
- upArrowCursor = UpArrowCursor,
- crossCursor = CrossCursor,
- waitCursor = WaitCursor,
- ibeamCursor = IBeamCursor,
- sizeVerCursor = SizeVerCursor,
- sizeHorCursor = SizeHorCursor,
- sizeBDiagCursor = SizeBDiagCursor,
- sizeFDiagCursor = SizeFDiagCursor,
- sizeAllCursor = SizeAllCursor,
- blankCursor = BlankCursor,
- splitVCursor = SplitVCursor,
- splitHCursor = SplitHCursor,
- pointingHandCursor = PointingHandCursor,
- forbiddenCursor = ForbiddenCursor,
- whatsThisCursor = WhatsThisCursor
-#endif
};
enum TextFormat {
@@ -1317,15 +1081,7 @@ public:
IgnoreAspectRatio,
KeepAspectRatio,
KeepAspectRatioByExpanding
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- , ScaleFree = IgnoreAspectRatio,
- ScaleMin = KeepAspectRatio,
- ScaleMax = KeepAspectRatioByExpanding
-#endif
};
-#ifdef QT3_SUPPORT
- typedef AspectRatioMode ScaleMode;
-#endif
// This is for Q3TextEdit only, actually.
enum AnchorAttribute {
@@ -1366,28 +1122,6 @@ public:
Q_DECLARE_FLAGS(ToolBarAreas, ToolBarArea)
-#ifdef QT3_SUPPORT
- enum Dock {
- DockUnmanaged,
- DockTornOff,
- DockTop,
- DockBottom,
- DockRight,
- DockLeft,
- DockMinimized
- ,
- Unmanaged = DockUnmanaged,
- TornOff = DockTornOff,
- Top = DockTop,
- Bottom = DockBottom,
- Right = DockRight,
- Left = DockLeft,
- Minimized = DockMinimized
- };
- // compatibility
- typedef Dock ToolBarDock;
-#endif
-
enum DateFormat {
TextDate, // default Qt
ISODate, // ISO 8601
@@ -1422,31 +1156,6 @@ public:
ScrollBarAlwaysOn
};
-#ifdef QT3_SUPPORT
- enum BackgroundMode {
- FixedColor,
- FixedPixmap,
- NoBackground,
- PaletteForeground,
- PaletteButton,
- PaletteLight,
- PaletteMidlight,
- PaletteDark,
- PaletteMid,
- PaletteText,
- PaletteBrightText,
- PaletteBase,
- PaletteBackground,
- PaletteShadow,
- PaletteHighlight,
- PaletteHighlightedText,
- PaletteButtonText,
- PaletteLink,
- PaletteLinkVisited,
- X11ParentRelative
- };
-#endif
-
enum CaseSensitivity {
CaseInsensitive,
CaseSensitive
@@ -1457,12 +1166,6 @@ public:
TopRightCorner = 0x00001,
BottomLeftCorner = 0x00002,
BottomRightCorner = 0x00003
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
- ,TopLeft = TopLeftCorner,
- TopRight = TopRightCorner,
- BottomLeft = BottomLeftCorner,
- BottomRight = BottomRightCorner
-#endif
};
enum ConnectionType {
@@ -1872,14 +1575,6 @@ public:
static bool callFunction(InternalFunction func, void **);
};
-#ifdef QT3_SUPPORT
-typedef qint32 QCOORD; // coordinate type
-enum {
- QCOORD_MAX = 2147483647,
- QCOORD_MIN = -QCOORD_MAX - 1
-};
-#endif
-
QT_END_NAMESPACE
QT_END_HEADER
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 09611e67f4..2d102e7ba1 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -2201,52 +2201,6 @@
TargetMoveAction is not used on the Mac.
*/
-#if defined(Q_OS_WIN) && defined(QT3_SUPPORT)
-/*!
- \enum Qt::WindowsVersion
- \compat
-
- \value WV_32s
- \value WV_95
- \value WV_98
- \value WV_Me
- \value WV_DOS_based
- \value WV_NT
- \value WV_2000
- \value WV_XP
- \value WV_2003
- \value WV_NT_based
- \value WV_CE
- \value WV_CENET
- \value WV_CE_based
- \value WV_CE_5
- \value WV_CE_6
-*/
-#endif
-
-#if defined(Q_OS_MAC) && defined(QT3_SUPPORT)
-/*!
- \enum Qt::MacintoshVersion
- \compat
-
- \value MV_Unknown Use QSysInfo::MV_Unknown instead.
- \value MV_9 Use QSysInfo::MV_9 instead.
- \value MV_10_DOT_0 Use QSysInfo::MV_10_0 instead.
- \value MV_10_DOT_1 Use QSysInfo::MV_10_1 instead.
- \value MV_10_DOT_2 Use QSysInfo::MV_10_2 instead.
- \value MV_10_DOT_3 Use QSysInfo::MV_10_3 instead.
- \value MV_10_DOT_4 Use QSysInfo::MV_10_4 instead.
-
- \value MV_CHEETAH Use QSysInfo::MV_10_0 instead.
- \value MV_PUMA Use QSysInfo::MV_10_1 instead.
- \value MV_JAGUAR Use QSysInfo::MV_10_2 instead.
- \value MV_PANTHER Use QSysInfo::MV_10_3 instead.
- \value MV_TIGER Use QSysInfo::MV_10_4 instead.
-
- \sa QSysInfo::MacVersion
-*/
-#endif
-
/*! \typedef Qt::ToolBarDock
\compat
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 05:47:07 +0000