diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index dce85850a1..46dd7880ce 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -308,9 +308,9 @@ protected: QModelIndexList persistentIndexList() const; #if QT_DEPRECATED_SINCE(5,0) - QT_DEPRECATED void setRoleNames(const QHash &roleNames) + QT_DEPRECATED void setRoleNames(const QHash &theRoleNames) { - doSetRoleNames(roleNames); + doSetRoleNames(theRoleNames); } #endif diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index b1bbfa4241..6fb32f9bde 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -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);