diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index 6d0dd660aff..3797a038878 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -67,8 +67,7 @@ namespace Internal { // -------------------------------------------------------------------------- SysRootInformationConfigWidget::SysRootInformationConfigWidget(Kit *k, const KitInformation *ki) : - KitConfigWidget(k, ki), - m_ignoreChange(false) + KitConfigWidget(k, ki) { m_chooser = new Utils::PathChooser; m_chooser->setExpectedKind(Utils::PathChooser::ExistingDirectory); @@ -127,9 +126,7 @@ void SysRootInformationConfigWidget::pathWasChanged() // -------------------------------------------------------------------------- ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Kit *k, const KitInformation *ki) : - KitConfigWidget(k, ki), - m_ignoreChanges(false), - m_isReadOnly(false) + KitConfigWidget(k, ki) { m_comboBox = new QComboBox; m_comboBox->setToolTip(toolTip()); @@ -291,8 +288,6 @@ void DeviceTypeInformationConfigWidget::currentTypeChanged(int idx) DeviceInformationConfigWidget::DeviceInformationConfigWidget(Kit *workingCopy, const KitInformation *ki) : KitConfigWidget(workingCopy, ki), - m_isReadOnly(false), - m_ignoreChange(false), m_comboBox(new QComboBox), m_model(new DeviceManagerModel(DeviceManager::instance())) { @@ -382,9 +377,7 @@ void DeviceInformationConfigWidget::currentDeviceChanged() KitEnvironmentConfigWidget::KitEnvironmentConfigWidget(Kit *workingCopy, const KitInformation *ki) : KitConfigWidget(workingCopy, ki), m_summaryLabel(new QLabel), - m_manageButton(new QPushButton), - m_dialog(0), - m_editor(0) + m_manageButton(new QPushButton) { refresh(); m_manageButton->setText(tr("Change...")); diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h index d9a055be7d1..c21ef0cdb5a 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.h +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h @@ -72,12 +72,11 @@ public: QWidget *mainWidget() const; QString toolTip() const; -private slots: +private: void pathWasChanged(); -private: Utils::PathChooser *m_chooser; - bool m_ignoreChange; + bool m_ignoreChange = false; }; // -------------------------------------------------------------------------- @@ -99,17 +98,16 @@ public: QWidget *buttonWidget() const; QString toolTip() const; -private slots: +private: void manageToolChains(); void currentToolChainChanged(int idx); -private: int indexOf(const ToolChain *tc); QComboBox *m_comboBox; QPushButton *m_manageButton; - bool m_ignoreChanges; - bool m_isReadOnly; + bool m_ignoreChanges = false; + bool m_isReadOnly = false; }; // -------------------------------------------------------------------------- @@ -130,10 +128,9 @@ public: void refresh(); void makeReadOnly(); -private slots: +private: void currentTypeChanged(int idx); -private: QComboBox *m_comboBox; }; @@ -156,15 +153,14 @@ public: void refresh(); void makeReadOnly(); -private slots: +private: void manageDevices(); void modelAboutToReset(); void modelReset(); void currentDeviceChanged(); -private: - bool m_isReadOnly; - bool m_ignoreChange; + bool m_isReadOnly = false; + bool m_ignoreChange = false; QComboBox *m_comboBox; QPushButton *m_manageButton; DeviceManagerModel *m_model; @@ -185,18 +181,17 @@ public: void refresh(); void makeReadOnly(); -private slots: +private: void editEnvironmentChanges(); void applyChanges(); void closeChangesDialog(); void acceptChangesDialog(); -private: QLabel *m_summaryLabel; QPushButton *m_manageButton; - QDialog *m_dialog; - QPlainTextEdit *m_editor; + QDialog *m_dialog = 0; + QPlainTextEdit *m_editor = 0; }; } // namespace Internal