Mercurial > zfc9000 / file diff

--- a/sources/interface.h	Thu Jul 23 00:16:47 2015 +0300
+++ b/sources/interface.h	Thu Jul 23 01:52:04 2015 +0300
@@ -33,6 +33,7 @@
 #include "network/ipaddress.h"
 #include "coloredline.h"
 #include "network/rconsession.h"
+BEGIN_ZFC_NAMESPACE
 
 class Interface
 {
@@ -64,20 +65,20 @@
 
 private:
 	StringList InputHistory;
-	int InputCursor = 0;
-	int CursorPosition = 0;
-	int InputPanning = 0;
-	bool NeedRefresh = false;
-	bool NeedStatusBarRender = false;
-	bool NeedInputRender = false;
-	bool NeedOutputRender = false;
-	bool NeedNicklistRender = false;
+	int InputCursor;
+	int CursorPosition;
+	int InputPanning;
+	bool NeedRefresh;
+	bool NeedStatusBarRender;
+	bool NeedInputRender;
+	bool NeedOutputRender;
+	bool NeedNicklistRender;
 	struct { char ch; int x; } CursorCharacter;
 	Vector<ColoredLine> OutputLines;
-	int OutputScroll = 0;
+	int OutputScroll;
 	String Title;
-	InputState CurrentInputState = INPUTSTATE_NORMAL;
-	Function<void (void)> DisconnectConfirmFunction = nullptr;
+	InputState CurrentInputState;
+	std::function<void (void)> DisconnectConfirmFunction;
 	IPAddress CurrentAddress;
 	String StatusBarText;
 	StringList PlayerNames;
@@ -85,7 +86,7 @@
 	RCONSession Session;
 
 	void render_titlebar();
-	void safe_disconnect (Function<void()> afterwards);
+	void safe_disconnect (std::function<void()> afterwards);
 	int render_colorline (int y, int x0, int width, const ColoredLine& line, bool allowWrap);
 	int nicklist_width();
 	void render_output();
@@ -100,8 +101,10 @@
 	void move_input_cursor (int delta);
 	String prompt_string();
 	void set_input_state (InputState newstate);
-	void print_to_console (String a);
+	void print_to_console (String message);
 	void yank (int a, int b);
 	int find_previous_word();
 	int find_next_word();
 };
+
+END_ZFC_NAMESPACE
\ No newline at end of file