Mercurial > zfc9000 / file diff

--- a/sources/interface.cpp	Wed Jul 20 18:31:19 2016 +0300
+++ b/sources/interface.cpp	Fri Jul 22 17:59:55 2016 +0300
@@ -168,7 +168,7 @@
 	m_inputHistory << "";
 	m_outputLines.clear();
 	m_outputLines << ColoredLine();
-	m_session.set_interface(this);
+	m_session.setInterface(this);
 	resetTitle();
 
 	if (::has_colors())
@@ -230,7 +230,7 @@
 //
 void Interface::safeDisconnect(std::function<void(bool)> afterwards)
 {
-	if (m_session.is_active())
+	if (m_session.isActive())
 	{
 		m_disconnectCallback = afterwards;
 		setInputState(INPUTSTATE_CONFIRM_DISCONNECTION);
@@ -480,7 +480,7 @@
 {
 	String text;
 
-	switch (m_session.state())
+	switch (m_session.getState())
 	{
 	case RCON_DISCONNECTED:
 		text = "Disconnected.";
@@ -495,19 +495,19 @@
 		{
 			String adminText;
 
-			if (m_session.num_admins() == 0)
+			if (m_session.getAdminCount() == 0)
 			{
 				adminText = "No other admins";
 			}
 			else
 			{
-				adminText.sprintf("%d other admin%s", m_session.num_admins(),
-					m_session.num_admins() != 1 ? "s" : "");
+				adminText.sprintf("%d other admin%s", m_session.getAdminCount(),
+					m_session.getAdminCount() != 1 ? "s" : "");
 			}
 
 			text.sprintf("%s | %s | %s",
 				m_session.address().to_string(IPAddress::WITH_PORT).chars(),
-				m_session.level().chars(),
+				m_session.getLevel().chars(),
 				adminText.chars());
 		}
 		break;
@@ -517,7 +517,7 @@
 		text += " | ";
 
 	text += "Ctrl+N to connect, Ctrl+Q to ";
-	text +=(m_session.state() == RCON_DISCONNECTED) ? "quit" : "disconnect";
+	text +=(m_session.getState() == RCON_DISCONNECTED) ? "quit" : "disconnect";
 
 	if (text != m_statusBarText)
 	{
@@ -775,7 +775,7 @@
 				and(space == -1 or space >= m_cursorPosition))
 			{
 				String start = getCurrentInput().mid(0, m_cursorPosition);
-				m_session.request_tab_complete(start);
+				m_session.requestTabCompletion(start);
 			}
 		}
 		break;
@@ -809,7 +809,7 @@
 			if (m_inputState == INPUTSTATE_PASSWORD and not getCurrentInput().isEmpty())
 			{
 				m_session.disconnect();
-				m_session.set_password(getCurrentInput());
+				m_session.setPassword(getCurrentInput());
 				m_session.connect(m_remoteAddress);
 				setInputState(INPUTSTATE_NORMAL);
 			}
@@ -821,7 +821,7 @@
 				handleCommand(getCurrentInput());
 				flushInput();
 			}
-			else if (m_session.send_command(getCurrentInput()))
+			else if (m_session.sendCommand(getCurrentInput()))
 			{
 				flushInput();
 			}
@@ -1007,7 +1007,7 @@
 		m_remoteAddress.port = 10666;
 
 	m_session.disconnect();
-	m_session.set_password(password);
+	m_session.setPassword(password);
 	m_session.connect(m_remoteAddress);
 }
 
@@ -1079,7 +1079,7 @@
 			if (address.port == 0)
 				address.port = 10666;
 
-			m_session.set_password(args[1]);
+			m_session.setPassword(args[1]);
 			m_session.disconnect();
 			m_session.connect(m_remoteAddress = address);
 		}