diff options
author | hjk <hjk@qt.io> | 2020-01-17 12:16:38 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-01-17 14:31:29 +0000 |
commit | 7992f7f5380b8631e66883e54d2238ee83d241e8 (patch) | |
tree | bede601a5d441d8f69cadce6502b5c6d840db9fe /src | |
parent | 7021b1f078cc9d10ea943b6fbca85b679b3376a0 (diff) | |
download | qt-creator-7992f7f5380b8631e66883e54d2238ee83d241e8.tar.gz |
Core/Utils: Use {} instead of nullptr for flags
Deprecated in current 5.15
Change-Id: I4222c67f2da3919e3476178f52dae909327431d4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/utils/wizard.h | 2 | ||||
-rw-r--r-- | src/plugins/clangrefactoring/qtcreatorclangqueryfindfilter.h | 2 | ||||
-rw-r--r-- | src/plugins/clearcase/clearcaseplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/editormanager/editormanager_p.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/iversioncontrol.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/progressmanager/progressmanager.h | 4 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h index 6075527113..5f776f71e8 100644 --- a/src/libs/utils/wizard.h +++ b/src/libs/utils/wizard.h @@ -43,7 +43,7 @@ class QTCREATOR_UTILS_EXPORT Wizard : public QWizard Q_PROPERTY(bool automaticProgressCreationEnabled READ isAutomaticProgressCreationEnabled WRITE setAutomaticProgressCreationEnabled) public: - explicit Wizard(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr); + explicit Wizard(QWidget *parent = nullptr, Qt::WindowFlags flags = {}); ~Wizard() override; bool isAutomaticProgressCreationEnabled() const; diff --git a/src/plugins/clangrefactoring/qtcreatorclangqueryfindfilter.h b/src/plugins/clangrefactoring/qtcreatorclangqueryfindfilter.h index 23825c6228..448de0139c 100644 --- a/src/plugins/clangrefactoring/qtcreatorclangqueryfindfilter.h +++ b/src/plugins/clangrefactoring/qtcreatorclangqueryfindfilter.h @@ -40,7 +40,7 @@ public: SearchInterface &m_searchInterface, RefactoringClient &m_refactoringClient); - void findAll(const QString &queryText, Core::FindFlags findFlags = nullptr) override; + void findAll(const QString &queryText, Core::FindFlags findFlags = {}) override; void handleQueryOrExampleTextChanged(); diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h index 5c9fdaaf0f..3050299237 100644 --- a/src/plugins/clearcase/clearcaseplugin.h +++ b/src/plugins/clearcase/clearcaseplugin.h @@ -88,7 +88,7 @@ public: QFile::Permissions permissions; - FileStatus(Status _status = Unknown, QFile::Permissions perm = nullptr) + FileStatus(Status _status = Unknown, QFile::Permissions perm = {}) : status(_status), permissions(perm) { } }; diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h index bc1179926d..3a32b4f7e4 100644 --- a/src/plugins/coreplugin/editormanager/editormanager_p.h +++ b/src/plugins/coreplugin/editormanager/editormanager_p.h @@ -94,7 +94,7 @@ public: static IEditor *activateEditor(EditorView *view, IEditor *editor, EditorManager::OpenEditorFlags flags = EditorManager::NoFlags); static IEditor *activateEditorForDocument(EditorView *view, IDocument *document, - EditorManager::OpenEditorFlags flags = nullptr); + EditorManager::OpenEditorFlags flags = {}); static bool activateEditorForEntry(EditorView *view, DocumentModel::Entry *entry, EditorManager::OpenEditorFlags flags = EditorManager::NoFlags); /* closes the document if there is no other editor on the document visible */ diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h index 794a5eee04..f244711b54 100644 --- a/src/plugins/coreplugin/iversioncontrol.h +++ b/src/plugins/coreplugin/iversioncontrol.h @@ -160,7 +160,7 @@ public: * Returns settings. */ - virtual SettingsFlags settingsFlags() const { return nullptr; } + virtual SettingsFlags settingsFlags() const { return {}; } /*! * Called after a file has been added to a project If the version control diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index d7b581ae42..5023a57b6a 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -52,9 +52,9 @@ public: static ProgressManager *instance(); static FutureProgress *addTask(const QFuture<void> &future, const QString &title, - Id type, ProgressFlags flags = nullptr); + Id type, ProgressFlags flags = {}); static FutureProgress *addTimedTask(const QFutureInterface<void> &fi, const QString &title, - Id type, int expectedSeconds, ProgressFlags flags = nullptr); + Id type, int expectedSeconds, ProgressFlags flags = {}); static void setApplicationLabel(const QString &text); public slots: diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index 9e9319cc05..8c4bf6902f 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -592,7 +592,7 @@ signals: void tooltipOverrideRequested(TextEditor::TextEditorWidget *widget, const QPoint &globalPos, int position, bool *handled); void tooltipRequested(const QPoint &globalPos, int position); - void activateEditor(Core::EditorManager::OpenEditorFlags flags = nullptr); + void activateEditor(Core::EditorManager::OpenEditorFlags flags = {}); protected: virtual void slotCursorPositionChanged(); // Used in VcsBase |