FolderListModel: count property has countChanged notifier
authorShawn Rutledge <shawn.rutledge@digia.com>
Mon, 12 Aug 2013 16:35:37 +0000 (18:35 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 20 Aug 2013 07:29:23 +0000 (09:29 +0200)
rowCountChanged is kept for compatibility but is inconsistent with
the usual naming convention.

Change-Id: I8ae72e4783c5edbbcc63319c266ac47e8f3fc5ad
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
src/imports/folderlistmodel/qquickfolderlistmodel.cpp
src/imports/folderlistmodel/qquickfolderlistmodel.h

index bb65ddb..032c32a 100644 (file)
@@ -100,6 +100,7 @@ void QQuickFolderListModelPrivate::init()
                q, SLOT(_q_directoryUpdated(QString, QList<FileProperty>, int, int)));
     q->connect(&fileInfoThread, SIGNAL(sortFinished(QList<FileProperty>)),
                q, SLOT(_q_sortFinished(QList<FileProperty>)));
+    q->connect(q, SIGNAL(rowCountChanged()), q, SIGNAL(countChanged()));
 }
 
 
index 68541f1..3bf9a21 100644 (file)
@@ -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]