unified the code and cleaned exit status

[woller] / woller.cpp

diff --git a/woller.cpp b/woller.cpp
index f08af4a..ba596e2 100644 (file)
--- a/woller.cpp
+++ b/woller.cpp
@@ -210,10 +210,10 @@ ConfigWidget::ConfigWidget(QWidget *parent, QList<host_s> *hosts)
     this->setWindowTitle(tr("Woller Config"));
 #ifdef Q_WS_MAEMO_5
     this->setAttribute(Qt::WA_Maemo5StackedWindow);
-    this->setWindowFlags(this->windowFlags() | Qt::Window);
 #else
     this->setWindowModality(Qt::ApplicationModal);
 #endif
+    this->setWindowFlags(this->windowFlags() | Qt::Window);
     add_host = new QPushButton(tr("&Add Host"), this);
     edit_host = new QPushButton(tr("&Edit Host"), this);
     del_host = new QPushButton(tr("&Delete Host"), this);
@@ -368,10 +368,10 @@ HostWidget::HostWidget(QWidget *parent, host_s *host)
     this->setWindowTitle(tr("WOL target details"));
 #ifdef Q_WS_MAEMO_5
     this->setAttribute(Qt::WA_Maemo5StackedWindow);
-    this->setWindowFlags(this->windowFlags() | Qt::Window);
 #else
     this->setWindowModality(Qt::ApplicationModal);
 #endif
+    this->setWindowFlags(this->windowFlags() | Qt::Window);
     vlayout = new QVBoxLayout(this);
 
     host_row = new QHBoxLayout;
@@ -462,7 +462,6 @@ void HostWidget::ok_sig()
 HostWidget::~HostWidget()
 {
     qDebug() << "host ~widget" << endl;
-    delete vlayout;
     delete host_row;
     delete host_lbl;
     delete hostname;
@@ -475,7 +474,7 @@ HostWidget::~HostWidget()
     delete button_row;
     delete cancel;
     delete ok;
-    //delete new_host;
+    delete vlayout;
 }