From 3855233dab82946ba50ddd90ce86df035998da8e Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 24 Jan 2012 22:26:31 +0100 Subject: Remove many deprecated methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove methods that have been marked as deprecated before Qt 4.6. Keep others, but inline them where possible and mark them as QT_DEPRECATED_SINCE(5, 0). Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7 Reviewed-by: Thiago Macieira Reviewed-by: João Abecasis --- src/widgets/widgets/qlcdnumber.cpp | 18 ------------------ src/widgets/widgets/qlcdnumber.h | 6 +----- 2 files changed, 1 insertion(+), 23 deletions(-) (limited to 'src/widgets/widgets') diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp index 5adf7b5665..71e08fdaeb 100644 --- a/src/widgets/widgets/qlcdnumber.cpp +++ b/src/widgets/widgets/qlcdnumber.cpp @@ -397,18 +397,6 @@ QLCDNumber::~QLCDNumber() } -/*! - \deprecated - \property QLCDNumber::numDigits - \brief the current number of digits displayed - \sa digitCount -*/ - -void QLCDNumber::setNumDigits(int numDigits) -{ - setDigitCount(numDigits); -} - /*! \since 4.6 \property QLCDNumber::digitCount @@ -476,12 +464,6 @@ void QLCDNumber::setDigitCount(int numDigits) } } -int QLCDNumber::numDigits() const -{ - Q_D(const QLCDNumber); - return d->ndigits; -} - /*! Returns the current number of digits. */ diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h index 71cdc34325..585c965282 100644 --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -58,7 +58,7 @@ class Q_WIDGETS_EXPORT QLCDNumber : public QFrame // LCD number widget Q_OBJECT Q_ENUMS(Mode SegmentStyle) Q_PROPERTY(bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint) - Q_PROPERTY(int numDigits READ numDigits WRITE setNumDigits) + Q_PROPERTY(int numDigits READ digitCount WRITE setDigitCount) Q_PROPERTY(int digitCount READ digitCount WRITE setDigitCount) Q_PROPERTY(Mode mode READ mode WRITE setMode) Q_PROPERTY(SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle) @@ -78,10 +78,6 @@ public: }; bool smallDecimalPoint() const; -#ifdef QT_DEPRECATED - QT_DEPRECATED int numDigits() const; - QT_DEPRECATED void setNumDigits(int nDigits); -#endif int digitCount() const; void setDigitCount(int nDigits); -- cgit v1.2.3