From f31e614245e796c7f82ec33eed708902d4d01521 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Sat, 17 Mar 2012 21:37:17 -0700 Subject: Cleanup Q3* items Cleanup Q3* items from QtCore and QtGui modules. Change-Id: Id214a077a50e99d820c84e96e34866492a0130d8 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/corelib/global/qfeatures.h | 5 ----- src/corelib/global/qfeatures.txt | 7 ------- src/corelib/global/qnamespace.h | 9 +-------- src/corelib/global/qnamespace.qdoc | 3 --- src/corelib/kernel/qcoreevent.cpp | 1 - src/corelib/kernel/qcoreevent.h | 3 --- 6 files changed, 1 insertion(+), 27 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index db7ff04bb2..d9e030875f 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -487,11 +487,6 @@ #define QT_NO_STYLE_STYLESHEET #endif -// Q3TabDialog -#if !defined(QT_NO_TABDIALOG) && (defined(QT_NO_TABBAR)) -#define QT_NO_TABDIALOG -#endif - // QColorDialog #if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX)) #define QT_NO_COLORDIALOG diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 444a23b0e3..795529b933 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -644,13 +644,6 @@ Requires: COMBOBOX SPINBOX STACKEDWIDGET Name: QInputDialog SeeAlso: ??? -Feature: TABDIALOG -Description: Supports a stack of tabbed widgets. -Section: Dialogs -Requires: TABBAR -Name: Q3TabDialog -SeeAlso: ??? - Feature: ERRORMESSAGE Description: Supports an error message display dialog. Section: Dialogs diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 4ea62c77a6..2a501dec7e 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1101,8 +1101,7 @@ public: enum TextFormat { PlainText, RichText, - AutoText, - LogText + AutoText }; enum AspectRatioMode { @@ -1111,12 +1110,6 @@ public: KeepAspectRatioByExpanding }; - // This is for Q3TextEdit only, actually. - enum AnchorAttribute { - AnchorName, - AnchorHref - }; - enum DockWidgetArea { LeftDockWidgetArea = 0x1, RightDockWidgetArea = 0x2, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 1df36f42e6..d755e26e21 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2309,9 +2309,6 @@ \value AutoText The text string is interpreted as for Qt::RichText if Qt::mightBeRichText() returns true, otherwise as Qt::PlainText. - - \value LogText A special, limited text format which is only used - by Q3TextEdit in an optimized mode. */ /*! diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 032590fa7f..06fbfb0d39 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -170,7 +170,6 @@ QT_BEGIN_NAMESPACE \value NonClientAreaMouseButtonRelease A mouse button release occurred outside the client area. \value NonClientAreaMouseMove A mouse move occurred outside the client area. \value MacSizeChange The user changed his widget sizes (Mac OS X only). - \value MenubarUpdated The window's menu bar has been updated. \value MetaCall An asynchronous method invocation via QMetaObject::invokeMethod(). \value ModifiedChange Widgets modification state has been changed. \value MouseButtonDblClick Mouse press again (QMouseEvent). diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index a207849604..31ee8e810b 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -191,9 +191,6 @@ public: #endif AcceptDropsChange = 152, - MenubarUpdated = 153, // Support event for Q3MainWindow, which needs to - // knwow when QMenubar is updated. - ZeroTimerEvent = 154, // Used for Windows Zero timer events GraphicsSceneMouseMove = 155, // GraphicsView -- cgit v1.2.3