summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-04-02 22:51:03 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-03 21:02:32 +0200
commiteb04862920eb6302f242e6a8fb75c58968311658 (patch)
tree9cd27f9e5af6a62ec38611f4e4835d32c8d12ea5 /src
parent3a9c06b7bd45613216101ffa34b5909c3b8dc6d8 (diff)
Remove duplicate non-const methods from QProgressBar.
Task-number: QTBUG-23524 Change-Id: I80f7eecb9f892fcd026b3c3f9159958fc99cfe23 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/widgets/qprogressbar.cpp8
-rw-r--r--src/widgets/widgets/qprogressbar.h6
2 files changed, 6 insertions, 8 deletions
diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp
index 3e5b78fe2b..c02aa0e875 100644
--- a/src/widgets/widgets/qprogressbar.cpp
+++ b/src/widgets/widgets/qprogressbar.cpp
@@ -526,9 +526,9 @@ void QProgressBar::setInvertedAppearance(bool invert)
update();
}
-bool QProgressBar::invertedAppearance()
+bool QProgressBar::invertedAppearance() const
{
- Q_D(QProgressBar);
+ Q_D(const QProgressBar);
return d->invertedAppearance;
}
@@ -549,9 +549,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/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h
index fad1ee4e0b..65ec5fa404 100644
--- a/src/widgets/widgets/qprogressbar.h
+++ b/src/widgets/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;