summaryrefslogtreecommitdiffstats
path: root/src/client/clientapp/clientapp.h
diff options
context:
space:
mode:
authorSimon Rettberg2016-10-28 16:14:07 +0200
committerSimon Rettberg2016-10-28 16:14:07 +0200
commit6decac6613fef21869784df0d83a0b7c7d1c2008 (patch)
treefa453e3262039851cf79809569a6446e91cfb595 /src/client/clientapp/clientapp.h
parent[client] Fix memleak (diff)
downloadpvs2-6decac6613fef21869784df0d83a0b7c7d1c2008.tar.gz
pvs2-6decac6613fef21869784df0d83a0b7c7d1c2008.tar.xz
pvs2-6decac6613fef21869784df0d83a0b7c7d1c2008.zip
[client] Allow ESC key to cancel projection in hybrid mode
Diffstat (limited to 'src/client/clientapp/clientapp.h')
-rw-r--r--src/client/clientapp/clientapp.h9
1 files changed, 6 insertions, 3 deletions
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: