From cd1fd0fba9d9161192e8e7f0e151711166aea3d1 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 28 Feb 2017 14:12:05 +0100 Subject: [PATCH] Locator: Fix warning in directory filter Fix a warning about member variables being initialized in the wrong order. Change-Id: I55f5b2725fc9ac859249649dc21fbcc8fef4b0f3 Reviewed-by: hjk Reviewed-by: Eike Ziller --- src/plugins/coreplugin/locator/directoryfilter.cpp | 3 +-- src/plugins/coreplugin/locator/directoryfilter.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/coreplugin/locator/directoryfilter.cpp b/src/plugins/coreplugin/locator/directoryfilter.cpp index 2be77816f63..5fcd253dc7f 100644 --- a/src/plugins/coreplugin/locator/directoryfilter.cpp +++ b/src/plugins/coreplugin/locator/directoryfilter.cpp @@ -36,8 +36,7 @@ using namespace Core; using namespace Core::Internal; DirectoryFilter::DirectoryFilter(Id id) - : m_dialog(nullptr), - m_filters({"*.h", "*.cpp", "*.ui", "*.qrc"}), + : m_filters({"*.h", "*.cpp", "*.ui", "*.qrc"}), m_exclusionFilters({"*/.git/*", "*/.cvs/*", "*/.svn/*"}) { setId(id); diff --git a/src/plugins/coreplugin/locator/directoryfilter.h b/src/plugins/coreplugin/locator/directoryfilter.h index e9521efdb4c..9aa48a3bab7 100644 --- a/src/plugins/coreplugin/locator/directoryfilter.h +++ b/src/plugins/coreplugin/locator/directoryfilter.h @@ -59,7 +59,7 @@ private: QStringList m_exclusionFilters; // Our config dialog, uses in addDirectory and editDirectory // to give their dialogs the right parent - QDialog *m_dialog; + QDialog *m_dialog = nullptr; Ui::DirectoryFilterOptions m_ui; mutable QMutex m_lock; QStringList m_files;