1 files changed, 32 insertions, 23 deletions

diff --git a/src/server/connectionframe/connectionframe.h b/src/server/connectionframe/connectionframe.h
index 1d004e6..cfebe85 100644
--- a/src/server/connectionframe/connectionframe.h
+++ b/src/server/connectionframe/connectionframe.h
@@ -1,9 +1,14 @@
-#ifndef _CONNECTIONFRAME_H_
-#define _CONNECTIONFRAME_H_
-#include <QtWidgets>
-#include "../net/client.h"
+#ifndef PVS_CONNECTIONFRAME_H_
+#define PVS_CONNECTIONFRAME_H_
+
+#include <QGroupBox>
+#include <utility>
+
+class QBoxLayout;
+class QLabel;
 
 class MainWindow;
+class Client;
 
 /**
  * Class for representing the clients of current session, with a specific frame
@@ -34,11 +39,11 @@ private:
 	QPoint _gridPosition;
 	QSize _desiredThumbSize;
 
-	Client *_client;
+	Client *_client{};
 
-	int _timerId, _timerCounter;
-	bool _isSelected;
-	bool _isTutor;
+	int _timerId{}, _timerCounter{};
+	bool _isSelected{};
+	bool _isTutor{};
 	bool _isFromRoomplan;
 
 	void showDefaultThumb();
@@ -52,35 +57,39 @@ public:
 	static bool paintDisabled;
 
 	ConnectionFrame(MainWindow* main, QWidget* parent, bool fromRoomplan = false);
-	virtual ~ConnectionFrame();
+	~ConnectionFrame() override;
 
-	const inline QPoint getGridPosition() const { return _gridPosition; }
+	const QPoint& getGridPosition() const { return _gridPosition; }
 	void setGridPosition(int x, int y);
 	void setGridPosition(const QPoint& pos);
 	void updateGeometry();
 
 	void assignClient(Client *client);
 	void setSelection(bool selected);
-	inline bool isSelected() { return _isSelected; }
+	bool isSelected() const { return _isSelected; }
 
 	const QString& computerId() const { return _computerId; }
-	void setComputerId(QString computerId) { if (_client != nullptr) return; _computerId = computerId; updateLabels(); }
+	void setComputerId(QString computerId) {
+		if (_client != nullptr)
+			return;
+		_computerId = std::move(computerId); updateLabels();
+	}
 	Client* client() const { return _client; }
 
-	inline bool isTutor() { return _isTutor; }
-	inline bool isFromRoomplan() { return _isFromRoomplan; }
+	bool isTutor() const { return _isTutor; }
+	bool isFromRoomplan() const { return _isFromRoomplan; }
 	void setTutor(bool b);
 
 protected:
-	void resizeEvent(QResizeEvent* event) { calcDesiredThumbSize(event->size()); }
-	void mouseDoubleClickEvent(QMouseEvent* event);
-	void mouseReleaseEvent(QMouseEvent* e);
-	void enterEvent(QEvent* event);
-	void leaveEvent(QEvent* event);
-	void mousePressEvent(QMouseEvent* event);
-	void mouseMoveEvent(QMouseEvent* event);
-	void paintEvent(QPaintEvent *event);
-	void timerEvent(QTimerEvent* event);
+	void resizeEvent(QResizeEvent* event) override;
+	void mouseDoubleClickEvent(QMouseEvent* event) override;
+	void mouseReleaseEvent(QMouseEvent* e) override;
+	void enterEvent(QEvent* event) override;
+	void leaveEvent(QEvent* event) override;
+	void mousePressEvent(QMouseEvent* event) override;
+	void mouseMoveEvent(QMouseEvent* event) override;
+	void paintEvent(QPaintEvent *event) override;
+	void timerEvent(QTimerEvent* event) override;
 
 signals:
 	void frameMoving(ConnectionFrame* frame);