1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDateTimeEditPrivate: make clear which overrides are for which base.

Browse Source 
The class does multiple inheritance and over-rides virtuals from both
bases; it also declared the over-rides virtual rather than declaring
them to be over-rides; so deploy Q_DECL_OVERRIDE and, while changing
those lines, move them all together and document which belong to which
base.

Change-Id: Ica3958d6d24124a537983e7e94fce642284f1f24
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Edward Welbourne 2016-04-06 17:53:58 +02:00
parent fd5720af2c
commit 2996560bf8
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/widgets/widgets/qdatetimeedit_p.h
View File

@ -75,14 +75,25 @@ public:
void emitSignals(EmitPolicy ep, const QVariant &old); void emitSignals(EmitPolicy ep, const QVariant &old);
QString textFromValue(const QVariant &f) const; QString textFromValue(const QVariant &f) const;
QVariant valueFromText(const QString &f) const; QVariant valueFromText(const QString &f) const;
virtual void _q_editorCursorPositionChanged(int oldpos, int newpos);
virtual void interpret(EmitPolicy ep);
virtual void clearCache() const;
QDateTime validateAndInterpret(QString &input, int &, QValidator::State &state, QDateTime validateAndInterpret(QString &input, int &, QValidator::State &state,
bool fixup = false) const; bool fixup = false) const;
void clearSection(int index); void clearSection(int index);
virtual QString displayText() const { return edit->text(); } // this is from QDateTimeParser
// Override QAbstractSpinBoxPrivate:
void _q_editorCursorPositionChanged(int oldpos, int newpos) Q_DECL_OVERRIDE;
void interpret(EmitPolicy ep) Q_DECL_OVERRIDE;
void clearCache() const Q_DECL_OVERRIDE;
QStyle::SubControl newHoverControl(const QPoint &pos) Q_DECL_OVERRIDE;
void updateEditFieldGeometry() Q_DECL_OVERRIDE;
QVariant getZeroVariant() const Q_DECL_OVERRIDE;
void setRange(const QVariant &min, const QVariant &max) Q_DECL_OVERRIDE;
// Override QDateTimePraser:
QString displayText() const Q_DECL_OVERRIDE { return edit->text(); }
QDateTime getMinimum() const Q_DECL_OVERRIDE { return minimum.toDateTime(); }
QDateTime getMaximum() const Q_DECL_OVERRIDE { return maximum.toDateTime(); }
QLocale locale() const Q_DECL_OVERRIDE { return q_func()->locale(); }
int absoluteIndex(QDateTimeEdit::Section s, int index) const; int absoluteIndex(QDateTimeEdit::Section s, int index) const;
int absoluteIndex(const SectionNode &s) const; int absoluteIndex(const SectionNode &s) const;
@ -96,18 +107,10 @@ public:
void updateCache(const QVariant &val, const QString &str) const; void updateCache(const QVariant &val, const QString &str) const;
void updateTimeSpec(); void updateTimeSpec();
virtual QDateTime getMinimum() const { return minimum.toDateTime(); }
virtual QDateTime getMaximum() const { return maximum.toDateTime(); }
virtual QLocale locale() const { return q_func()->locale(); }
QString valueToText(const QVariant &var) const { return textFromValue(var); } QString valueToText(const QVariant &var) const { return textFromValue(var); }
QString getAmPmText(AmPm ap, Case cs) const; QString getAmPmText(AmPm ap, Case cs) const;
int cursorPosition() const { return edit ? edit->cursorPosition() : -1; } int cursorPosition() const { return edit ? edit->cursorPosition() : -1; }
virtual QStyle::SubControl newHoverControl(const QPoint &pos);
virtual void updateEditFieldGeometry();
virtual QVariant getZeroVariant() const;
virtual void setRange(const QVariant &min, const QVariant &max);
void _q_resetButton(); void _q_resetButton();
void updateArrow(QStyle::StateFlag state); void updateArrow(QStyle::StateFlag state);
bool calendarPopupEnabled() const; bool calendarPopupEnabled() const;