feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core/Utils: Use {} instead of nullptr for flags

Browse Source 
Deprecated in current 5.15

Change-Id: I4222c67f2da3919e3476178f52dae909327431d4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2020-01-17 12:16:38 +01:00
parent 7021b1f078
commit 7992f7f538
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/wizard.h
View File

@@ -43,7 +43,7 @@ class QTCREATOR_UTILS_EXPORT Wizard : public QWizard
Q_PROPERTY(bool automaticProgressCreationEnabled READ isAutomaticProgressCreationEnabled WRITE setAutomaticProgressCreationEnabled) Q_PROPERTY(bool automaticProgressCreationEnabled READ isAutomaticProgressCreationEnabled WRITE setAutomaticProgressCreationEnabled)
public: public:
explicit Wizard(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr); explicit Wizard(QWidget *parent = nullptr, Qt::WindowFlags flags = {});
~Wizard() override; ~Wizard() override;
bool isAutomaticProgressCreationEnabled() const; bool isAutomaticProgressCreationEnabled() const;

2
src/plugins/clangrefactoring/qtcreatorclangqueryfindfilter.h
View File

@@ -40,7 +40,7 @@ public:
SearchInterface &m_searchInterface, SearchInterface &m_searchInterface,
RefactoringClient &m_refactoringClient); RefactoringClient &m_refactoringClient);
void findAll(const QString &queryText, Core::FindFlags findFlags = nullptr) override; void findAll(const QString &queryText, Core::FindFlags findFlags = {}) override;
void handleQueryOrExampleTextChanged(); void handleQueryOrExampleTextChanged();

2
src/plugins/clearcase/clearcaseplugin.h
View File

@@ -88,7 +88,7 @@ public:
QFile::Permissions permissions; QFile::Permissions permissions;
FileStatus(Status _status = Unknown, QFile::Permissions perm = nullptr) FileStatus(Status _status = Unknown, QFile::Permissions perm = {})
: status(_status), permissions(perm) : status(_status), permissions(perm)
{ } { }
}; };

2
src/plugins/coreplugin/editormanager/editormanager_p.h
View File

@@ -94,7 +94,7 @@ public:
static IEditor *activateEditor(EditorView *view, IEditor *editor, static IEditor *activateEditor(EditorView *view, IEditor *editor,
EditorManager::OpenEditorFlags flags = EditorManager::NoFlags); EditorManager::OpenEditorFlags flags = EditorManager::NoFlags);
static IEditor *activateEditorForDocument(EditorView *view, IDocument *document, static IEditor *activateEditorForDocument(EditorView *view, IDocument *document,
EditorManager::OpenEditorFlags flags = nullptr); EditorManager::OpenEditorFlags flags = {});
static bool activateEditorForEntry(EditorView *view, DocumentModel::Entry *entry, static bool activateEditorForEntry(EditorView *view, DocumentModel::Entry *entry,
EditorManager::OpenEditorFlags flags = EditorManager::NoFlags); EditorManager::OpenEditorFlags flags = EditorManager::NoFlags);
/* closes the document if there is no other editor on the document visible */ /* closes the document if there is no other editor on the document visible */

2
src/plugins/coreplugin/iversioncontrol.h
View File

@@ -160,7 +160,7 @@ public:
* Returns settings. * 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 * Called after a file has been added to a project If the version control

4
src/plugins/coreplugin/progressmanager/progressmanager.h
View File

@@ -52,9 +52,9 @@ public:
static ProgressManager *instance(); static ProgressManager *instance();
static FutureProgress *addTask(const QFuture<void> &future, const QString &title, 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, 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); static void setApplicationLabel(const QString &text);
public slots: public slots:

2
src/plugins/texteditor/texteditor.h
View File

@@ -592,7 +592,7 @@ signals:
void tooltipOverrideRequested(TextEditor::TextEditorWidget *widget, void tooltipOverrideRequested(TextEditor::TextEditorWidget *widget,
const QPoint &globalPos, int position, bool *handled); const QPoint &globalPos, int position, bool *handled);
void tooltipRequested(const QPoint &globalPos, int position); void tooltipRequested(const QPoint &globalPos, int position);
void activateEditor(Core::EditorManager::OpenEditorFlags flags = nullptr); void activateEditor(Core::EditorManager::OpenEditorFlags flags = {});
protected: protected:
virtual void slotCursorPositionChanged(); // Used in VcsBase virtual void slotCursorPositionChanged(); // Used in VcsBase