From 2204a616e5c649755540b01b6d85784551f785b7 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 2 Aug 2018 14:53:27 +0200 Subject: Remove ugly comment separator lines above functions --- src/client/connectwindow/connectwindow.cpp | 26 +++++++++++++------------- src/client/net/serverdiscovery.cpp | 10 +++++----- src/client/toolbar/toolbar.cpp | 22 +++++++++++----------- src/client/vnc/vncserver.cpp | 24 ++++++++++++------------ 4 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src/client') diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp index 1f6d549..a9f0996 100644 --- a/src/client/connectwindow/connectwindow.cpp +++ b/src/client/connectwindow/connectwindow.cpp @@ -17,7 +17,7 @@ #define UDPBUFSIZ 9000 #define SALT_LEN 18 -/***************************************************************************//** +/** * Initialize Connection Window. * @param parent */ @@ -57,14 +57,14 @@ ConnectWindow::ConnectWindow(QWidget *parent) : QWidget(parent) this->updateUserInterface(); } -/***************************************************************************//** +/** * @brief ConnectWindow::~ConnectWindow */ ConnectWindow::~ConnectWindow() {} -/***************************************************************************//** +/** * Handle changes in state and update window. * Also changing TextLabel which shows the user what the program is doing. */ @@ -123,7 +123,7 @@ void ConnectWindow::updateUserInterface() * Overrides */ -/***************************************************************************//** +/** * Called when a Qt timer fires; used for server discovery and * auto-hiding the connect dialog. */ @@ -139,7 +139,7 @@ void ConnectWindow::timerEvent(QTimerEvent* event) killTimer(event->timerId()); } -/***************************************************************************//** +/** * Handle incoming closeEvent and hide window. * @param e */ @@ -160,7 +160,7 @@ void ConnectWindow::doShow() raise(); } -/***************************************************************************//** +/** * Gives the keyboard input focus to the input line. * @param event */ @@ -171,7 +171,7 @@ void ConnectWindow::showEvent(QShowEvent* /* event */ ) _ui->lineEditName->setFocus(); } -/***************************************************************************//** +/** * Public function connect to session. * Check if currently connected to server, * if not --> connect to given sessionName. @@ -223,7 +223,7 @@ void ConnectWindow::DoDisconnect() } -/***************************************************************************//** +/** * Handle click on Connect/Disconnect button. * If already connected --> Stop/disconnect. * Else scanning for given sessionId. @@ -259,7 +259,7 @@ void ConnectWindow::setAvailableRooms(QList m) /* also add a pseudo-room "manual choice" */ _ui->comboBox_rooms->addItem(tr("Session Name..."), "manual_connection"); } -/***************************************************************************//** +/** * Handle click on Cancel/Hide Button. * Just hide the window. */ @@ -284,7 +284,7 @@ void ConnectWindow::onRoomSelection(int index) } } -/***************************************************************************//** +/** * @brief ConnectWindow::onServerDetected * @param host * @param port @@ -300,7 +300,7 @@ void ConnectWindow::onServerDetected(const QString& host, const quint16 port, co } -/***************************************************************************//** +/** * Handle connection state changes and update member variables describing state. * @param state */ @@ -326,7 +326,7 @@ void ConnectWindow::onConnectionStateChange(ConnectWindow::ConnectionState state } -/***************************************************************************//** +/** * If connection is closed set _pendingConnection = nullptr. * @param connection */ @@ -335,7 +335,7 @@ void ConnectWindow::onConnectionClosed(QObject* /* connection */ ) _pendingConnection = nullptr; } -/***************************************************************************//** +/** * @brief ConnectWindow::onConnectionDisconnected */ void ConnectWindow::onConnectionDisconnected(ServerConnection*) diff --git a/src/client/net/serverdiscovery.cpp b/src/client/net/serverdiscovery.cpp index 1b29398..b2d7605 100644 --- a/src/client/net/serverdiscovery.cpp +++ b/src/client/net/serverdiscovery.cpp @@ -7,7 +7,7 @@ #include -/***************************************************************************//** +/** * Ctor */ ServerDiscovery::ServerDiscovery(QObject *parent) @@ -37,14 +37,14 @@ ServerDiscovery::ServerDiscovery(QObject *parent) connect(&_discoveryTimer, SIGNAL(timeout()), this, SLOT(doDiscovery())); } -/***************************************************************************//** +/** * Dtor */ ServerDiscovery::~ServerDiscovery() { } -/***************************************************************************//** +/** * @brief start */ void ServerDiscovery::start(const QByteArray& sessionName, QString mgrIP) @@ -71,7 +71,7 @@ void ServerDiscovery::start(const QByteArray& sessionName, QString mgrIP) _discoveryTimer.start(); } -/***************************************************************************//** +/** * @brief stop */ void ServerDiscovery::stop() @@ -134,7 +134,7 @@ void ServerDiscovery::doDiscovery() } -/***************************************************************************//** +/** * Handle incoming service discovery packets. */ void ServerDiscovery::onUdpReadyRead() diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index a8e50e9..ddb55f1 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -18,7 +18,7 @@ #include "toolbar.h" #include "ui_toolbar.h" -/***************************************************************************//** +/** * @brief * * Does exact teh same as Toolbar::Toolbar(QWidget *parent) but additionally @@ -37,7 +37,7 @@ Toolbar::Toolbar(const QByteArray sessionName, QWidget *parent) clientApp->connectWindow()->connectToSession(sessionName, ""); } -/***************************************************************************//** +/** * @brief Constructor of the Toolbar. * * Does exact the same as Toolbar::Toolbar(QWidget *parent) but additionally @@ -62,7 +62,7 @@ Toolbar::Toolbar(const bool autoConnect, QWidget *parent) } } -/***************************************************************************//** +/** * @brief Constructor of the Toolbar. * * Constructs a widget which is a child of parent. @@ -208,7 +208,7 @@ void Toolbar::updateButtonVisibility() } } -/***************************************************************************//** +/** * Destructor of the Toolbar. Destroys the widget. All this widget's children * are deleted first. */ @@ -223,7 +223,7 @@ Toolbar::~Toolbar() * Override */ -/***************************************************************************//** +/** * This event is reimplemented to receive widget enter events. When the mouse * cursor enters the widget, the timer which, when timed out, hides * the Toolbar, gets stopped. @@ -310,7 +310,7 @@ QString Toolbar::identifyMgrIP() * Slots */ -/***************************************************************************//** +/** * A slot for changing the camera icon. This slot should be called permanently * if the vnc server is recording the screen. */ @@ -326,7 +326,7 @@ void Toolbar::cameraBlink() } } -/***************************************************************************//** +/** * A slot for the VncServerIsRunning signal. This slot will change the UI * according to the state fo the VncServer. * @param[in] port Indicates the state of the VncServer. @@ -347,7 +347,7 @@ void Toolbar::onVncServerIsRunning(int port) } } -/***************************************************************************//** +/** * A slot for the onDisconnected signal of the ConnectWindow. This slot will * change the UI according to the state fo the connection. */ @@ -367,7 +367,7 @@ void Toolbar::onDisconnected(ServerConnection* connection) QTimer::singleShot(1, this, SLOT(updateButtonVisibility())); } -/***************************************************************************//** +/** * A slot for the onConnected signal of the ConnectWindow. This slot will * change the UI according to the state of the connection and connect the * relevant signals and slots. @@ -393,7 +393,7 @@ void Toolbar::onConnected(ServerConnection* connection) connect(_vnc, SIGNAL(running(const bool, const int)), connection, SLOT(onVncViewerStartStop(const bool, const int))); } -/***************************************************************************//** +/** * */ void Toolbar::onDoDisconnect() @@ -459,7 +459,7 @@ void Toolbar::delayedShowBar() } } -/***************************************************************************//** +/** * @brief Toolbar::showAboutDialog */ void Toolbar::showAboutDialog() diff --git a/src/client/vnc/vncserver.cpp b/src/client/vnc/vncserver.cpp index a016f08..d819668 100644 --- a/src/client/vnc/vncserver.cpp +++ b/src/client/vnc/vncserver.cpp @@ -14,7 +14,7 @@ VncServer* VncServer::me = nullptr; -/***************************************************************************//** +/** * @brief VncServer::instance * @return */ @@ -25,7 +25,7 @@ VncServer* VncServer::instance() return me; } -/***************************************************************************//** +/** * @brief makePassword * @param len * @return @@ -38,19 +38,19 @@ static QString makePassword(int len = 10) return ret; } -/***************************************************************************//** +/** * @brief Ugly hack to get an el-cheapo platform independent sleep */ struct Sleeper : public QThread { static void msleep(unsigned long msecs) { QThread::msleep(msecs); } }; -/***************************************************************************//** +/** * @brief VncServer::VncServer */ VncServer::VncServer() : _process(nullptr), _port(0), _timerId(0) {} -/***************************************************************************//** +/** * @brief VncServer::~VncServer */ VncServer::~VncServer() {} @@ -67,7 +67,7 @@ QSharedPointer VncServer::createPwFile(const QDir& dir) return file; } -/***************************************************************************//** +/** * @brief VncServer::start */ void VncServer::start() @@ -129,7 +129,7 @@ void VncServer::start() _process->start("x11vnc", args, QIODevice::ReadOnly); } -/***************************************************************************//** +/** * @brief VncServer::stop */ void VncServer::stop() @@ -162,7 +162,7 @@ void VncServer::stop() */ -/***************************************************************************//** +/** * @brief Timer event, currently only used to assume VNC server setup failed * after 3 seconds... * @param event @@ -180,7 +180,7 @@ void VncServer::timerEvent(QTimerEvent * /* event */ ) */ -/***************************************************************************//** +/** * @brief VncServer::onStdOut */ void VncServer::onStdOut() @@ -206,7 +206,7 @@ void VncServer::onStdOut() } } -/***************************************************************************//** +/** * @brief VncServer::onStdErr */ void VncServer::onStdErr() @@ -218,7 +218,7 @@ void VncServer::onStdErr() QByteArray data(_process->readAllStandardError()); } -/***************************************************************************//** +/** * @brief VncServer::onError * @param error */ @@ -228,7 +228,7 @@ void VncServer::onError(QProcess::ProcessError /* error */ ) emit started(0, _ropass, _rwpass); } -/***************************************************************************//** +/** * @brief VncServer::onFinished * @param exitCode */ -- cgit v1.2.3-55-g7522