/tests/guiapp: The mechanism calls the dialog boxes. Now the dialog boxes are created in stack.

2 files changed, 5 insertions, 16 deletions

diff --git a/tests/guiapp/maindialog.cpp b/tests/guiapp/maindialog.cpp
index 88bdf2e..aafcc46 100644
--- a/tests/guiapp/maindialog.cpp
+++ b/tests/guiapp/maindialog.cpp
@@ -17,8 +17,6 @@
 MainDialog::MainDialog(QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::MainDialog)
-    , m_optionsDialog(0)
-    , m_traceDialog(0)
     , m_port(0)
     , m_timer(0)
     , m_rts(false)
@@ -50,10 +48,6 @@ MainDialog::~MainDialog()
 {
     if (m_port->isOpen())
         m_port->close();
-    if (m_optionsDialog)
-        delete m_optionsDialog;
-    if (m_traceDialog)
-        delete m_traceDialog;
     delete ui;
 }
 
@@ -127,16 +121,14 @@ void MainDialog::procControlButtonClick()
 
 void MainDialog::procOptionsButtonClick()
 {
-    if (!m_optionsDialog)
-        m_optionsDialog = new OptionsDialog(m_port);
-    m_optionsDialog->show();
+    OptionsDialog dlg(m_port);
+    dlg.exec();
 }
 
 void MainDialog::procIOButtonClick()
 {
-    if (!m_traceDialog)
-        m_traceDialog = new TraceDialog(m_port);
-    m_traceDialog->show();
+    TraceDialog dlg(m_port);
+    dlg.exec();
 }
 
 void MainDialog::procRtsButtonClick()
diff --git a/tests/guiapp/maindialog.h b/tests/guiapp/maindialog.h
index b2cb779..889c8ce 100644
--- a/tests/guiapp/maindialog.h
+++ b/tests/guiapp/maindialog.h
@@ -8,8 +8,6 @@ class MainDialog;
 }
 
 class SerialPort;
-class OptionsDialog;
-class TraceDialog;
 class QTimer;
 
 class MainDialog : public QDialog
@@ -36,8 +34,7 @@ private slots:
 
 private:
     Ui::MainDialog *ui;
-    OptionsDialog *m_optionsDialog;
-    TraceDialog *m_traceDialog;
+
     SerialPort *m_port;
     QTimer *m_timer;