From 8d05a30c0fefaa8df92cec8c5da8308ea8b7915b Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Tue, 16 Aug 2016 21:03:17 +0000
Subject: [PATCH] various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 src/gui/dialogs/qprogressdialog.cpp             |  1 -
 src/gui/painting/qdrawutil.cpp                  | 50 -------------------------
 src/gui/painting/qdrawutil.h                    | 49 +++++++++++++++++-------
 src/gui/painting/qpaintengineex_p.h             |  1 -
 src/gui/styles/qstylesheetstyle.cpp             | 19 +++++-----
 src/gui/widgets/qdockwidget.cpp                 |  1 -
 src/gui/widgets/qframe.cpp                      |  1 -
 src/gui/widgets/qgroupbox.cpp                   |  1 -
 src/gui/widgets/qlabel.cpp                      |  1 -
 src/gui/widgets/qlineedit.cpp                   |  1 -
 src/gui/widgets/qpushbutton.cpp                 |  1 -
 src/gui/widgets/qsplitter.cpp                   |  1 -
 src/gui/widgets/qtoolbutton.cpp                 |  1 -
 src/imports/particles/qdeclarativeparticles.cpp |  1 -
 src/shared/qtgradienteditor/qtcolorline.cpp     |  1 -
 15 files changed, 44 insertions(+), 86 deletions(-)

diff --git a/src/gui/dialogs/qprogressdialog.cpp b/src/gui/dialogs/qprogressdialog.cpp
index 47b082f85..27058ba5d 100644
--- a/src/gui/dialogs/qprogressdialog.cpp
+++ b/src/gui/dialogs/qprogressdialog.cpp
@@ -45,7 +45,6 @@
 
 #include "qshortcut.h"
 #include "qpainter.h"
-#include "qdrawutil.h"
 #include "qlabel.h"
 #include "qprogressbar.h"
 #include "qapplication.h"
diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index ba73de006..deed3f1b3 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -572,14 +572,6 @@ void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &c,
     \sa qDrawShadeRect(), qDrawShadePanel(), QStyle
 */
 
-void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2,
-                     const QPalette &pal, bool sunken,
-                     int lineWidth, int midLineWidth)
-{
-    qDrawShadeLine(p, p1.x(), p1.y(), p2.x(), p2.y(), pal, sunken,
-                    lineWidth, midLineWidth);
-}
-
 /*!
     \fn void qDrawShadeRect(QPainter *painter, const QRect &rect, const QPalette &palette,
              bool sunken, int lineWidth, int midLineWidth, const QBrush *fill)
@@ -611,15 +603,6 @@ void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2,
     \sa qDrawShadeLine(), qDrawShadePanel(), qDrawPlainRect(), QStyle
 */
 
-void qDrawShadeRect(QPainter *p, const QRect &r,
-                     const QPalette &pal, bool sunken,
-                     int lineWidth, int midLineWidth,
-                     const QBrush *fill)
-{
-    qDrawShadeRect(p, r.x(), r.y(), r.width(), r.height(), pal, sunken,
-                    lineWidth, midLineWidth, fill);
-}
-
 /*!
     \fn void qDrawShadePanel(QPainter *painter, const QRect &rect, const QPalette &palette,
              bool sunken, int lineWidth, const QBrush *fill)
@@ -648,14 +631,6 @@ void qDrawShadeRect(QPainter *p, const QRect &r,
     \sa qDrawWinPanel(), qDrawShadeLine(), qDrawShadeRect(), QStyle
 */
 
-void qDrawShadePanel(QPainter *p, const QRect &r,
-                      const QPalette &pal, bool sunken,
-                      int lineWidth, const QBrush *fill)
-{
-    qDrawShadePanel(p, r.x(), r.y(), r.width(), r.height(), pal, sunken,
-                     lineWidth, fill);
-}
-
 /*!
     \fn void qDrawWinButton(QPainter *painter, const QRect &rect, const QPalette &palette,
              bool sunken, const QBrush *fill)
@@ -679,12 +654,6 @@ void qDrawShadePanel(QPainter *p, const QRect &r,
     \sa qDrawWinPanel(), QStyle
 */
 
-void qDrawWinButton(QPainter *p, const QRect &r,
-                     const QPalette &pal, bool sunken, const QBrush *fill)
-{
-    qDrawWinButton(p, r.x(), r.y(), r.width(), r.height(), pal, sunken, fill);
-}
-
 /*!
     \fn void qDrawWinPanel(QPainter *painter, const QRect &rect, const QPalette &palette,
              bool sunken, const QBrush *fill)
@@ -709,12 +678,6 @@ void qDrawWinButton(QPainter *p, const QRect &r,
     \sa qDrawShadePanel(), qDrawWinButton(), QStyle
 */
 
-void qDrawWinPanel(QPainter *p, const QRect &r,
-                    const QPalette &pal, bool sunken, const QBrush *fill)
-{
-    qDrawWinPanel(p, r.x(), r.y(), r.width(), r.height(), pal, sunken, fill);
-}
-
 /*!
     \fn void qDrawPlainRect(QPainter *painter, const QRect &rect, const QColor &lineColor, int lineWidth, const QBrush *fill)
     \relates <qdrawutil.h>
@@ -736,19 +699,6 @@ void qDrawWinPanel(QPainter *p, const QRect &r,
     \sa qDrawShadeRect(), QStyle
 */
 
-void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &c,
-                     int lineWidth, const QBrush *fill)
-{
-    qDrawPlainRect(p, r.x(), r.y(), r.width(), r.height(), c,
-                    lineWidth, fill);
-}
-
-
-#if defined(Q_CC_MSVC)
-#pragma warning(disable: 4244)
-#endif
-
-
 /*!
     \class QTileRules
     \since 4.6
diff --git a/src/gui/painting/qdrawutil.h b/src/gui/painting/qdrawutil.h
index b6c7ef039..05ae752a8 100644
--- a/src/gui/painting/qdrawutil.h
+++ b/src/gui/painting/qdrawutil.h
@@ -66,50 +66,71 @@ Q_GUI_EXPORT void qDrawShadeLine(QPainter *p, int x1, int y1, int x2, int y2,
                               const QPalette &pal, bool sunken = true,
                               int lineWidth = 1, int midLineWidth = 0);
 
-Q_GUI_EXPORT void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2,
+inline void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2,
                               const QPalette &pal, bool sunken = true,
-                              int lineWidth = 1, int midLineWidth = 0);
+                              int lineWidth = 1, int midLineWidth = 0)
+{
+    qDrawShadeLine(p, p1.x(), p1.y(), p2.x(), p2.y(), pal, sunken,
+                    lineWidth, midLineWidth);
+}
 
 Q_GUI_EXPORT void qDrawShadeRect(QPainter *p, int x, int y, int w, int h,
                               const QPalette &pal, bool sunken = false,
                               int lineWidth = 1, int midLineWidth = 0,
                               const QBrush *fill = 0);
 
-Q_GUI_EXPORT void qDrawShadeRect(QPainter *p, const QRect &r,
+inline void qDrawShadeRect(QPainter *p, const QRect &r,
                               const QPalette &pal, bool sunken = false,
                               int lineWidth = 1, int midLineWidth = 0,
-                              const QBrush *fill = 0);
+                              const QBrush *fill = 0)
+{
+    qDrawShadeRect(p, r.x(), r.y(), r.width(), r.height(), pal, sunken,
+                    lineWidth, midLineWidth, fill);
+}
 
 Q_GUI_EXPORT void qDrawShadePanel(QPainter *p, int x, int y, int w, int h,
                                const QPalette &pal, bool sunken = false,
                                int lineWidth = 1, const QBrush *fill = 0);
 
-Q_GUI_EXPORT void qDrawShadePanel(QPainter *p, const QRect &r,
+inline void qDrawShadePanel(QPainter *p, const QRect &r,
                                const QPalette &pal, bool sunken = false,
-                               int lineWidth = 1, const QBrush *fill = 0);
+                               int lineWidth = 1, const QBrush *fill = 0)
+{
+    qDrawShadePanel(p, r.x(), r.y(), r.width(), r.height(), pal, sunken,
+                     lineWidth, fill);
+}
 
 Q_GUI_EXPORT void qDrawWinButton(QPainter *p, int x, int y, int w, int h,
                               const QPalette &pal, bool sunken = false,
                               const QBrush *fill = 0);
 
-Q_GUI_EXPORT void qDrawWinButton(QPainter *p, const QRect &r,
+inline void qDrawWinButton(QPainter *p, const QRect &r,
                               const QPalette &pal, bool sunken = false,
-                              const QBrush *fill = 0);
+                              const QBrush *fill = 0)
+{
+    qDrawWinButton(p, r.x(), r.y(), r.width(), r.height(), pal, sunken, fill);
+}
 
 Q_GUI_EXPORT void qDrawWinPanel(QPainter *p, int x, int y, int w, int h,
                               const QPalette &pal, bool sunken = false,
                              const QBrush *fill = 0);
 
-Q_GUI_EXPORT void qDrawWinPanel(QPainter *p, const QRect &r,
+inline void qDrawWinPanel(QPainter *p, const QRect &r,
                               const QPalette &pal, bool sunken = false,
-                             const QBrush *fill = 0);
-
-Q_GUI_EXPORT void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &,
-                              int lineWidth = 1, const QBrush *fill = 0);
+                             const QBrush *fill = 0)
+{
+    qDrawWinPanel(p, r.x(), r.y(), r.width(), r.height(), pal, sunken, fill);
+}
 
-Q_GUI_EXPORT void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &,
+Q_GUI_EXPORT void qDrawPlainRect(QPainter *p, int x, int y, int w, int h,
+                              const QColor &c,
                               int lineWidth = 1, const QBrush *fill = 0);
 
+inline void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &c,
+                              int lineWidth = 1, const QBrush *fill = 0)
+{
+    qDrawPlainRect(p, r.x(), r.y(), r.width(), r.height(), c, lineWidth, fill);
+}
 
 
 struct QTileRules
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index 7d151f626..d96eb5d11 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -54,7 +54,6 @@
 //
 
 #include <QtGui/qpaintengine.h>
-#include <QtGui/qdrawutil.h>
 
 #include <qpaintengine_p.h>
 #include <qstroker_p.h>
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 1d0571426..94715b89e 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -43,8 +43,13 @@
 
 #ifndef QT_NO_STYLE_STYLESHEET
 
+#include "qcssparser_p.h"
+#include "qmath_p.h"
 #include "qstylesheetstyle_p.h"
 #include "qcssutil_p.h"
+#include "qabstractscrollarea_p.h"
+#include "qwindowsstyle_p.h"
+#include "qwidget_p.h"
 #include <qdebug.h>
 #include <qapplication.h>
 #include <qmenu.h>
@@ -54,12 +59,8 @@
 #include <qlineedit.h>
 #include <qwindowsstyle.h>
 #include <qcombobox.h>
-#include <qwindowsstyle.h>
 #include <qplastiquestyle.h>
-#include "qcssparser_p.h"
-#include "qmath_p.h"
 #include <qabstractscrollarea.h>
-#include "qabstractscrollarea_p.h"
 #include <qtooltip.h>
 #include <qshareddata.h>
 #include <qradiobutton.h>
@@ -71,20 +72,18 @@
 #include <qstatusbar.h>
 #include <qheaderview.h>
 #include <qprogressbar.h>
-#include <qwindowsstyle_p.h>
 #include <qtabbar.h>
 #include <qmetaobject.h>
 #include <qmainwindow.h>
 #include <qdockwidget.h>
 #include <qmdisubwindow.h>
 #include <qdialog.h>
-#include <qwidget_p.h>
-#include <QAbstractSpinBox>
-#include <QLabel>
-#include "qdrawutil.h"
+#include <qabstractspinbox.h>
+#include <qlabel.h>
+#include <qdrawutil.h>
+#include <qtoolbar.h>
 
 #include <limits.h>
-#include <QtGui/qtoolbar.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp
index b0010db0c..8efd92caf 100644
--- a/src/gui/widgets/qdockwidget.cpp
+++ b/src/gui/widgets/qdockwidget.cpp
@@ -45,7 +45,6 @@
 #include <qaction.h>
 #include <qapplication.h>
 #include <qdesktopwidget.h>
-#include <qdrawutil.h>
 #include <qevent.h>
 #include <qfontmetrics.h>
 #include <qmainwindow.h>
diff --git a/src/gui/widgets/qframe.cpp b/src/gui/widgets/qframe.cpp
index 4d02a9165..19b5c407f 100644
--- a/src/gui/widgets/qframe.cpp
+++ b/src/gui/widgets/qframe.cpp
@@ -41,7 +41,6 @@
 
 #include "qframe.h"
 #include "qbitmap.h"
-#include "qdrawutil.h"
 #include "qevent.h"
 #include "qpainter.h"
 #include "qstyle.h"
diff --git a/src/gui/widgets/qgroupbox.cpp b/src/gui/widgets/qgroupbox.cpp
index 5751f1643..62477e091 100644
--- a/src/gui/widgets/qgroupbox.cpp
+++ b/src/gui/widgets/qgroupbox.cpp
@@ -43,7 +43,6 @@
 #ifndef QT_NO_GROUPBOX
 #include "qapplication.h"
 #include "qbitmap.h"
-#include "qdrawutil.h"
 #include "qevent.h"
 #include "qlayout.h"
 #include "qradiobutton.h"
diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp
index b267602d1..98c35492b 100644
--- a/src/gui/widgets/qlabel.cpp
+++ b/src/gui/widgets/qlabel.cpp
@@ -41,7 +41,6 @@
 
 #include "qpainter.h"
 #include "qevent.h"
-#include "qdrawutil.h"
 #include "qapplication.h"
 #include "qabstractbutton.h"
 #include "qstyle.h"
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index 9c0e93c48..0a556ec03 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -47,7 +47,6 @@
 #include "qapplication.h"
 #include "qclipboard.h"
 #include "qdrag.h"
-#include "qdrawutil.h"
 #include "qevent.h"
 #include "qfontmetrics.h"
 #include "qmenu.h"
diff --git a/src/gui/widgets/qpushbutton.cpp b/src/gui/widgets/qpushbutton.cpp
index 4c529805d..468071dfa 100644
--- a/src/gui/widgets/qpushbutton.cpp
+++ b/src/gui/widgets/qpushbutton.cpp
@@ -44,7 +44,6 @@
 #include "qdesktopwidget.h"
 #include "qdialog.h"
 #include <qdialog_p.h>
-#include "qdrawutil.h"
 #include "qevent.h"
 #include "qfontmetrics.h"
 #include "qmenu.h"
diff --git a/src/gui/widgets/qsplitter.cpp b/src/gui/widgets/qsplitter.cpp
index ea8253f79..f8040cfbe 100644
--- a/src/gui/widgets/qsplitter.cpp
+++ b/src/gui/widgets/qsplitter.cpp
@@ -44,7 +44,6 @@
 
 #include "qapplication.h"
 #include "qcursor.h"
-#include "qdrawutil.h"
 #include "qevent.h"
 #include "qlayout.h"
 #include "qlist.h"
diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp
index 9c740669b..df1d45d41 100644
--- a/src/gui/widgets/qtoolbutton.cpp
+++ b/src/gui/widgets/qtoolbutton.cpp
@@ -44,7 +44,6 @@
 
 #include <qapplication.h>
 #include <qdesktopwidget.h>
-#include <qdrawutil.h>
 #include <qevent.h>
 #include <qicon.h>
 #include <qmenu.h>
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index f0f7caabf..69bb7dc94 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -48,7 +48,6 @@
 #include <QtCore/QAbstractAnimation>
 
 #include <QPainter>
-#include <QtGui/qdrawutil.h>
 #include <QVarLengthArray>
 
 #include <stdlib.h>
diff --git a/src/shared/qtgradienteditor/qtcolorline.cpp b/src/shared/qtgradienteditor/qtcolorline.cpp
index d887eefeb..c7dee6e34 100644
--- a/src/shared/qtgradienteditor/qtcolorline.cpp
+++ b/src/shared/qtgradienteditor/qtcolorline.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include "qtcolorline.h"
-#include "qdrawutil.h"
 
 #include <QtGui/QPainter>
 #include <QtGui/qevent.h>
-- 
2.11.0