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

Cleanup Q3* items

Browse Source 
Cleanup Q3* items from QtCore and QtGui modules.

Change-Id: Id214a077a50e99d820c84e96e34866492a0130d8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Debao Zhang 2012-03-17 21:37:17 -07:00 committed by Qt by Nokia
parent e20c473019
commit f31e614245
13 changed files with 2 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qfeatures.h
View File

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

7
src/corelib/global/qfeatures.txt
View File

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

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

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

3
src/corelib/global/qnamespace.qdoc
View File

@ -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.
*/
/*!

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

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

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

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

28
src/gui/image/qpicture.cpp
View File

@ -828,26 +828,6 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
}
painter->setBrush(brush);
break;
// #ifdef Q_Q3PAINTER
// case QPicturePrivate::PdcSetTabStops:
// s >> i_16;
// painter->setTabStops(i_16);
// break;
// case QPicturePrivate::PdcSetTabArray:
// s >> i_16;
// if (i_16 == 0) {
// painter->setTabArray(0);
// } else {
// int *ta = new int[i_16];
// for (int i=0; i<i_16; i++) {
// s >> i1_16;
// ta[i] = i1_16;
// }
// painter->setTabArray(ta);
// delete [] ta;
// }
// break;
// #endif
case QPicturePrivate::PdcSetVXform:
s >> i_8;
painter->setViewTransformEnabled(i_8);
@ -884,14 +864,6 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
// i_8 is always false due to updateXForm() in qpaintengine_pic.cpp
painter->setTransform(matrix * worldMatrix, i_8);
break;
// #ifdef Q_Q3PAINTER
// case QPicturePrivate::PdcSaveWMatrix:
// painter->saveWorldMatrix();
// break;
// case QPicturePrivate::PdcRestoreWMatrix:
// painter->restoreWorldMatrix();
// break;
// #endif
case QPicturePrivate::PdcSetClip:
s >> i_8;
painter->setClipping(i_8);

1
src/gui/image/qpicture.h
View File

@ -109,7 +109,6 @@ private:
QExplicitlySharedDataPointer<QPicturePrivate> d_ptr;
friend class QPicturePaintEngine;
friend class Q3Picture;
friend class QAlphaPaintEngine;
friend class QPreviewPaintEngine;

1
src/gui/kernel/qkeysequence.h
View File

@ -203,7 +203,6 @@ private:
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks);
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QKeySequence &ks);
friend class Q3AccelManager;
friend class QShortcutMap;
friend class QShortcut;

1
src/gui/painting/qpainter.h
View File

@ -465,7 +465,6 @@ public:
private:
Q_DISABLE_COPY(QPainter)
friend class Q3Painter;
QScopedPointer<QPainterPrivate> d_ptr;

2
src/gui/text/qfont.h
View File

@ -55,7 +55,6 @@ QT_BEGIN_NAMESPACE
class QFontPrivate; /* don't touch */
class QStringList;
class QVariant;
class Q3TextFormatCollection;
class Q_GUI_EXPORT QFont
{
@ -288,7 +287,6 @@ private:
friend class QApplication;
friend class QWidget;
friend class QWidgetPrivate;
friend class Q3TextFormatCollection;
friend class QTextLayout;
friend class QTextEngine;
friend class QStackTextEngine;

2
src/widgets/widgets/qtextedit.cpp
View File

@ -2453,7 +2453,7 @@ void QTextEdit::setText(const QString &text)
if (d->textFormat == Qt::AutoText)
format = Qt::mightBeRichText(text) ? Qt::RichText : Qt::PlainText;
#ifndef QT_NO_TEXTHTMLPARSER
if (format == Qt::RichText || format == Qt::LogText)
if (format == Qt::RichText)
setHtml(text);
else
#endif

3
tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
View File

@ -255,9 +255,6 @@ void tst_QLabel::setTextFormat()
testWidget->setTextFormat( Qt::RichText );
QVERIFY( testWidget->textFormat() == Qt::RichText );
testWidget->setTextFormat( Qt::LogText );
QVERIFY( testWidget->textFormat() == Qt::LogText );
testWidget->setTextFormat( Qt::AutoText );
QVERIFY( testWidget->textFormat() == Qt::AutoText );
}