11 files changed, 1 insertions, 82 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index f0cffc2fcf..e297dae1b5 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -124,15 +124,6 @@ public:
         InsertAfterCurrent,
         InsertBeforeCurrent,
         InsertAlphabetically
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        ,
-        NoInsertion = NoInsert,
-        AtTop = InsertAtTop,
-        AtCurrent = InsertAtCurrent,
-        AtBottom = InsertAtBottom,
-        AfterCurrent = InsertAfterCurrent,
-        BeforeCurrent = InsertBeforeCurrent
-#endif
     };
 
     InsertPolicy insertPolicy() const;
diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h
index bee80403ab..4e11a6289b 100644
--- a/src/widgets/widgets/qframe.h
+++ b/src/widgets/widgets/qframe.h
@@ -83,15 +83,6 @@ public:
         HLine = 0x0004, // horizontal line
         VLine = 0x0005, // vertical line
         StyledPanel = 0x0006 // rectangular panel depending on the GUI style
-
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        ,PopupPanel = StyledPanel, // rectangular panel depending on the GUI style
-        MenuBarPanel = StyledPanel,
-        ToolBarPanel = StyledPanel,
-        LineEditPanel = StyledPanel,
-        TabWidgetPanel = StyledPanel,
-        GroupBoxPanel = StyledPanel
-#endif
     };
     enum Shadow {
         Plain = 0x0010, // plain line
@@ -102,10 +93,6 @@ public:
     enum StyleMask {
         Shadow_Mask = 0x00f0, // mask for the shadow
         Shape_Mask = 0x000f // mask for the shape
-#if defined(QT3_SUPPORT)
-        ,MShadow = Shadow_Mask,
-        MShape = Shape_Mask
-#endif
     };
 
     Shape frameShape() const;
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index 8a698c528a..09bdc68511 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -1427,14 +1427,6 @@ Qt::LayoutDirection QLabelPrivate::textDirection() const
     return text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight;
 }
 
-/*!
-    \fn void QLabel::setAlignment(Qt::AlignmentFlag flag)
-    \internal
-
-    Without this function, a call to e.g. setAlignment(Qt::AlignTop)
-    results in the \c QT3_SUPPORT function setAlignment(int) being called,
-    rather than setAlignment(Qt::Alignment).
-*/
 
 // Returns the rect that is available for us to draw the document
 QRect QLabelPrivate::documentRect() const
diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h
index b48fbedc46..6af2b185ea 100644
--- a/src/widgets/widgets/qlcdnumber.h
+++ b/src/widgets/widgets/qlcdnumber.h
@@ -73,9 +73,6 @@ public:
 
     enum Mode {
         Hex, Dec, Oct, Bin
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        , HEX = Hex, DEC = Dec, OCT = Oct, BIN = Bin
-#endif
     };
     enum SegmentStyle {
         Outline, Filled, Flat
diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h
index a4552d8cf5..c6620d253b 100644
--- a/src/widgets/widgets/qslider.h
+++ b/src/widgets/widgets/qslider.h
@@ -70,15 +70,6 @@ public:
         TicksBelow = 2,
         TicksRight = TicksBelow,
         TicksBothSides = 3
-
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        ,NoMarks = NoTicks,
-        Above = TicksAbove,
-        Left = TicksAbove,
-        Below = TicksBelow,
-        Right = TicksRight,
-        Both = TicksBothSides
-#endif
     };
 
     explicit QSlider(QWidget *parent = 0);
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index 12c851b88b..864bf0debe 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -1673,7 +1673,6 @@ void QSplitter::setStretchFactor(int index, int stretch)
 }
 
 
-//#ifdef QT3_SUPPORT
 #ifndef QT_NO_TEXTSTREAM
 /*!
     \relates QSplitter
@@ -1706,7 +1705,6 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter)
     return ts;
 }
 #endif // QT_NO_TEXTSTREAM
-//#endif // QT3_SUPPORT
 
 QT_END_NAMESPACE
 
diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h
index 7579e1a2c3..71252ede24 100644
--- a/src/widgets/widgets/qsplitter.h
+++ b/src/widgets/widgets/qsplitter.h
@@ -133,12 +133,10 @@ private:
     friend class QSplitterHandle;
 };
 
-//#ifdef QT3_SUPPORT
 #ifndef QT_NO_TEXTSTREAM
 Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&);
 Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&);
 #endif
-//#endif
 
 class QSplitterHandlePrivate;
 class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget
diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h
index e5e8175733..d33e6bbb1b 100644
--- a/src/widgets/widgets/qtabbar.h
+++ b/src/widgets/widgets/qtabbar.h
@@ -80,10 +80,6 @@ public:
 
     enum Shape { RoundedNorth, RoundedSouth, RoundedWest, RoundedEast,
                  TriangularNorth, TriangularSouth, TriangularWest, TriangularEast
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-                , RoundedAbove = RoundedNorth, RoundedBelow = RoundedSouth,
-                TriangularAbove = TriangularNorth, TriangularBelow = TriangularSouth
-#endif
     };
 
     enum ButtonPosition {
diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h
index 5ee6a38c80..ff734ed722 100644
--- a/src/widgets/widgets/qtabwidget.h
+++ b/src/widgets/widgets/qtabwidget.h
@@ -109,11 +109,7 @@ public:
     int indexOf(QWidget *widget) const;
     int count() const;
 
-    enum TabPosition { North, South, West, East
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        , Top = North, Bottom = South
-#endif
-    };
+    enum TabPosition { North, South, West, East };
     TabPosition tabPosition() const;
     void setTabPosition(TabPosition);
 
diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h
index 3f488975ec..b7ec942753 100644
--- a/src/widgets/widgets/qtextbrowser.h
+++ b/src/widgets/widgets/qtextbrowser.h
@@ -118,11 +118,6 @@ protected:
     virtual bool focusNextPrevChild(bool next);
     virtual void paintEvent(QPaintEvent *e);
 
-#if defined(QT3_SUPPORT)
-public:
-    QT3_SUPPORT_CONSTRUCTOR QTextBrowser(QWidget *parent, const char *name);
-#endif
-
 private:
     Q_DISABLE_COPY(QTextBrowser)
     Q_DECLARE_PRIVATE(QTextBrowser)
diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h
index b3c1193c2b..1fcf87cdf7 100644
--- a/src/widgets/widgets/qtextedit.h
+++ b/src/widgets/widgets/qtextedit.h
@@ -104,28 +104,6 @@ public:
 
     Q_DECLARE_FLAGS(AutoFormatting, AutoFormattingFlag)
 
-#if defined(QT3_SUPPORT)
-    enum CursorAction {
-        MoveBackward,
-        MoveForward,
-        MoveWordBackward,
-        MoveWordForward,
-        MoveUp,
-        MoveDown,
-        MoveLineStart,
-        MoveLineEnd,
-        MoveHome,
-        MoveEnd,
-        MovePageUp,
-        MovePageDown
-#if !defined(Q_MOC_RUN)
-        ,
-        MovePgUp = MovePageUp,
-        MovePgDown = MovePageDown
-#endif
-    };
-#endif
-
     explicit QTextEdit(QWidget *parent = 0);
     explicit QTextEdit(const QString &text, QWidget *parent = 0);
     virtual ~QTextEdit();