merge fixes

src/chatdlg.h

@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QLabel>
 #include <QString>
 #include <QLineEdit>

src/clientdlg.h

@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QLabel>
 #include <QString>
 #include <QLineEdit>

src/clientsettingsdlg.h

@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QLabel>
 #include <QString>
 #include <QLineEdit>

src/connectdlg.h

@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>

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 );

src/serverdlg.h

@@ -22,6 +22,8 @@
  *
 \******************************************************************************/
 
+#pragma once
+
 #include <QCloseEvent>
 #include <QLabel>
 #include <QListView>

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>." );