From 286465cb53b7aff8d4cc8417593f5cef9e6531ff Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Wed, 24 Jun 2020 17:26:36 +0200
Subject: [PATCH] merge fixes

---
 src/chatdlg.h           | 2 ++
 src/clientdlg.h         | 2 ++
 src/clientsettingsdlg.h | 2 ++
 src/connectdlg.h        | 2 ++
 src/historygraph.h      | 2 +-
 src/serverdlg.h         | 2 ++
 src/util.cpp            | 1 +
 7 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/chatdlg.h b/src/chatdlg.h
index 648d353d..2d3e5f8c 100755
--- a/src/chatdlg.h
+++ b/src/chatdlg.h
@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QLabel>
 #include <QString>
 #include <QLineEdit>
diff --git a/src/clientdlg.h b/src/clientdlg.h
index 91fe43fe..b19061d5 100755
--- a/src/clientdlg.h
+++ b/src/clientdlg.h
@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QLabel>
 #include <QString>
 #include <QLineEdit>
diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h
index da5c31cb..3d699e57 100755
--- a/src/clientsettingsdlg.h
+++ b/src/clientsettingsdlg.h
@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QLabel>
 #include <QString>
 #include <QLineEdit>
diff --git a/src/connectdlg.h b/src/connectdlg.h
index 2637b5a2..2ebe20ea 100755
--- a/src/connectdlg.h
+++ b/src/connectdlg.h
@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
diff --git a/src/historygraph.h b/src/historygraph.h
index 77034f97..4540418e 100644
--- a/src/historygraph.h
+++ b/src/historygraph.h
@@ -61,7 +61,7 @@ public:
     };
 
     AHistoryGraph ( const int iMaxDaysHistory );
-    ~AHistoryGraph() { }
+    virtual ~AHistoryGraph() { }
 
     void Start ( const QString& sNewFileName );
     void Add ( const QDateTime& newDateTime, const EHistoryItemType curType );
diff --git a/src/serverdlg.h b/src/serverdlg.h
index e2ddd336..b6339139 100755
--- a/src/serverdlg.h
+++ b/src/serverdlg.h
@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QCloseEvent>
 #include <QLabel>
 #include <QListView>
diff --git a/src/util.cpp b/src/util.cpp
index 67ca7dd8..f1fd248f 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -432,6 +432,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "<p>Stanislas Michalak (<a href=""https://github.com/stanislas-m"">stanislas-m</a>)</p>"
         "<p>JP Cimalando (<a href=""https://github.com/jpcima"">jpcima</a>)</p>"
         "<p>Adam Sampson (<a href=""https://github.com/atsampson"">atsampson</a>)</p>"
+        "<p>Stefan Weil (<a href=""https://github.com/stweil"">stweil</a>)</p>"
         "<br>" + tr ( "For details on the contributions check out the " ) +
         "<a href=""https://github.com/corrados/jamulus/graphs/contributors"">" + tr ( "Github Contributors list" ) + "</a>." );