From c69fc9e9e070c151d636a501450976be15cf0bac Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 12 Aug 2013 18:35:37 +0200 Subject: [PATCH] FolderListModel: count property has countChanged notifier rowCountChanged is kept for compatibility but is inconsistent with the usual naming convention. Change-Id: I8ae72e4783c5edbbcc63319c266ac47e8f3fc5ad Reviewed-by: Alan Alpert --- src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 1 + src/imports/folderlistmodel/qquickfolderlistmodel.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index bb65ddb..032c32a 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -100,6 +100,7 @@ void QQuickFolderListModelPrivate::init() q, SLOT(_q_directoryUpdated(QString, QList, int, int))); q->connect(&fileInfoThread, SIGNAL(sortFinished(QList)), q, SLOT(_q_sortFinished(QList))); + q->connect(q, SIGNAL(rowCountChanged()), q, SIGNAL(countChanged())); } diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h index 68541f1..3bf9a21 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.h +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h @@ -74,7 +74,7 @@ class QQuickFolderListModel : public QAbstractListModel, public QQmlParserStatus Q_PROPERTY(bool showDirsFirst READ showDirsFirst WRITE setShowDirsFirst) Q_PROPERTY(bool showDotAndDotDot READ showDotAndDotDot WRITE setShowDotAndDotDot) Q_PROPERTY(bool showOnlyReadable READ showOnlyReadable WRITE setShowOnlyReadable) - Q_PROPERTY(int count READ count NOTIFY rowCountChanged) + Q_PROPERTY(int count READ count NOTIFY countChanged) //![class props] //![abslistmodel] @@ -149,6 +149,7 @@ public: Q_SIGNALS: void folderChanged(); void rowCountChanged() const; + void countChanged() const; //![notifier] //![class end] -- 2.7.4