diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index 38a6cadb766..7fc352e179a 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -43,34 +43,29 @@ namespace Internal { // RemoteAdditionDialog: // -------------------------------------------------------------------------- -RemoteAdditionDialog::RemoteAdditionDialog(QWidget *parent) : - QDialog(parent), - m_ui(new Ui::RemoteAdditionDialog) +class RemoteAdditionDialog : public QDialog { - m_ui->setupUi(this); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -} +public: + RemoteAdditionDialog() + { + m_ui.setupUi(this); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + } -RemoteAdditionDialog::~RemoteAdditionDialog() -{ - delete m_ui; -} + QString remoteName() const + { + return m_ui.nameEdit->text(); + } -QString RemoteAdditionDialog::remoteName() const -{ - return m_ui->nameEdit->text(); -} + QString remoteUrl() const + { + return m_ui.urlEdit->text(); + } -QString RemoteAdditionDialog::remoteUrl() const -{ - return m_ui->urlEdit->text(); -} +private: + Ui::RemoteAdditionDialog m_ui; +}; -void RemoteAdditionDialog::clear() -{ - m_ui->nameEdit->clear(); - m_ui->urlEdit->clear(); -} // -------------------------------------------------------------------------- // RemoteDialog: @@ -130,14 +125,11 @@ void RemoteDialog::refreshRemotes() void RemoteDialog::addRemote() { - if (!m_addDialog) - m_addDialog = new RemoteAdditionDialog; - m_addDialog->clear(); - - if (m_addDialog->exec() != QDialog::Accepted) + RemoteAdditionDialog addDialog; + if (addDialog.exec() != QDialog::Accepted) return; - m_remoteModel->addRemote(m_addDialog->remoteName(), m_addDialog->remoteUrl()); + m_remoteModel->addRemote(addDialog.remoteName(), addDialog.remoteUrl()); } void RemoteDialog::removeRemote() diff --git a/src/plugins/git/remotedialog.h b/src/plugins/git/remotedialog.h index dab24c9b2d1..8495fdc73a8 100644 --- a/src/plugins/git/remotedialog.h +++ b/src/plugins/git/remotedialog.h @@ -30,39 +30,10 @@ namespace Git { namespace Internal { -namespace Ui { -class RemoteDialog; -class RemoteAdditionDialog; -} // namespace Ui +namespace Ui { class RemoteDialog; } -class GitClient; class RemoteModel; -// -------------------------------------------------------------------------- -// RemoteAdditionDialog: -// -------------------------------------------------------------------------- - -class RemoteAdditionDialog : public QDialog -{ - Q_OBJECT - -public: - explicit RemoteAdditionDialog(QWidget *parent = 0); - ~RemoteAdditionDialog() override; - - QString remoteName() const; - QString remoteUrl() const; - - void clear(); - -private: - Ui::RemoteAdditionDialog *m_ui; -}; - -// -------------------------------------------------------------------------- -// RemoteDialog: -// -------------------------------------------------------------------------- - class RemoteDialog : public QDialog { Q_OBJECT @@ -85,7 +56,6 @@ private: Ui::RemoteDialog *m_ui; RemoteModel *m_remoteModel; - RemoteAdditionDialog *m_addDialog = nullptr; }; } // namespace Internal