From 1aaed259e046b00ee10f7b68d94970ab44192fdc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 16 Jul 2015 14:29:42 +0200 Subject: [PATCH] QFileSystemModel: add a symbolic constant for the number of columns There are other literal 4's used in the implementation, so disambiguate. Change-Id: I5b0e4ac0018f9d5734e3de8b4f75259e175b23d3 Reviewed-by: David Faure --- src/widgets/dialogs/qfilesystemmodel.cpp | 2 +- src/widgets/dialogs/qfilesystemmodel_p.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp index 3d767971a42..05bacdbd63f 100644 --- a/src/widgets/dialogs/qfilesystemmodel.cpp +++ b/src/widgets/dialogs/qfilesystemmodel.cpp @@ -643,7 +643,7 @@ int QFileSystemModel::rowCount(const QModelIndex &parent) const */ int QFileSystemModel::columnCount(const QModelIndex &parent) const { - return (parent.column() > 0) ? 0 : 4; + return (parent.column() > 0) ? 0 : QFileSystemModelPrivate::NumColumns; } /*! diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h index f7490805484..9e9e894e3a2 100644 --- a/src/widgets/dialogs/qfilesystemmodel_p.h +++ b/src/widgets/dialogs/qfilesystemmodel_p.h @@ -70,6 +70,8 @@ class Q_AUTOTEST_EXPORT QFileSystemModelPrivate : public QAbstractItemModelPriva Q_DECLARE_PUBLIC(QFileSystemModel) public: + enum { NumColumns = 4 }; + class QFileSystemNode { public: