Cleanup Q3* items

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>

5 files changed, 0 insertions, 33 deletions

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;