From: Andrew den Exter Date: Thu, 21 Jun 2012 07:01:14 +0000 (+1000) Subject: Don't shadow member variable with argument. X-Git-Tag: upstream/5.2.1~1616 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ac47a3909762e62b054a951adb6b5771cc6d0eb;p=platform%2Fupstream%2Fqtdeclarative.git Don't shadow member variable with argument. Function argument is being written to itself rather than the member variable preventing the property from ever changing. Task-number: QTBUG-26158 Change-Id: Id204a193300c62feeb007a2ea9df89cba5e1d513 Reviewed-by: Alan Alpert --- diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp index 64acfbe..ee34376 100644 --- a/src/imports/folderlistmodel/fileinfothread.cpp +++ b/src/imports/folderlistmodel/fileinfothread.cpp @@ -150,10 +150,10 @@ void FileInfoThread::setShowDirs(bool showFolders) condition.wakeAll(); } -void FileInfoThread::setShowDirsFirst(bool showDirsFirst) +void FileInfoThread::setShowDirsFirst(bool show) { QMutexLocker locker(&mutex); - showDirsFirst = showDirsFirst; + showDirsFirst = show; folderUpdate = true; condition.wakeAll(); } diff --git a/src/imports/folderlistmodel/fileinfothread_p.h b/src/imports/folderlistmodel/fileinfothread_p.h index d144f52..8ff5948 100644 --- a/src/imports/folderlistmodel/fileinfothread_p.h +++ b/src/imports/folderlistmodel/fileinfothread_p.h @@ -71,7 +71,7 @@ public: void setSortFlags(QDir::SortFlags flags); void setNameFilters(const QStringList & nameFilters); void setShowDirs(bool showFolders); - void setShowDirsFirst(bool showDirsFirst); + void setShowDirsFirst(bool show); void setShowDotDot(bool on); void setShowOnlyReadable(bool on);