whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTextOption: remove deprecated function QTextOption::tabStop() 

Change-Id: I7d647088aacb83d16c3e3cc4d831162a95771083
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Christian Ehrlicher 2020-06-20 20:06:25 +02:00
parent 5a5c20ad40
commit 843b403286
2 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/text/qtextoption.cpp
View File

@ -324,28 +324,6 @@ QList<QTextOption::Tab> QTextOption::tabs() const
\sa flags()
*/
#if QT_DEPRECATED_SINCE(5, 10)
/*!
\fn qreal QTextOption::tabStop() const
\deprecated in Qt 5.10. Use tabStopDistance() instead.
Returns the distance in device units between tab stops.
Convenient function for the above method
\sa setTabStopDistance(), tabArray(), setTabs(), tabs()
*/
/*!
\fn void QTextOption::setTabStop(qreal tabStop)
\deprecated in Qt 5.10. Use setTabStopDistance() instead.
Sets the default distance in device units between tab stops to the value specified
by \a tabStop.
\sa tabStopDistance(), setTabArray(), setTabs(), tabs()
*/
#endif
/*!
\fn qreal QTextOption::tabStopDistance() const
\since 5.10
@ -442,7 +420,7 @@ QList<QTextOption::Tab> QTextOption::tabs() const
\fn QList<QTextOption::Tab> QTextOption::tabs() const
Returns a list of tab positions defined for the text layout.
\sa tabStopDistance(), setTabs(), setTabStop()
\sa tabStopDistance(), setTabs(), setTabStopDistance()
*/

10
src/gui/text/qtextoption.h
View File

@ -115,11 +115,6 @@ public:
inline void setFlags(Flags flags);
inline Flags flags() const { return Flags(f); }
#if QT_DEPRECATED_SINCE(5, 10)
QT_DEPRECATED inline void setTabStop(qreal tabStop);
QT_DEPRECATED inline qreal tabStop() const { return tabStopDistance(); }
#endif
inline void setTabStopDistance(qreal tabStopDistance);
inline qreal tabStopDistance() const { return tab; }
@ -151,11 +146,6 @@ inline void QTextOption::setAlignment(Qt::Alignment aalignment)
inline void QTextOption::setFlags(Flags aflags)
{ f = aflags; }
#if QT_DEPRECATED_SINCE(5, 10)
inline void QTextOption::setTabStop(qreal atabStop)
{ setTabStopDistance(atabStop); }
#endif
inline void QTextOption::setTabStopDistance(qreal atabStop)
{ tab = atabStop; }