Fix compilation of public headers with -Werror=shadow
Change-Id: Id47623002abca1e03fdfb9e9bd9cbc1b5542a2db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
f865dc1ae4
commit
22225b1b06
@ -308,9 +308,9 @@ protected:
|
||||
QModelIndexList persistentIndexList() const;
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5,0)
|
||||
QT_DEPRECATED void setRoleNames(const QHash<int,QByteArray> &roleNames)
|
||||
QT_DEPRECATED void setRoleNames(const QHash<int,QByteArray> &theRoleNames)
|
||||
{
|
||||
doSetRoleNames(roleNames);
|
||||
doSetRoleNames(theRoleNames);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -70,7 +70,7 @@ public:
|
||||
void setInterval(int msec);
|
||||
int interval() const { return inter; }
|
||||
|
||||
void setTimerType(Qt::TimerType type) { this->type = type; }
|
||||
void setTimerType(Qt::TimerType atype) { this->type = atype; }
|
||||
Qt::TimerType timerType() const { return Qt::TimerType(type); }
|
||||
|
||||
inline void setSingleShot(bool singleShot);
|
||||
|
Loading…
Reference in New Issue
Block a user