From d5ce29803c0fd508beddaa9db93a6de585ba0666 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 22 Jun 2016 15:01:33 +0000
Subject: [PATCH] various cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 README                           | 3 ++-
 src/gui/painting/qbrush.cpp      | 8 --------
 src/gui/painting/qbrush.h        | 2 --
 src/gui/util/qcompleter.h        | 1 -
 src/gui/widgets/qprogressbar.cpp | 8 ++++----
 src/gui/widgets/qprogressbar.h   | 6 ++----
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/README b/README
index 8ab51deae..28f27e49f 100644
--- a/README
+++ b/README
@@ -38,7 +38,8 @@ Bugs fixed in Katie, some of which in Qt5 too:
 QTBUG-23502, QTBUG-37115, QTBUG-15052, QTBUG-23522, QTBUG-6139, QTBUG-26889,
 QTBUG-21548, QTBUG-6133, QTBUG-18188, QTBUG-36767, QTBUG-35387, QTBUG-37035,
 QTBUG-28321, QTBUG-21993, QTBUG-26590, QTBUG-2124, QTBUG-20482, QTBUG-41361,
-QTBUG-40153, QTBUG-35479, QTBUG-1628, QTBUG-42989, QTBUG-34861, QTBUG-46767
+QTBUG-40153, QTBUG-35479, QTBUG-1628, QTBUG-42989, QTBUG-34861, QTBUG-46767,
+QTBUG-23524 (WIP)
 
 Unless you use QMake and QDoc porting to Katie or even supporting it along with
 Qt4 in the same codebase is trivial and requires only minor changes because
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 312798b65..20ed9271d 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -1542,14 +1542,6 @@ bool QGradient::operator==(const QGradient &gradient) const
     return stops() == gradient.stops();
 }
 
-/*!
-    \internal
-*/
-bool QGradient::operator==(const QGradient &gradient)
-{
-    return const_cast<const QGradient *>(this)->operator==(gradient);
-}
-
 /*!
     \class QLinearGradient
     \ingroup painting
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index 0c04a3dcd..982d1a03f 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -240,8 +240,6 @@ public:
     inline bool operator!=(const QGradient &other) const
     { return !operator==(other); }
 
-    bool operator==(const QGradient &gradient); // ### Qt 5: remove
-
 private:
     friend class QLinearGradient;
     friend class QRadialGradient;
diff --git a/src/gui/util/qcompleter.h b/src/gui/util/qcompleter.h
index 802776440..1f38134fe 100644
--- a/src/gui/util/qcompleter.h
+++ b/src/gui/util/qcompleter.h
@@ -57,7 +57,6 @@ QT_BEGIN_NAMESPACE
 
 class QCompleterPrivate;
 class QAbstractItemView;
-class QAbstractProxyModel;
 class QWidget;
 
 class Q_GUI_EXPORT QCompleter : public QObject
diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp
index 6e75e1a0c..6c9b76fdb 100644
--- a/src/gui/widgets/qprogressbar.cpp
+++ b/src/gui/widgets/qprogressbar.cpp
@@ -527,9 +527,9 @@ void QProgressBar::setInvertedAppearance(bool invert)
     update();
 }
 
-bool QProgressBar::invertedAppearance()
+bool QProgressBar::invertedAppearance() const
 {
-    Q_D(QProgressBar);
+    Q_D(const QProgressBar);
     return d->invertedAppearance;
 }
 
@@ -550,9 +550,9 @@ void QProgressBar::setTextDirection(QProgressBar::Direction textDirection)
     update();
 }
 
-QProgressBar::Direction QProgressBar::textDirection()
+QProgressBar::Direction QProgressBar::textDirection() const
 {
-    Q_D(QProgressBar);
+    Q_D(const QProgressBar);
     return d->textDirection;
 }
 
diff --git a/src/gui/widgets/qprogressbar.h b/src/gui/widgets/qprogressbar.h
index d8b604493..4a2e999aa 100644
--- a/src/gui/widgets/qprogressbar.h
+++ b/src/gui/widgets/qprogressbar.h
@@ -92,11 +92,9 @@ public:
     Qt::Orientation orientation() const;
 
     void setInvertedAppearance(bool invert);
-    bool invertedAppearance(); //### Qt5 make const
-    bool invertedAppearance() const { return const_cast<QProgressBar *>(this)->invertedAppearance(); }
+    bool invertedAppearance() const;
     void setTextDirection(QProgressBar::Direction textDirection);
-    QProgressBar::Direction textDirection(); //### Qt5 make const
-    QProgressBar::Direction textDirection() const { return const_cast<QProgressBar *>(this)->textDirection(); }
+    QProgressBar::Direction textDirection() const;
 
     void setFormat(const QString &format);
     QString format() const;