summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qfeatures.h5
-rw-r--r--src/corelib/global/qfeatures.txt7
-rw-r--r--src/corelib/global/qnamespace.h9
-rw-r--r--src/corelib/global/qnamespace.qdoc3
-rw-r--r--src/corelib/kernel/qcoreevent.cpp1
-rw-r--r--src/corelib/kernel/qcoreevent.h3
-rw-r--r--src/gui/image/qpicture.cpp28
-rw-r--r--src/gui/image/qpicture.h1
-rw-r--r--src/gui/kernel/qkeysequence.h1
-rw-r--r--src/gui/painting/qpainter.h1
-rw-r--r--src/gui/text/qfont.h2
-rw-r--r--src/widgets/widgets/qtextedit.cpp2
12 files changed, 2 insertions, 61 deletions
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
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 089cc5011c..8bb9f211e8 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -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);
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index c3dbab25c5..b94171abf8 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -109,7 +109,6 @@ private:
QExplicitlySharedDataPointer<QPicturePrivate> d_ptr;
friend class QPicturePaintEngine;
- friend class Q3Picture;
friend class QAlphaPaintEngine;
friend class QPreviewPaintEngine;
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h
index e8dd134bc3..c926e8de1a 100644
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@@ -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;
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 97c10a2764..5ea38682b8 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -465,7 +465,6 @@ public:
private:
Q_DISABLE_COPY(QPainter)
- friend class Q3Painter;
QScopedPointer<QPainterPrivate> d_ptr;
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index cd1e3f0880..a3019e560c 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -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;
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 198d101dbf..4b7e1b5978 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 12:41:48 +0000