From 9f479b8f76238a03bce5d13aee14efd34e659c6e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sun, 30 Oct 2022 20:34:23 +0100
Subject: 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
---
 src/client/util/platform/blankscreen.cpp | 8 ++------
 src/client/util/room.h                   | 6 ++++--
 src/client/util/util.h                   | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/client/util')

diff --git a/src/client/util/platform/blankscreen.cpp b/src/client/util/platform/blankscreen.cpp
index 5f9b04b..a4c7d30 100644
--- a/src/client/util/platform/blankscreen.cpp
+++ b/src/client/util/platform/blankscreen.cpp
@@ -7,10 +7,6 @@
 #include <QTimer>
 
 #include <X11/Xlib.h>
-#include <X11/cursorfont.h>
-
-#include <cassert>
-#include <cstring>
 
 struct BlankScreen_Sysdep {
 	Display *dpy;
@@ -27,8 +23,8 @@ BlankScreen::BlankScreen() : QDialog(nullptr)
 	setStyleSheet("background-color:#000");
 
 	_locked = false;
-	QTimer *upper = new QTimer(this);
-	connect(upper, SIGNAL(timeout()), this, SLOT(timer_moveToTop()));
+	auto *upper = new QTimer(this);
+	connect(upper, &QTimer::timeout, this, &BlankScreen::timer_moveToTop);
 	upper->start(1111);
 }
 
diff --git a/src/client/util/room.h b/src/client/util/room.h
index 86939f7..46f8c02 100644
--- a/src/client/util/room.h
+++ b/src/client/util/room.h
@@ -1,11 +1,13 @@
 #ifndef ROOM_H
 #define ROOM_H
 
+#include <QDebug>
+
 struct Room {
 	QString mgr;
 	QString name;
 	int priority;
-	Room (QString _name, QString _mgr, int _priority)
+	Room (const QString &_name, const QString &_mgr, int _priority)
 	{
 		mgr = _mgr;
 		name = _name;
@@ -13,7 +15,7 @@ struct Room {
 	};
 };
 
-inline QDebug operator<<(QDebug debug, const Room& r)
+inline QDebug& operator<<(QDebug& debug, const Room& r)
 {
 	debug << r.name << "{mgr=" << r.mgr << ",prio=" << r.priority << "}";
 	return debug;
diff --git a/src/client/util/util.h b/src/client/util/util.h
index 89b19f4..e7a5ac9 100644
--- a/src/client/util/util.h
+++ b/src/client/util/util.h
@@ -1,10 +1,9 @@
-#ifndef UTIL_H_
-#define UTIL_H_
+#ifndef PVS_UTIL_H_
+#define PVS_UTIL_H_
 
 #include <QDir>
 #include <QTextStream>
 
-
 namespace Util
 {
 //#
@@ -22,4 +21,4 @@ inline QTextStream& qStdout()
 }
 
 
-#endif /* UTIL_H_ */
+#endif /* PVS_UTIL_H_ */
-- 
cgit v1.2.3-55-g7522