various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/painting/painting.cmake b/src/gui/painting/painting.cmake
index ac325ad..0d4e7d3 100644 (file)
--- a/src/gui/painting/painting.cmake
+++ b/src/gui/painting/painting.cmake
@@ -7,7 +7,6 @@ set(GUI_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolormap.h
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qdrawutil.h
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qgraphicssystem_p.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/painting/qgraphicssystemex_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qmatrix.h
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qmemrotate_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qoutlinemapper_p.h

diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index d01b971..53a9024 100644 (file)
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qbezier_p.h"
+#include "qpainterpath_p.h"
 #include <qdebug.h>
 #include <qline.h>
 #include <qpolygon.h>
@@ -306,12 +307,6 @@ static ShiftResult shift(const QBezier *orig, QBezier *shifted, qreal offset, qr
     return good_offset(orig, shifted, offset, threshold);
 }
 
-// This value is used to determine the length of control point vectors
-// when approximating arc segments as curves. The factor is multiplied
-// with the radius of the circle.
-#define KAPPA qreal(0.5522847498)
-
-
 static bool addCircle(const QBezier *b, qreal offset, QBezier *o)
 {
     QPointF normals[3];

diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp
index 1aeb011..b7575d1 100644 (file)
--- a/src/gui/painting/qgraphicssystem.cpp
+++ b/src/gui/painting/qgraphicssystem.cpp
@@ -50,7 +50,6 @@
 #ifdef Q_WS_MAC
 # include <qpixmap_mac_p.h>
 #endif
-# include <qgraphicssystemex_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -77,12 +76,6 @@ QPixmapData *QGraphicsSystem::createPixmapData(QPixmapData *origin)
     return createPixmapData(origin->pixelType());
 }
 
-
-QGraphicsSystemEx* QGraphicsSystem::platformExtension()
-{
-    return 0;
-}
-
 QT_END_NAMESPACE
 
 

diff --git a/src/gui/painting/qgraphicssystem_p.h b/src/gui/painting/qgraphicssystem_p.h
index 1073c84..4bcffbf 100644 (file)
--- a/src/gui/painting/qgraphicssystem_p.h
+++ b/src/gui/painting/qgraphicssystem_p.h
@@ -61,7 +61,6 @@
 QT_BEGIN_NAMESPACE
 
 class QPixmapFilter;
-class QGraphicsSystemEx;
 
 class Q_GUI_EXPORT QGraphicsSystem
 {
@@ -75,8 +74,6 @@ public:
     //### Remove this & change qpixmap.cpp & qbitmap.cpp once every platform is gaurenteed
     //    to have a graphics system.
     static QPixmapData *createDefaultPixmapData(QPixmapData::PixelType type);
-
-    virtual QGraphicsSystemEx* platformExtension();
 };
 
 QT_END_NAMESPACE

diff --git a/src/gui/painting/qgraphicssystemex_p.h b/src/gui/painting/qgraphicssystemex_p.h
deleted file mode 100644 (file)
index a43119a..0000000
--- a/src/gui/painting/qgraphicssystemex_p.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGRAPHICSSYSTEMEX_P_H
-#define QGRAPHICSSYSTEMEX_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_GUI_EXPORT QGraphicsSystemEx
-{
-};
-
-QT_END_NAMESPACE
-
-#endif

diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index ec8f040..e6251ef 100644 (file)
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -54,14 +54,11 @@
 //
 
 #include "QtGui/qpainterpath.h"
-#include "QtGui/qregion.h"
 #include "QtCore/qlist.h"
 #include "QtCore/qvarlengtharray.h"
 
-#include <qdebug.h>
-
-#include <qvectorpath_p.h>
-#include <qstroker_p.h>
+#include "qvectorpath_p.h"
+#include "qstroker_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -75,9 +72,6 @@ public:
     qreal dashOffset;
 };
 
-class QPolygonF;
-class QVectorPathConverter;
-
 class QVectorPathConverter
 {
 public:
@@ -270,9 +264,11 @@ inline void QPainterPathData::maybeMoveTo()
     }
 }
 
+// This value is used to determine the length of control point vectors
+// when approximating arc segments as curves. The factor is multiplied
+// with the radius of the circle.
 #define KAPPA qreal(0.5522847498)
 
-
 QT_END_NAMESPACE
 
 #endif // QPAINTERPATH_P_H

diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index 3abe3f9..18186d8 100644 (file)
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -55,7 +55,7 @@
 
 #include "qstatictext.h"
 
-#include <qtextureglyphcache_p.h>
+#include "qfontengine_p.h"
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_NAMESPACE