aboutsummaryrefslogtreecommitdiff
path: root/editor/fileserver/editor_file_server.h
diff options
context:
space:
mode:
authorRémi Verschelde2017-03-19 00:36:26 +0100
committerRémi Verschelde2017-03-19 00:36:26 +0100
commitf8db8a3faa30b71dca33ced38be16d3f93f43e8a (patch)
tree3b798318132cca7eccfbca5818ab55656a2896d7 /editor/fileserver/editor_file_server.h
parent1d418afe863c9e553b69174ce63aef203c46d2f0 (diff)
downloadgodot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.gz
godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.zst
godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.zip
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
Diffstat (limited to '')
-rw-r--r--editor/fileserver/editor_file_server.h20
1 files changed, 8 insertions, 12 deletions
diff --git a/editor/fileserver/editor_file_server.h b/editor/fileserver/editor_file_server.h
index 498314a1b..00e468316 100644
--- a/editor/fileserver/editor_file_server.h
+++ b/editor/fileserver/editor_file_server.h
@@ -29,15 +29,15 @@
#ifndef EDITOR_FILE_SERVER_H
#define EDITOR_FILE_SERVER_H
+#include "io/file_access_network.h"
+#include "io/packet_peer.h"
+#include "io/tcp_server.h"
#include "object.h"
#include "os/thread.h"
-#include "io/tcp_server.h"
-#include "io/packet_peer.h"
-#include "io/file_access_network.h"
class EditorFileServer : public Object {
- OBJ_TYPE(EditorFileServer,Object);
+ OBJ_TYPE(EditorFileServer, Object);
enum Command {
CMD_NONE,
@@ -45,26 +45,24 @@ class EditorFileServer : public Object {
CMD_STOP,
};
-
struct ClientData {
Thread *thread;
Ref<StreamPeerTCP> connection;
- Map<int,FileAccess*> files;
+ Map<int, FileAccess *> files;
EditorFileServer *efs;
bool quit;
-
};
Ref<TCP_Server> server;
- Set<Thread*> to_wait;
+ Set<Thread *> to_wait;
static void _close_client(ClientData *cd);
- static void _subthread_start(void*s);
+ static void _subthread_start(void *s);
Mutex *wait_mutex;
Thread *thread;
- static void _thread_start(void*);
+ static void _thread_start(void *);
bool quit;
Command cmd;
@@ -72,9 +70,7 @@ class EditorFileServer : public Object {
int port;
bool active;
-
public:
-
void start();
void stop();