clean code

main.cpp

@@ -1,66 +1,12 @@
-#include "maindialog.h"
 #include <QApplication>
-#include <QTextCodec>
-#include <QWindow>
-#include <QDebug>
-#include <QTimer>
+#include "maindialog.h"
 
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-//    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-//    QTextCodec::setCodecForTr(QTextCodec::codecForCStrings());
     MainDialog w;
     w.show();
 
-//    Display *dpy;
-//    Window rootWindow;
-//    Window parent;
-//    Window *children;
-//    Window *child;
-//    unsigned long noOfChildren;
-
-//    dpy = XOpenDisplay(NULL);
-//    if (!dpy) {
-//        return 7;
-//    }
-//    rootWindow = RootWindow(dpy, -1);
-
-
-//    children = (Window*)get_client_list(dpy, &noOfChildren);
-
-////    XQueryTree(dpy, rootWindow, &rootWindow, &parent, &children, &noOfChildren);
-//    for (int i = 0; i < noOfChildren; ++i) {
-//        char* nameStr;
-//        XFetchName(dpy, children[i], &nameStr);
-//        QString name(nameStr);
-//        XFree(nameStr);
-//        if (name.startsWith("rdesktop - ")) {
-////        if (name.startsWith("robin@gigi-lt1: /tmp")) {
-//            qDebug() << name;
-//            QWindow *window = QWindow::fromWinId(children[i]);
-//            window->setFlags(Qt::FramelessWindowHint);
-
-//            QWidget *widget = QWidget::createWindowContainer(window);
-////            QEvent e(QEvent::EmbeddingControl);
-////            QApplication::sendEvent(widget, &e);
-////            widget->show();
-////            QTimer* timer = new QTimer(widget);
-////            QObject::connect(timer, SIGNAL(timeout()), widget, SLOT(update()));
-////            timer->start(100);
-//            break;
-//        }
-//    }
-
-////    QWindow *window = QWindow::fromWinId(0x0340056f);
-////    window->setFlags(Qt::FramelessWindowHint);
-
-////    QWidget *widget = QWidget::createWindowContainer(window);
-
-////    QVBoxLayout *layout = new QVBoxLayout(this);
-////    layout->addWidget(widget);
-////    this->setLayout(layout);
-
     return a.exec();
 }

maindialog.cpp

@@ -1,7 +1,7 @@
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QUuid>
-#include <QDebug>
+#include <QWindow>
 #include "maindialog.h"
 #include "ui_maindialog.h"
 #include "rdesktoplauncher.h"
@@ -10,7 +10,8 @@
 MainDialog::MainDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::MainDialog),
-    m_launcher(0)
+    m_launcher(0),
+    m_dlgConnecting(0)
 {
     ui->setupUi(this);
     connect(ui->lineComputer->lineEdit(), SIGNAL(returnPressed()), ui->btnConnect, SLOT(animateClick()));
@@ -210,16 +211,29 @@ void MainDialog::on_btnRemoveSession_clicked()
 void MainDialog::onProcessFinished(int status)
 {
     ui->lblExitStatus->setText(RDesktopLauncher::getExitStatusString(status));
-    m_launcher->deleteLater();
-    m_launcher = 0;
-    m_dlgConnecting->deleteLater();
-    m_dlgConnecting = 0;
+    clearLauncher();
+    clearDialogConnecting();
     show();
 }
 
-void MainDialog::onWindowFound(WId wid)
+void MainDialog::onWindowFound(WId)
 {
-    m_dlgConnecting->deleteLater();
-    m_dlgConnecting = 0;
+    clearDialogConnecting();
     hide();
 }
+
+void MainDialog::clearDialogConnecting()
+{
+    if (m_dlgConnecting) {
+        m_dlgConnecting->deleteLater();
+        m_dlgConnecting = 0;
+    }
+}
+
+void MainDialog::clearLauncher()
+{
+    if (m_launcher) {
+        m_launcher->deleteLater();
+        m_launcher = 0;
+    }
+}

maindialog.h

@@ -49,6 +49,10 @@ private slots:
 
     void onWindowFound(WId wid);
 
+    void clearDialogConnecting();
+
+    void clearLauncher();
+
 private:
     Ui::MainDialog *ui;
 

rdesktoplauncher.cpp

@@ -2,8 +2,6 @@
 #include "rdesktoplauncher.h"
 #include "x11helper.h"
 
-#include <QDebug>
-
 RDesktopLauncher::RDesktopLauncher(QObject *parent)
     : QObject(parent)
     , m_process(0)
@@ -157,7 +155,7 @@ void RDesktopLauncher::kill()
     }
 }
 
-void RDesktopLauncher::onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
+void RDesktopLauncher::onProcessFinished(int exitCode, QProcess::ExitStatus)
 {
     clearWindowLookUpTimer();
     m_process->deleteLater();

rdpoptionshelper.cpp

@@ -1,7 +1,7 @@
 #include <QSettings>
-#include "rdpoptionshelper.h"
 #include <QList>
 #include <QStringList>
+#include "rdpoptionshelper.h"
 
 void RdpOptionsHelper::save(const RdpOptions &opt)
 {