[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kitemmodels] /: Use explicit flags constructor instead of confusing nullptr
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2017-05-31 23:20:25
Message-ID: E1dGCuf-0001ik-TL () code ! kde ! org
[Download RAW message or body]
Git commit 020c17895874305fee85bab7001ba7ba1a0daa4b by Friedrich W. H. Kossebau.
Committed on 31/05/2017 at 23:20.
Pushed by kossebau into branch 'master'.
Use explicit flags constructor instead of confusing nullptr
The constructor of QFlags which was intended to handle literal "0"
as commonly used indicator of no-flags-set has been done with a
trick based on pointer types. Which these days of nullptr existing and
compilers pushing to use that sadly fired back and, instead of
allowing convenient code with commonly understood literal "0" values,
resulted in quite some code using "nullptr" to indicate a QFLags-based
type value with no flags set, which can be puzzling for humans
reading the code.
M +1 -1 autotests/proxymodeltestsuite/dynamictreewidget.h
M +1 -1 tests/proxymodeltestapp/breadcrumbdirectionwidget.h
M +2 -2 tests/proxymodeltestapp/breadcrumbnavigationwidget.h
M +1 -1 tests/proxymodeltestapp/breadcrumbswidget.h
M +1 -1 tests/proxymodeltestapp/checkablewidget.h
M +1 -1 tests/proxymodeltestapp/kidentityproxymodelwidget.h
M +1 -1 tests/proxymodeltestapp/lessthanwidget.h
M +1 -1 tests/proxymodeltestapp/matchcheckingwidget.h
M +1 -1 tests/proxymodeltestapp/modelcommanderwidget.h
M +1 -1 tests/proxymodeltestapp/proxyitemselectionwidget.h
M +1 -1 tests/proxymodeltestapp/proxymodeltestwidget.h
M +1 -1 tests/proxymodeltestapp/scriptablereparentingwidget.h
M +1 -1 tests/proxymodeltestapp/statesaverwidget.h
https://commits.kde.org/kitemmodels/020c17895874305fee85bab7001ba7ba1a0daa4b
diff --git a/autotests/proxymodeltestsuite/dynamictreewidget.h \
b/autotests/proxymodeltestsuite/dynamictreewidget.h index 8b36fc8..f3e6e55 100644
--- a/autotests/proxymodeltestsuite/dynamictreewidget.h
+++ b/autotests/proxymodeltestsuite/dynamictreewidget.h
@@ -37,7 +37,7 @@ class PROXYMODELTESTSUITE_EXPORT DynamicTreeWidget : public QWidget
{
Q_OBJECT
public:
- DynamicTreeWidget(DynamicTreeModel *rootModel, QWidget *parent = nullptr, \
Qt::WindowFlags f = nullptr); + DynamicTreeWidget(DynamicTreeModel *rootModel, \
QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
void setInitialTree(const QString &treeString);
diff --git a/tests/proxymodeltestapp/breadcrumbdirectionwidget.h \
b/tests/proxymodeltestapp/breadcrumbdirectionwidget.h index b0ad102..75a9a8c 100644
--- a/tests/proxymodeltestapp/breadcrumbdirectionwidget.h
+++ b/tests/proxymodeltestapp/breadcrumbdirectionwidget.h
@@ -28,7 +28,7 @@ class BreadcrumbDirectionWidget : public QWidget
{
Q_OBJECT
public:
- BreadcrumbDirectionWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
nullptr); + BreadcrumbDirectionWidget(QWidget *parent = nullptr, Qt::WindowFlags f \
= Qt::WindowFlags());
protected:
bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE;
diff --git a/tests/proxymodeltestapp/breadcrumbnavigationwidget.h \
b/tests/proxymodeltestapp/breadcrumbnavigationwidget.h index aadf397..99d80ef 100644
--- a/tests/proxymodeltestapp/breadcrumbnavigationwidget.h
+++ b/tests/proxymodeltestapp/breadcrumbnavigationwidget.h
@@ -34,7 +34,7 @@ class CurrentItemLabel : public QLabel
{
Q_OBJECT
public:
- CurrentItemLabel(QAbstractItemModel *model, QWidget *parent = nullptr, \
Qt::WindowFlags f = nullptr); + CurrentItemLabel(QAbstractItemModel *model, \
QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
private Q_SLOTS:
void rowsInserted(const QModelIndex &parent, int start, int end);
@@ -112,7 +112,7 @@ class BreadcrumbNavigationWidget : public QWidget
{
Q_OBJECT
public:
- BreadcrumbNavigationWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
nullptr); + BreadcrumbNavigationWidget(QWidget *parent = nullptr, Qt::WindowFlags \
f = Qt::WindowFlags());
};
diff --git a/tests/proxymodeltestapp/breadcrumbswidget.h \
b/tests/proxymodeltestapp/breadcrumbswidget.h index 287b806..13dff07 100644
--- a/tests/proxymodeltestapp/breadcrumbswidget.h
+++ b/tests/proxymodeltestapp/breadcrumbswidget.h
@@ -48,7 +48,7 @@ class BreadcrumbsWidget : public QWidget
{
Q_OBJECT
public:
- BreadcrumbsWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ BreadcrumbsWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
Qt::WindowFlags());
};
diff --git a/tests/proxymodeltestapp/checkablewidget.h \
b/tests/proxymodeltestapp/checkablewidget.h index ba9148c..cd6707a 100644
--- a/tests/proxymodeltestapp/checkablewidget.h
+++ b/tests/proxymodeltestapp/checkablewidget.h
@@ -28,7 +28,7 @@ class CheckableWidget : public QWidget
{
Q_OBJECT
public:
- CheckableWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ CheckableWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
Qt::WindowFlags());
};
diff --git a/tests/proxymodeltestapp/kidentityproxymodelwidget.h \
b/tests/proxymodeltestapp/kidentityproxymodelwidget.h index fdd66aa..03aa376 100644
--- a/tests/proxymodeltestapp/kidentityproxymodelwidget.h
+++ b/tests/proxymodeltestapp/kidentityproxymodelwidget.h
@@ -28,7 +28,7 @@ class KIdentityProxyModelWidget : public QWidget
{
Q_OBJECT
public:
- KIdentityProxyModelWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
nullptr); + KIdentityProxyModelWidget(QWidget *parent = nullptr, Qt::WindowFlags f \
= Qt::WindowFlags()); };
#endif
diff --git a/tests/proxymodeltestapp/lessthanwidget.h \
b/tests/proxymodeltestapp/lessthanwidget.h index 3fe21c5..abd979a 100644
--- a/tests/proxymodeltestapp/lessthanwidget.h
+++ b/tests/proxymodeltestapp/lessthanwidget.h
@@ -50,7 +50,7 @@ class LessThanWidget : public QWidget
{
Q_OBJECT
public:
- LessThanWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ LessThanWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
Qt::WindowFlags());
void insertGrid(QList<int> address);
private:
diff --git a/tests/proxymodeltestapp/matchcheckingwidget.h \
b/tests/proxymodeltestapp/matchcheckingwidget.h index 98b9035..3fde6fd 100644
--- a/tests/proxymodeltestapp/matchcheckingwidget.h
+++ b/tests/proxymodeltestapp/matchcheckingwidget.h
@@ -32,7 +32,7 @@ class MatchCheckingWidget : public QWidget
{
Q_OBJECT
public:
- MatchCheckingWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ MatchCheckingWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
Qt::WindowFlags());
private Q_SLOTS:
void matchChanged(const QString &matchData);
diff --git a/tests/proxymodeltestapp/modelcommanderwidget.h \
b/tests/proxymodeltestapp/modelcommanderwidget.h index 1319a85..0228587 100644
--- a/tests/proxymodeltestapp/modelcommanderwidget.h
+++ b/tests/proxymodeltestapp/modelcommanderwidget.h
@@ -33,7 +33,7 @@ class ModelCommanderWidget : public QWidget
{
Q_OBJECT
public:
- ModelCommanderWidget(DynamicTreeModel *dynamicTreeModel, QWidget *parent = \
nullptr, Qt::WindowFlags f = nullptr); + ModelCommanderWidget(DynamicTreeModel \
*dynamicTreeModel, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); \
private Q_SLOTS:
void initTest(QTreeWidgetItem *item);
diff --git a/tests/proxymodeltestapp/proxyitemselectionwidget.h \
b/tests/proxymodeltestapp/proxyitemselectionwidget.h index 7fb951c..e961898 100644
--- a/tests/proxymodeltestapp/proxyitemselectionwidget.h
+++ b/tests/proxymodeltestapp/proxyitemselectionwidget.h
@@ -28,7 +28,7 @@ class ProxyItemSelectionWidget : public QWidget
{
Q_OBJECT
public:
- ProxyItemSelectionWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
nullptr); + ProxyItemSelectionWidget(QWidget *parent = nullptr, Qt::WindowFlags f \
= Qt::WindowFlags());
};
diff --git a/tests/proxymodeltestapp/proxymodeltestwidget.h \
b/tests/proxymodeltestapp/proxymodeltestwidget.h index 59e9e0d..207b24d 100644
--- a/tests/proxymodeltestapp/proxymodeltestwidget.h
+++ b/tests/proxymodeltestapp/proxymodeltestwidget.h
@@ -32,7 +32,7 @@ class ProxyModelTestWidget : public QWidget
{
Q_OBJECT
public:
- explicit ProxyModelTestWidget(QWidget *parent = nullptr, Qt::WindowFlags f = \
nullptr); + explicit ProxyModelTestWidget(QWidget *parent = nullptr, \
Qt::WindowFlags f = Qt::WindowFlags());
private:
DynamicTreeModel *m_rootModel;
diff --git a/tests/proxymodeltestapp/scriptablereparentingwidget.h \
b/tests/proxymodeltestapp/scriptablereparentingwidget.h index 6c61ed8..a35ce39 100644
--- a/tests/proxymodeltestapp/scriptablereparentingwidget.h
+++ b/tests/proxymodeltestapp/scriptablereparentingwidget.h
@@ -49,7 +49,7 @@ class ScriptableReparentingWidget : public QWidget
{
Q_OBJECT
public:
- ScriptableReparentingWidget(QAbstractItemModel *rootModel, QWidget *parent = \
nullptr, Qt::WindowFlags f = nullptr); + \
ScriptableReparentingWidget(QAbstractItemModel *rootModel, QWidget *parent = nullptr, \
Qt::WindowFlags f = Qt::WindowFlags());
private Q_SLOTS:
void textChanged();
diff --git a/tests/proxymodeltestapp/statesaverwidget.h \
b/tests/proxymodeltestapp/statesaverwidget.h index 940b163..7c068ce 100644
--- a/tests/proxymodeltestapp/statesaverwidget.h
+++ b/tests/proxymodeltestapp/statesaverwidget.h
@@ -45,7 +45,7 @@ class StateSaverWidget : public QWidget
{
Q_OBJECT
public:
- StateSaverWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ StateSaverWidget(QWidget *parent = 0, Qt::WindowFlags f = Qt::WindowFlags());
~StateSaverWidget();
private Q_SLOTS:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic