diff options
Diffstat (limited to 'src/plugins')
17 files changed, 70 insertions, 78 deletions
diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp index c2c4fb02b17..a77275ddf18 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.cpp +++ b/src/plugins/baremetal/baremetaldebugsupport.cpp @@ -159,17 +159,17 @@ void BareMetalDebugSupport::startExecution() m_state = StartingRunner; showMessage(tr("Starting GDB server...") + QLatin1Char('\n'), Debugger::LogStatus); - connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::remoteStderr, + connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::remoteStderr, this, &BareMetalDebugSupport::remoteErrorOutputMessage); - connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::remoteStdout, + connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::remoteStdout, this, &BareMetalDebugSupport::remoteOutputMessage); - connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::remoteProcessStarted, + connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::remoteProcessStarted, this, &BareMetalDebugSupport::remoteProcessStarted); - connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::finished, + connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::finished, this, &BareMetalDebugSupport::appRunnerFinished); - connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::reportProgress, + connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::reportProgress, this, &BareMetalDebugSupport::progressReport); - connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::reportError, + connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::reportError, this, &BareMetalDebugSupport::appRunnerError); const QString cmd = p->executable(); diff --git a/src/plugins/baremetal/baremetaldebugsupport.h b/src/plugins/baremetal/baremetaldebugsupport.h index 160987a077e..7edb6fa1165 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.h +++ b/src/plugins/baremetal/baremetaldebugsupport.h @@ -79,7 +79,7 @@ private: void reset(); void showMessage(const QString &msg, int channel); - QPointer<ProjectExplorer::DeviceApplicationRunner> m_appRunner; + ProjectExplorer::DeviceApplicationRunner *m_appRunner; const QPointer<Debugger::DebuggerRunControl> m_runControl; const ProjectExplorer::IDevice::ConstPtr m_device; BareMetalDebugSupport::State m_state; diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp index 11023cfecb4..ab0ca8a29c8 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp @@ -57,7 +57,7 @@ BareMetalDeviceConfigurationWidget::BareMetalDeviceConfigurationWidget( m_gdbServerProviderChooser->setCurrentProviderId(dev->gdbServerProviderId()); formLayout->addRow(tr("GDB server provider:"), m_gdbServerProviderChooser); - connect(m_gdbServerProviderChooser.data(), &GdbServerProviderChooser::providerChanged, + connect(m_gdbServerProviderChooser, &GdbServerProviderChooser::providerChanged, this, &BareMetalDeviceConfigurationWidget::gdbServerProviderChanged); } diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h index bf1643d1bd2..35f2bbd022f 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h @@ -34,8 +34,6 @@ #include <projectexplorer/devicesupport/idevicewidget.h> -#include <QPointer> - namespace BareMetal { namespace Internal { @@ -56,7 +54,7 @@ private slots: private: void updateDeviceFromUi(); - QPointer<GdbServerProviderChooser> m_gdbServerProviderChooser; + GdbServerProviderChooser *m_gdbServerProviderChooser; }; } // namespace Internal diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp index e4b34741571..b26fc95b251 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp @@ -59,7 +59,7 @@ BareMetalDeviceConfigurationWizardSetupPage::BareMetalDeviceConfigurationWizardS connect(m_nameLineEdit, SIGNAL(textChanged(QString)), SIGNAL(completeChanged())); - connect(m_gdbServerProviderChooser.data(), &GdbServerProviderChooser::providerChanged, + connect(m_gdbServerProviderChooser, &GdbServerProviderChooser::providerChanged, this, &QWizardPage::completeChanged); } diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h index d3dc0e8f0de..3e09b3445bf 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h @@ -32,8 +32,6 @@ #ifndef BAREMETALDEVICECONFIGURATIONWIZARDPAGES_H #define BAREMETALDEVICECONFIGURATIONWIZARDPAGES_H -#include <QPointer> - #include <QWizardPage> QT_BEGIN_NAMESPACE @@ -60,8 +58,8 @@ public: virtual QString defaultConfigurationName() const; private: - QPointer<QLineEdit> m_nameLineEdit; - QPointer<GdbServerProviderChooser> m_gdbServerProviderChooser; + QLineEdit *m_nameLineEdit; + GdbServerProviderChooser *m_gdbServerProviderChooser; }; } // namespace Internal diff --git a/src/plugins/baremetal/defaultgdbserverprovider.cpp b/src/plugins/baremetal/defaultgdbserverprovider.cpp index 8b1f3ef029d..0ac896e9b46 100644 --- a/src/plugins/baremetal/defaultgdbserverprovider.cpp +++ b/src/plugins/baremetal/defaultgdbserverprovider.cpp @@ -190,14 +190,14 @@ DefaultGdbServerProviderConfigWidget::DefaultGdbServerProviderConfigWidget( setFromProvider(); auto chooser = new Core::VariableChooser(this); - chooser->addSupportedWidget(m_initCommandsTextEdit.data()); - chooser->addSupportedWidget(m_resetCommandsTextEdit.data()); + chooser->addSupportedWidget(m_initCommandsTextEdit); + chooser->addSupportedWidget(m_resetCommandsTextEdit); - connect(m_hostWidget.data(), &HostWidget::dataChanged, + connect(m_hostWidget, &HostWidget::dataChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_initCommandsTextEdit.data(), &QPlainTextEdit::textChanged, + connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_resetCommandsTextEdit.data(), &QPlainTextEdit::textChanged, + connect(m_resetCommandsTextEdit, &QPlainTextEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); } diff --git a/src/plugins/baremetal/defaultgdbserverprovider.h b/src/plugins/baremetal/defaultgdbserverprovider.h index f3a13be169f..dc04c19121e 100644 --- a/src/plugins/baremetal/defaultgdbserverprovider.h +++ b/src/plugins/baremetal/defaultgdbserverprovider.h @@ -102,9 +102,9 @@ private: void setFromProvider(); - QPointer<HostWidget> m_hostWidget; - QPointer<QPlainTextEdit> m_initCommandsTextEdit; - QPointer<QPlainTextEdit> m_resetCommandsTextEdit; + HostWidget *m_hostWidget; + QPlainTextEdit *m_initCommandsTextEdit; + QPlainTextEdit *m_resetCommandsTextEdit; }; } // namespace Internal diff --git a/src/plugins/baremetal/gdbserverprovider.h b/src/plugins/baremetal/gdbserverprovider.h index 490348b2d4d..1e8f36b08bc 100644 --- a/src/plugins/baremetal/gdbserverprovider.h +++ b/src/plugins/baremetal/gdbserverprovider.h @@ -32,7 +32,6 @@ #define GDBSERVERPROVIDER_H #include <QObject> -#include <QPointer> #include <QVariantMap> #include <QWidget> @@ -170,15 +169,15 @@ protected: static QString defaultInitCommandsTooltip(); static QString defaultResetCommandsTooltip(); - QPointer<QFormLayout> m_mainLayout; - QPointer<QLineEdit> m_nameLineEdit; - QPointer<QComboBox> m_startupModeComboBox; + QFormLayout *m_mainLayout; + QLineEdit *m_nameLineEdit; + QComboBox *m_startupModeComboBox; private: void setFromProvider(); GdbServerProvider *m_provider; - QPointer<QLabel> m_errorLabel; + QLabel *m_errorLabel = 0; }; class HostWidget : public QWidget @@ -197,8 +196,8 @@ signals: void dataChanged(); private: - QPointer<QLineEdit> m_hostLineEdit; - QPointer<QSpinBox> m_portSpinBox; + QLineEdit *m_hostLineEdit; + QSpinBox *m_portSpinBox; }; } // namespace Internal diff --git a/src/plugins/baremetal/gdbserverproviderchooser.cpp b/src/plugins/baremetal/gdbserverproviderchooser.cpp index ed531b296cf..3215f0dbb6a 100644 --- a/src/plugins/baremetal/gdbserverproviderchooser.cpp +++ b/src/plugins/baremetal/gdbserverproviderchooser.cpp @@ -60,9 +60,9 @@ GdbServerProviderChooser::GdbServerProviderChooser( layout->addWidget(m_manageButton); setFocusProxy(m_manageButton); - connect(m_chooser.data(), static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + connect(m_chooser, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &GdbServerProviderChooser::currentIndexChanged); - connect(m_manageButton.data(), &QAbstractButton::clicked, + connect(m_manageButton, &QAbstractButton::clicked, this, &GdbServerProviderChooser::manageButtonClicked); connect(GdbServerProviderManager::instance(), &GdbServerProviderManager::providersChanged, this, &GdbServerProviderChooser::populate); diff --git a/src/plugins/baremetal/gdbserverproviderchooser.h b/src/plugins/baremetal/gdbserverproviderchooser.h index 284f117a3fc..85f6b4aa0f1 100644 --- a/src/plugins/baremetal/gdbserverproviderchooser.h +++ b/src/plugins/baremetal/gdbserverproviderchooser.h @@ -31,8 +31,6 @@ #ifndef GDBSERVERPROVIDERCHOOSER_H #define GDBSERVERPROVIDERCHOOSER_H -#include <QPointer> - #include <QWidget> QT_BEGIN_NAMESPACE @@ -73,8 +71,8 @@ protected: QString providerText(const GdbServerProvider *) const; private: - QPointer<QComboBox> m_chooser; - QPointer<QPushButton> m_manageButton; + QComboBox *m_chooser; + QPushButton *m_manageButton; }; } // namespace Internal diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp index 0a8eb99525f..0981abfb1d8 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp @@ -441,9 +441,10 @@ void GdbServerProvidersSettingsPage::finish() { if (m_configWidget) disconnect(GdbServerProviderManager::instance(), &GdbServerProviderManager::providersChanged, - m_configWidget.data(), &GdbServerProvidersSettingsWidget::providerSelectionChanged); + m_configWidget, &GdbServerProvidersSettingsWidget::providerSelectionChanged); - delete m_configWidget.data(); + delete m_configWidget; + m_configWidget = 0; } } // namespace Internal diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.h b/src/plugins/baremetal/gdbserverproviderssettingspage.h index bb7e5852fc4..e74508464e8 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.h +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.h @@ -35,8 +35,6 @@ #include <utils/treemodel.h> -#include <QPointer> - QT_BEGIN_NAMESPACE class QItemSelectionModel; class QPushButton; @@ -97,7 +95,7 @@ private: void apply(); void finish(); - QPointer<GdbServerProvidersSettingsWidget> m_configWidget; + GdbServerProvidersSettingsWidget *m_configWidget = 0; }; } // namespace Internal diff --git a/src/plugins/baremetal/openocdgdbserverprovider.cpp b/src/plugins/baremetal/openocdgdbserverprovider.cpp index a2c555f7053..088b070a85d 100644 --- a/src/plugins/baremetal/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/openocdgdbserverprovider.cpp @@ -291,25 +291,25 @@ OpenOcdGdbServerProviderConfigWidget::OpenOcdGdbServerProviderConfigWidget( setFromProvider(); auto chooser = new Core::VariableChooser(this); - chooser->addSupportedWidget(m_initCommandsTextEdit.data()); - chooser->addSupportedWidget(m_resetCommandsTextEdit.data()); + chooser->addSupportedWidget(m_initCommandsTextEdit); + chooser->addSupportedWidget(m_resetCommandsTextEdit); - connect(m_hostWidget.data(), &HostWidget::dataChanged, + connect(m_hostWidget, &HostWidget::dataChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_executableFileChooser.data(), &Utils::PathChooser::rawPathChanged, + connect(m_executableFileChooser, &Utils::PathChooser::rawPathChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_rootScriptsDirChooser.data(), &Utils::PathChooser::rawPathChanged, + connect(m_rootScriptsDirChooser, &Utils::PathChooser::rawPathChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_configurationFileChooser.data(), &Utils::PathChooser::rawPathChanged, + connect(m_configurationFileChooser, &Utils::PathChooser::rawPathChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_additionalArgumentsLineEdit.data(), &QLineEdit::textChanged, + connect(m_additionalArgumentsLineEdit, &QLineEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_initCommandsTextEdit.data(), &QPlainTextEdit::textChanged, + connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_resetCommandsTextEdit.data(), &QPlainTextEdit::textChanged, + connect(m_resetCommandsTextEdit, &QPlainTextEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_startupModeComboBox.data(), static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + connect(m_startupModeComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenOcdGdbServerProviderConfigWidget::startupModeChanged); } diff --git a/src/plugins/baremetal/openocdgdbserverprovider.h b/src/plugins/baremetal/openocdgdbserverprovider.h index 3239756741b..f5c63af0fa6 100644 --- a/src/plugins/baremetal/openocdgdbserverprovider.h +++ b/src/plugins/baremetal/openocdgdbserverprovider.h @@ -110,13 +110,13 @@ private: void setFromProvider(); - QPointer<HostWidget> m_hostWidget; - QPointer<Utils::PathChooser> m_executableFileChooser; - QPointer<Utils::PathChooser> m_rootScriptsDirChooser; - QPointer<Utils::PathChooser> m_configurationFileChooser; - QPointer<QLineEdit> m_additionalArgumentsLineEdit; - QPointer<QPlainTextEdit> m_initCommandsTextEdit; - QPointer<QPlainTextEdit> m_resetCommandsTextEdit; + HostWidget *m_hostWidget; + Utils::PathChooser *m_executableFileChooser; + Utils::PathChooser *m_rootScriptsDirChooser; + Utils::PathChooser *m_configurationFileChooser; + QLineEdit *m_additionalArgumentsLineEdit; + QPlainTextEdit *m_initCommandsTextEdit; + QPlainTextEdit *m_resetCommandsTextEdit; }; } // namespace Internal diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp index ccfcb366b00..ad79762e496 100644 --- a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp +++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp @@ -289,31 +289,31 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget setFromProvider(); auto chooser = new Core::VariableChooser(this); - chooser->addSupportedWidget(m_initCommandsTextEdit.data()); - chooser->addSupportedWidget(m_resetCommandsTextEdit.data()); + chooser->addSupportedWidget(m_initCommandsTextEdit); + chooser->addSupportedWidget(m_resetCommandsTextEdit); - connect(m_hostWidget.data(), &HostWidget::dataChanged, + connect(m_hostWidget, &HostWidget::dataChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_executableFileChooser.data(), &Utils::PathChooser::rawPathChanged, + connect(m_executableFileChooser, &Utils::PathChooser::rawPathChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_verboseLevelSpinBox.data(), + connect(m_verboseLevelSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &GdbServerProviderConfigWidget::dirty); - connect(m_extendedModeCheckBox.data(), &QAbstractButton::clicked, + connect(m_extendedModeCheckBox, &QAbstractButton::clicked, this, &GdbServerProviderConfigWidget::dirty); - connect(m_resetBoardCheckBox.data(), &QAbstractButton::clicked, + connect(m_resetBoardCheckBox, &QAbstractButton::clicked, this, &GdbServerProviderConfigWidget::dirty); - connect(m_transportLayerComboBox.data(), + connect(m_transportLayerComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &GdbServerProviderConfigWidget::dirty); - connect(m_initCommandsTextEdit.data(), &QPlainTextEdit::textChanged, + connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_resetCommandsTextEdit.data(), &QPlainTextEdit::textChanged, + connect(m_resetCommandsTextEdit, &QPlainTextEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_startupModeComboBox.data(), + connect(m_startupModeComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &StLinkUtilGdbServerProviderConfigWidget::startupModeChanged); } diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.h b/src/plugins/baremetal/stlinkutilgdbserverprovider.h index 9b742c3b548..e48adcd5e46 100644 --- a/src/plugins/baremetal/stlinkutilgdbserverprovider.h +++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.h @@ -121,14 +121,14 @@ private: void populateTransportLayers(); void setFromProvider(); - QPointer<HostWidget> m_hostWidget; - QPointer<Utils::PathChooser> m_executableFileChooser; - QPointer<QSpinBox> m_verboseLevelSpinBox; - QPointer<QCheckBox> m_extendedModeCheckBox; - QPointer<QCheckBox> m_resetBoardCheckBox; - QPointer<QComboBox> m_transportLayerComboBox; - QPointer<QPlainTextEdit> m_initCommandsTextEdit; - QPointer<QPlainTextEdit> m_resetCommandsTextEdit; + HostWidget *m_hostWidget; + Utils::PathChooser *m_executableFileChooser; + QSpinBox *m_verboseLevelSpinBox; + QCheckBox *m_extendedModeCheckBox; + QCheckBox *m_resetBoardCheckBox; + QComboBox *m_transportLayerComboBox; + QPlainTextEdit *m_initCommandsTextEdit; + QPlainTextEdit *m_resetCommandsTextEdit; }; } // namespace Internal |