From 8bd2c120d6121a677c050c1e8b0afb8cdc023d6b Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sun, 3 Aug 2014 19:27:02 +0200
Subject: [PATCH] Re #1567: cleanup

---
 companion/src/comparedialog.cpp | 4 ++--
 companion/src/helpers.cpp       | 1 -
 companion/src/helpers.h         | 1 -
 companion/src/printdialog.cpp   | 4 +---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/companion/src/comparedialog.cpp b/companion/src/comparedialog.cpp
index b5f1c4feb..e93ded239 100644
--- a/companion/src/comparedialog.cpp
+++ b/companion/src/comparedialog.cpp
@@ -156,12 +156,12 @@ void CompareDialog::dropEvent(QDropEvent *event)
 
 void CompareDialog::closeEvent(QCloseEvent *event) 
 {
-  qunlink(curvefile5);
-  qunlink(curvefile9);    
 }
 
 CompareDialog::~CompareDialog()
 {
+  qunlink(curvefile5);
+  qunlink(curvefile9);
   delete ui;
 }
 
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index f8e4960a2..1949aca83 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -972,7 +972,6 @@ QString index2version(int index)
   }
 }
 
-
 int qunlink(const QString & fileName)
 {
   qDebug() << "unlinking "<< fileName;
diff --git a/companion/src/helpers.h b/companion/src/helpers.h
index a6cabb8cf..a135dc2d8 100644
--- a/companion/src/helpers.h
+++ b/companion/src/helpers.h
@@ -139,7 +139,6 @@ class QTimeS : public QTime
     int seconds() const { return hour()*3600 + minute()*60 + second(); };
 };
 
-
 int qunlink(const QString & fileName);
 
 QString generateProcessUniqueTempFileName(const QString & fileName);
diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp
index a8f42b0fc..75593882d 100644
--- a/companion/src/printdialog.cpp
+++ b/companion/src/printdialog.cpp
@@ -60,13 +60,11 @@ PrintDialog::PrintDialog(QWidget *parent, FirmwareInterface * firmware, GeneralS
 
 void PrintDialog::closeEvent(QCloseEvent *event) 
 {
-  // if (printfilename.isEmpty()) {
-  // }
 }
 
 PrintDialog::~PrintDialog()
 {
-  qDebug() << "PrintDialog::~PrintDialog";
+  // notice PrintDialog::closeEvent() is not called if user clicks on Close button
   qunlink(curvefile5);
   qunlink(curvefile9);
   delete ui;