1 files changed, 7 insertions, 16 deletions

diff --git a/main.cpp b/main.cpp
index 65b08d7..985e523 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,36 +7,27 @@ int main(int argc, char *argv[])
 
     QStringList param_list;
 
-    for(int i = 1; i < argc; i++)
+    for (int i = 1; i < argc; i++)
     {
         param_list.append(argv[i]);
     }
 
-    QPSXSerial* w;
+    QPSXSerial w(nullptr, param_list.isEmpty() ? GUI_APP : CLI_APP);
 
-    if(param_list.isEmpty() == true)
-    {
-        w = new QPSXSerial(0, GUI_APP);
-    }
-    else
-    {
-        w = new QPSXSerial(0, CLI_APP);
-    }
-
-    w->setParamList(param_list);
+    w.setParamList(param_list);
 
-    if(param_list.isEmpty() == true)
+    if (param_list.isEmpty())
     {
-        w->show();
+        w.show();
     }
     else
     {
         // This will cause the application to exit when
         // the task signals finished.
-        QObject::connect(w, SIGNAL(finished(void)), &a, SLOT(quit(void)));
+        QObject::connect(&w, SIGNAL(finished(void)), &a, SLOT(quit(void)));
 
         // This will run the task from the application event loop.
-        QTimer::singleShot(0, w, SLOT(cli_run()));
+        QTimer::singleShot(0, &w, SLOT(cli_run()));
     }
 
     return a.exec();