1 files changed, 20 insertions, 22 deletions

diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h
index 48fbf03..702bae2 100644
--- a/src/client/toolbar/toolbar.h
+++ b/src/client/toolbar/toolbar.h
@@ -14,13 +14,15 @@
 #ifndef PVSCLIENTGUI_H_
 #define PVSCLIENTGUI_H_
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QTimer>
 #include "../util/room.h"
 
 class ServerConnection;
 class VncWindow;
 class BlankScreen;
 
+class QMenu;
 
 namespace Ui
 {
@@ -32,47 +34,43 @@ class Toolbar : public QWidget
 	Q_OBJECT
 
 public:
-	Toolbar(QWidget *parent = 0);
-	Toolbar(const QByteArray sessionName, QWidget *parent = 0);
-	Toolbar(const bool autoConnect, QWidget *parent = 0);
-	virtual ~Toolbar();
+	explicit Toolbar(QWidget *parent = nullptr);
+	explicit Toolbar(const QByteArray& sessionName, QWidget *parent = nullptr);
+	explicit Toolbar(bool autoConnect, QWidget *parent = nullptr);
+	~Toolbar() override;
 
 private:
-	Ui::Toolbar *_ui;
-	QMenu *_menu;
-	QAction *_acnDisconnect;
-	QAction *_acnConnect;
-	QAction *_acnInformation;
-	QAction *_acnAbout;
-	QAction *_acnQuit;
+	Ui::Toolbar *_ui{};
+	QMenu *_menu{};
+	QAction *_acnDisconnect{};
+	QAction *_acnConnect{};
+	QAction *_acnInformation{};
+	QAction *_acnAbout{};
+	QAction *_acnQuit{};
 	QTimer _showTimer;
 	QTimer _hideTimer;
 	int _hideCountdown;
 	QTimer _blinkTimer;
-	VncWindow *_vnc;
-	bool _isManagerPc;
+	VncWindow *_vnc{};
 	const QPixmap _cam32, _beWatchedEye;
 	QPoint _lastDragPos;
 
-	int _yPos;
-	int _yPosHidden;
+	int _yPos{};
+	int _yPosHidden{};
 
 	void enterEvent(QEvent* e) override;
 	void mousePressEvent(QMouseEvent* event) override;
 	void mouseMoveEvent(QMouseEvent* event) override;
-	QList<Room> myRooms();
-	bool isManagerPc();
-	QString identifyMgrIP();
+	static QList<Room> myRooms();
+	static QString identifyMgrIP();
 	void init();
 	void initButtonsAndMenus();
 
-	QProcess lockDesktopP;
-
 private slots:
 	void onVncServerIsRunning(int port);
 	void onDisconnected(ServerConnection* connection);
 	void onConnected(ServerConnection* connection);
-	void onServerAttentionChanged(const bool on);
+	void onServerAttentionChanged(bool on);
 	void onDoDisconnect();
 	void onBtnAttention();
 	void exit();