From 8e5b09ac62a66ed560ea9869caf3351959e399ce Mon Sep 17 00:00:00 2001
From: Albert Medela <albert.medela@gmail.com>
Date: Thu, 24 May 2018 18:26:34 +0200
Subject: [PATCH] Correct #347, #342, #338, #339

---
 chatcleaner.proto                      | 1 +
 pokerth.proto                          | 3 ++-
 src/gui/qt/gametable/gametableimpl.cpp | 2 +-
 src/net/common/clientthread.cpp        | 7 +++++--
 src/net/common/netpacket.cpp           | 2 +-
 src/net/serveraccepthelper.h           | 6 ++++--
 src/pokerth.cpp                        | 1 +
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/chatcleaner.proto b/chatcleaner.proto
index 5f7b23e0..b43b0a67 100644
--- a/chatcleaner.proto
+++ b/chatcleaner.proto
@@ -28,6 +28,7 @@
  * shall include the source code for the parts of OpenSSL used as well       *
  * as that of the covered work.                                              *
  *****************************************************************************/
+syntax = "proto2";
 
 option java_package = "de.chatcleaner.protocol";
 option java_outer_classname = "ProtoBuf";
diff --git a/pokerth.proto b/pokerth.proto
index bc880873..fa5330d6 100644
--- a/pokerth.proto
+++ b/pokerth.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 /*****************************************************************************
  * PokerTH - The open source texas holdem engine                             *
  * Copyright (C) 2006-2013 Felix Hammer, Florian Thauer, Lothar May          *
@@ -701,7 +702,7 @@ message ReportGameAckMessage {
 
 message ErrorMessage {
 	enum ErrorReason {
-		reserved = 0;
+		custReserved = 0;
 		initVersionNotSupported = 1;
 		initServerFull = 2;
 		initAuthFailure = 3;
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 1394186e..e0743b8b 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -3859,7 +3859,7 @@ void gameTableImpl::triggerVoteOnKick(int id)
 	int playerCount = static_cast<int>(seatList->size());
 	if (id < playerCount) {
 		PlayerListIterator pos = seatList->begin();
-		advance(pos, id);
+		std::advance(pos, id);
 		myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID());
 	}
 }
diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
index c23747cc..dee5daf6 100644
--- a/src/net/common/clientthread.cpp
+++ b/src/net/common/clientthread.cpp
@@ -993,8 +993,11 @@ ClientThread::CreateContextSession()
 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));
 		else
 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));
-		boost::asio::socket_base::non_blocking_io command(true);
-		newSock->io_control(command);
+
+		// Deprecated  non_blocking_io command
+		/*boost::asio::socket_base::non_blocking_io command(true);
+		newSock->io_control(command);*/
+		newSock->non_blocking(true);
 		newSock->set_option(tcp::no_delay(true));
 		newSock->set_option(boost::asio::socket_base::keep_alive(true));
 
diff --git a/src/net/common/netpacket.cpp b/src/net/common/netpacket.cpp
index c07cc7a7..36ca11ee 100644
--- a/src/net/common/netpacket.cpp
+++ b/src/net/common/netpacket.cpp
@@ -249,7 +249,7 @@ NetPacket::GameErrorToNetError(int gameErrorReason)
 		retVal = ErrorMessage::sessionTimeout;
 		break;
 	default :
-		retVal = ErrorMessage::reserved;
+		retVal = ErrorMessage::custReserved;
 		break;
 	}
 	return retVal;
diff --git a/src/net/serveraccepthelper.h b/src/net/serveraccepthelper.h
index 19db005b..bcaba929 100644
--- a/src/net/serveraccepthelper.h
+++ b/src/net/serveraccepthelper.h
@@ -122,8 +122,10 @@ protected:
 					  const boost::system::error_code &error)
 	{
 		if (!error) {
-			boost::asio::socket_base::non_blocking_io command(true);
-			acceptedSocket->io_control(command);
+			// Deprecated  non_blocking_io command
+			/*boost::asio::socket_base::non_blocking_io command(true);
+			newSock->io_control(command);*/
+			newSock->non_blocking(true);
 			acceptedSocket->set_option(typename P::no_delay(true));
 			acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
 			boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 2f9981c1..cb2fe7d0 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -100,6 +100,7 @@ int main( int argc, char **argv )
 
 	/////// can be removed for non-qt-guis ////////////
 #ifdef ANDROID
+	QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 	QApplication a(argc, argv);
 	a.setApplicationName("PokerTH");
 #else