diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-06-20 20:06:25 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-07-01 22:19:16 +0200 |
| commit | 843b40328610c5e61bd7cada03c2046ece788b02 (patch) | |
| tree | 7c0274a5fe9a83121dc46d648ca4dcbc206194ad /src/gui/text | |
| parent | 5a5c20ad402af18f7bf56ad11edee2dfec3d7e63 (diff) | |
QTextOption: remove deprecated function QTextOption::tabStop()
Change-Id: I7d647088aacb83d16c3e3cc4d831162a95771083
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextoption.cpp | 24 | ||||
| -rw-r--r-- | src/gui/text/qtextoption.h | 10 |
2 files changed, 1 insertions, 33 deletions
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index 2568d3642b..59b75d6a26 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -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() */ diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index 52d253af1b..51e255e6f2 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -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; } |