aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/folderlistmodel/qquickfolderlistmodel.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-10-19 14:20:33 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2018-10-19 12:35:44 +0000
commit6734ee9a6ddb6a3870556514a70d904836258559 (patch)
treea4b5f7a8e880cd6b6f7aa1dfea81521a3c4d1e86 /src/imports/folderlistmodel/qquickfolderlistmodel.h
parent4d8cdc7d69594602246807097b92f72b42f4f6e9 (diff)
FolderListModel: use header initialization; fix pedantic warningsv5.12.0-beta3
That is, initialize variables in the private class where they are defined, and move the padding warning out of that section (now it says the whole class is padded to the alignment boundary, but there's not much we can do about that). Change-Id: I63101b6a837c69265c73b4c6001f1901fcaa8572 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/imports/folderlistmodel/qquickfolderlistmodel.h')
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h
index cc03ff441b..d93e7daf3f 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.h
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h
@@ -81,7 +81,7 @@ class QQuickFolderListModel : public QAbstractListModel, public QQmlParserStatus
//![abslistmodel]
public:
- QQuickFolderListModel(QObject *parent = 0);
+ QQuickFolderListModel(QObject *parent = nullptr);
~QQuickFolderListModel();
enum Roles {