Clean up and modernize code

- static "new-style" signal->slot connections
- Fix a lot of things Clang-Tidy complained about
- Move includes to .cpp files and use forward decls in .h
- Don't use <QtWidgets> and <QtCore>, but specific includes instead

3 files changed, 14 insertions, 9 deletions

diff --git a/src/shared/networkmessage.h b/src/shared/networkmessage.h
index c072070..327f544 100644
--- a/src/shared/networkmessage.h
+++ b/src/shared/networkmessage.h
@@ -12,7 +12,9 @@
 #define NM_READ_INCOMPLETE (2)
 #define NM_READ_FAILED (0)
 
-#include <QtCore>
+#include <QHostAddress>
+#include <QByteArray>
+#include <QString>
 
 class QAbstractSocket;
 class QUdpSocket;
@@ -62,16 +64,16 @@ private:
 public:
 	NetworkMessage();
 	virtual ~NetworkMessage();
-	int readMessage(QAbstractSocket* socket);
+	int readMessage(QAbstractSocket *socket);
 	int readMessage(char* data, quint32 len);
-	bool writeMessage(QAbstractSocket * const socket);
+	bool writeMessage(QAbstractSocket *socket);
 	bool writeMessage(QUdpSocket* socket, const QHostAddress& address, quint16 port);
 	void reset() { _fields.clear(); _bufferSize = 0; _mode = 0; }
-	bool readComplete() { return _mode == 3; }
-	bool writeComplete() { return _mode == 4; }
+	bool readComplete() const { return _mode == 3; }
+	bool writeComplete() const { return _mode == 4; }
 	bool hasField(QByteArray& key) { return _fields.contains(key); }
-	const QString getFieldString(const QByteArray& key) const { return QString::fromUtf8(_fields.value(key)); }
-	const QByteArray getFieldBytes(const QByteArray& key) const { return _fields.value(key); }
+	QString getFieldString(const QByteArray& key) const { return QString::fromUtf8(_fields.value(key)); }
+	QByteArray getFieldBytes(const QByteArray& key) const { return _fields.value(key); }
 	void setField(const QByteArray& key, const QByteArray& value) { if (_mode == 1 || _mode == 2) qFatal("setField called in bad state."); _fields.insert(key, value); _mode = 0; }
 	void setField(const QByteArray& key, const QString& value) { setField(key, value.toUtf8()); }
 	// Convenience
diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index d5c101e..880ffca 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -10,7 +10,7 @@
 
 static QCryptographicHash sha1(QCryptographicHash::Sha1);
 
-QByteArray genSha1(const QByteArray* a, const QByteArray* b, const QByteArray* c, const QByteArray* d, const QByteArray* e)
+QByteArray genSha1(const QByteArray *a, const QByteArray *b, const QByteArray *c, const QByteArray *d, const QByteArray *e)
 {
 	sha1.reset();
 	sha1.addData(*a);
diff --git a/src/shared/util.h b/src/shared/util.h
index e9530a8..c25f778 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -9,7 +9,10 @@
 #define UTIL_H_
 
 #include <QByteArray>
+#include <QRandomGenerator>
 
-QByteArray genSha1(const QByteArray* a, const QByteArray* b = nullptr, const QByteArray* c = nullptr, const QByteArray* d = nullptr, const QByteArray* e = nullptr);
+#define slxrand() (QRandomGenerator::system()->generate())
+
+QByteArray genSha1(const QByteArray *a, const QByteArray *b = nullptr, const QByteArray *c = nullptr, const QByteArray *d = nullptr, const QByteArray *e = nullptr);
 
 #endif /* UTIL_H_ */