Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-06-22 15:01:33 +00:00
parent 3925839383
commit d5ce29803c
6 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README
View file

@ -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

8
src/gui/painting/qbrush.cpp
View file

@ -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

2
src/gui/painting/qbrush.h
View file

@ -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;

1
src/gui/util/qcompleter.h
View file

@ -57,7 +57,6 @@ QT_BEGIN_NAMESPACE
class QCompleterPrivate;
class QAbstractItemView;
class QAbstractProxyModel;
class QWidget;
class Q_GUI_EXPORT QCompleter : public QObject

8
src/gui/widgets/qprogressbar.cpp
View file

@ -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;
}

6
src/gui/widgets/qprogressbar.h
View file

@ -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;