summaryrefslogtreecommitdiffstats
path: root/src/client/clientapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/clientapp')
-rw-r--r--src/client/clientapp/clientapp.cpp2
-rw-r--r--src/client/clientapp/clientapp.h9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp
index 5528c65..7711556 100644
--- a/src/client/clientapp/clientapp.cpp
+++ b/src/client/clientapp/clientapp.cpp
@@ -5,7 +5,7 @@
#include "../net/serverconnection.h"
ClientApp::ClientApp(int& argc, char** argv)
- : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false), _isManagerPc(false)
+ : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false), _connection(NULL), _isManagerPc(false)
{
/* some values */
setOrganizationName("openslx");
diff --git a/src/client/clientapp/clientapp.h b/src/client/clientapp/clientapp.h
index 8a7fd83..dbfbc32 100644
--- a/src/client/clientapp/clientapp.h
+++ b/src/client/clientapp/clientapp.h
@@ -1,5 +1,7 @@
-#include<QApplication>
#include "../util/util.h"
+#include "../net/serverconnection.h"
+
+#include <QApplication>
#include <QSharedPointer>
#include <QSettings>
@@ -11,7 +13,6 @@
class Toolbar;
class ConnectWindow;
-class ServerConnection;
/* this class is supposed to (after complete refactoring) to encapsulate all
* state of the application. At the moment, the state is distributed within
@@ -55,7 +56,9 @@ public:
ConnectWindow* connectWindow() const { return _connectWindow; }
- const bool isManagerPc() const { return _isManagerPc; }
+ const bool isConfiguredAsManager() const { return _isManagerPc; }
+
+ const bool isConnectedToLocalManager() const { return _connection != NULL && _connection->isLocalConnection(); }
private slots: