From 3d82bfc698165bb20f3c38d42f2b77ab855c1edf Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Thu, 29 Sep 2016 15:40:18 +0200
Subject: astyle.

---
 src/client/clientapp/clientapp.cpp | 91 ++++++++++++++++++++------------------
 src/client/clientapp/clientapp.h   | 31 ++++++-------
 2 files changed, 63 insertions(+), 59 deletions(-)

(limited to 'src/client/clientapp')

diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp
index 6e1a555..18ef0de 100644
--- a/src/client/clientapp/clientapp.cpp
+++ b/src/client/clientapp/clientapp.cpp
@@ -1,54 +1,57 @@
 #include "clientapp.h"
 
 ClientApp::ClientApp(int& argc, char** argv)
-    : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false) {
-    /* some values */
-    setOrganizationName("openslx");
-    setOrganizationDomain("openslx.org");
-    setApplicationName("pvsclient");
-
-    /* configuration */
-    QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/");
-
-    _arguments = parseParameters();
-
-
-    /* TODO: Move the connection handling to ClientApp */
-    if (_connectionMode == ConnectionMode::Auto) {
-        _toolbar = new Toolbar(true); // auto connect client without session ID.
-    } else if (_connectionMode == ConnectionMode::Session) {
-        _toolbar = new Toolbar(_sessionName.toUtf8()); // connect client with given session ID.
-    } else {
-        _toolbar = new Toolbar(); // create normal client.
-    }
-    _toolbar->setVisible(!_examMode);
-
-    /* set translator */
-    /* use system locale as language to translate gui */
-    QTranslator translator;
-    translator.load(":pvsclient");
-    installTranslator(&translator);
+	: QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false)
+{
+	/* some values */
+	setOrganizationName("openslx");
+	setOrganizationDomain("openslx.org");
+	setApplicationName("pvsclient");
+
+	/* configuration */
+	QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/");
+
+	_arguments = parseParameters();
+
+
+	/* TODO: Move the connection handling to ClientApp */
+	if (_connectionMode == ConnectionMode::Auto) {
+		_toolbar = new Toolbar(true); // auto connect client without session ID.
+	} else if (_connectionMode == ConnectionMode::Session) {
+		_toolbar = new Toolbar(_sessionName.toUtf8()); // connect client with given session ID.
+	} else {
+		_toolbar = new Toolbar(); // create normal client.
+	}
+	_toolbar->setVisible(!_examMode);
+
+	/* set translator */
+	/* use system locale as language to translate gui */
+	QTranslator translator;
+	translator.load(":pvsclient");
+	installTranslator(&translator);
 
 };
 
 /* parse arguments and return a list with the unused arguments */
-QStringList ClientApp::parseParameters() {
-    QStringList rest;
-    for (QString a : QApplication::arguments()) {
-        if (a == "--exam-mode") {
-            _examMode = true;
-        } else if (a == "--auto") {
-            _connectionMode = ConnectionMode::Auto;
-        } else if (a.startsWith("--session=")) {
-            _connectionMode = ConnectionMode::Session;
-            _sessionName = a.replace("--session=", "");
-        } else {
-            rest << a;
-        }
-    }
-    return rest;
+QStringList ClientApp::parseParameters()
+{
+	QStringList rest;
+	for (QString a : QApplication::arguments()) {
+		if (a == "--exam-mode") {
+			_examMode = true;
+		} else if (a == "--auto") {
+			_connectionMode = ConnectionMode::Auto;
+		} else if (a.startsWith("--session=")) {
+			_connectionMode = ConnectionMode::Session;
+			_sessionName = a.replace("--session=", "");
+		} else {
+			rest << a;
+		}
+	}
+	return rest;
 }
 
-QStringList ClientApp::arguments() {
-    return _arguments;
+QStringList ClientApp::arguments()
+{
+	return _arguments;
 }
diff --git a/src/client/clientapp/clientapp.h b/src/client/clientapp/clientapp.h
index 996d48d..910eba2 100644
--- a/src/client/clientapp/clientapp.h
+++ b/src/client/clientapp/clientapp.h
@@ -14,27 +14,28 @@
  * several widgets. With this class information access will also be easier as
  * it is possible to access the current ClientApp instance from anywhere with
  * the clientApp macro (like qApp)  macro */
-class ClientApp : public QApplication {
+class ClientApp : public QApplication
+{
 
-  Q_OBJECT
+	Q_OBJECT
 
-  public:
-    enum ConnectionMode { None, Auto, Session };
+public:
+	enum ConnectionMode { None, Auto, Session };
 
-  private:
-    bool _examMode;
-    ConnectionMode _connectionMode; /* way of automatically connection to a session on startup*/
-    QString _sessionName; /* only set when _connectionMode == Session */
-    Toolbar* _toolbar;
-    QStringList _arguments;
+private:
+	bool _examMode;
+	ConnectionMode _connectionMode; /* way of automatically connection to a session on startup*/
+	QString _sessionName; /* only set when _connectionMode == Session */
+	Toolbar* _toolbar;
+	QStringList _arguments;
 
-    QStringList parseParameters();
+	QStringList parseParameters();
 
-  public:
+public:
 
-    ClientApp(int& argc, char** argv);
+	ClientApp(int& argc, char** argv);
 
-    bool isExamMode() const { return _examMode; };
+	bool isExamMode() const { return _examMode; };
 
-    virtual QStringList arguments();
+	virtual QStringList arguments();
 };
-- 
cgit v1.2.3-55-g7522