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

Fix compilation of public headers with -Werror=shadow

Browse Source 
Change-Id: Id47623002abca1e03fdfb9e9bd9cbc1b5542a2db
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
David Faure 2012-01-12 18:00:42 +01:00 committed by Qt by Nokia
parent f865dc1ae4
commit 22225b1b06
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/itemmodels/qabstractitemmodel.h
View File

@ -308,9 +308,9 @@ protected:
QModelIndexList persistentIndexList() const; QModelIndexList persistentIndexList() const;
#if QT_DEPRECATED_SINCE(5,0) #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 #endif

2
src/corelib/kernel/qtimer.h
View File

@ -70,7 +70,7 @@ public:
void setInterval(int msec); void setInterval(int msec);
int interval() const { return inter; } 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); } Qt::TimerType timerType() const { return Qt::TimerType(type); }
inline void setSingleShot(bool singleShot); inline void setSingleShot(bool singleShot);