summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-01-31 14:20:00 +0100
committerhjk <hjk@qt.io>2020-01-31 13:26:07 +0000
commitd5c720379e4781d1a7f959f17548b77775115750 (patch)
tree4286b6fd619b9bf5fbb67502e0da83a7e7138ee0
parenta565e05fb047fbdaaeadbfecc5ffbbfefe80d2f2 (diff)
Use default constructed QFlags
Recent Qt versions complain about the nullptr constructor. Change-Id: I4c670c3f6e4c3e7080305f5b0dd4639f070af66e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rw-r--r--plugins/fossil/branchinfo.h2
-rw-r--r--plugins/fossil/fossilclient.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/fossil/branchinfo.h b/plugins/fossil/branchinfo.h
index ff1a1e5..034280b 100644
--- a/plugins/fossil/branchinfo.h
+++ b/plugins/fossil/branchinfo.h
@@ -40,7 +40,7 @@ public:
};
Q_DECLARE_FLAGS(BranchFlags, BranchFlag)
- explicit BranchInfo(const QString &name = QString(), BranchFlags flags = 0);
+ explicit BranchInfo(const QString &name = QString(), BranchFlags flags = {});
public:
const QString &name() const;
diff --git a/plugins/fossil/fossilclient.h b/plugins/fossil/fossilclient.h
index fa0da98..7c9fba0 100644
--- a/plugins/fossil/fossilclient.h
+++ b/plugins/fossil/fossilclient.h
@@ -115,7 +115,7 @@ public:
const QStringList &extraOptions = QStringList()) final;
private:
- static QList<BranchInfo> branchListFromOutput(const QString &output, const BranchInfo::BranchFlags defaultFlags = 0);
+ static QList<BranchInfo> branchListFromOutput(const QString &output, const BranchInfo::BranchFlags defaultFlags = {});
static QStringList parseRevisionCommentLine(const QString &commentLine);
QString sanitizeFossilOutput(const QString &output) const;