diff options
| author | Nicolas Fella <nicolas.fella@gmx.de> | 2020-10-09 23:56:45 +0300 |
|---|---|---|
| committer | Kevin Ottens (Rebase PR Action) <er-vin@users.noreply.github.com> | 2020-10-12 14:52:53 +0300 |
| commit | 6f17bbe6d59b96b90c050fe9878fbcb1becd77ac (patch) | |
| tree | 687082e75e858c1d6a1ef1abac24ef935763794b | |
| parent | 142894b2f7d052387c01b2dbbc29a0c259ad573b (diff) | |
Don't use nullptr for QFlags
This fixes some deprecation warnings
Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
| -rw-r--r-- | src/gui/folderstatusmodel.cpp | 4 | ||||
| -rw-r--r-- | src/gui/owncloudgui.cpp | 2 | ||||
| -rw-r--r-- | src/gui/selectivesyncdialog.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 92e6b93e7..48197f0b7 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -102,7 +102,7 @@ void FolderStatusModel::setAccountState(const AccountState *accountState) Qt::ItemFlags FolderStatusModel::flags(const QModelIndex &index) const { if (!_accountState) { - return nullptr; + return {}; } switch (classify(index)) { case AddButton: { @@ -120,7 +120,7 @@ Qt::ItemFlags FolderStatusModel::flags(const QModelIndex &index) const case SubFolder: return Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable; } - return nullptr; + return {}; } QVariant FolderStatusModel::data(const QModelIndex &index, int role) const diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 16eed86f6..f328cb79d 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -683,7 +683,7 @@ void ownCloudGui::slotShowShareDialog(const QString &sharePath, const QString &l | SharePermissionUpdate | SharePermissionCreate | SharePermissionDelete | SharePermissionShare; if (!resharingAllowed) { - maxSharingPermissions = nullptr; + maxSharingPermissions = {}; } diff --git a/src/gui/selectivesyncdialog.h b/src/gui/selectivesyncdialog.h index 3426ec550..7480f8986 100644 --- a/src/gui/selectivesyncdialog.h +++ b/src/gui/selectivesyncdialog.h @@ -89,10 +89,10 @@ class SelectiveSyncDialog : public QDialog Q_OBJECT public: // Dialog for a specific folder (used from the account settings button) - explicit SelectiveSyncDialog(AccountPtr account, Folder *folder, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); + explicit SelectiveSyncDialog(AccountPtr account, Folder *folder, QWidget *parent = nullptr, Qt::WindowFlags f = {}); // Dialog for the whole account (Used from the wizard) - explicit SelectiveSyncDialog(AccountPtr account, const QString &folder, const QStringList &blacklist, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); + explicit SelectiveSyncDialog(AccountPtr account, const QString &folder, const QStringList &blacklist, QWidget *parent = nullptr, Qt::WindowFlags f = {}); void accept() override; |