Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
d894c532
Commit
d894c532
authored
Jul 08, 2014
by
Fabio Bas
Browse files
Servatrice: fix handling of incoming connections on qt5
parent
04ad73fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
servatrice/src/servatrice.cpp
View file @
d894c532
...
...
@@ -78,7 +78,11 @@ Servatrice_GameServer::~Servatrice_GameServer()
}
}
#if QT_VERSION < 0x050000
void
Servatrice_GameServer
::
incomingConnection
(
int
socketDescriptor
)
#else
void
Servatrice_GameServer
::
incomingConnection
(
qintptr
socketDescriptor
)
#endif
{
// Determine connection pool with smallest client count
int
minClientCount
=
-
1
;
...
...
servatrice/src/servatrice.h
View file @
d894c532
...
...
@@ -52,7 +52,11 @@ public:
Servatrice_GameServer
(
Servatrice
*
_server
,
int
_numberPools
,
const
QSqlDatabase
&
_sqlDatabase
,
QObject
*
parent
=
0
);
~
Servatrice_GameServer
();
protected:
#if QT_VERSION < 0x050000
void
incomingConnection
(
int
socketDescriptor
);
#else
void
incomingConnection
(
qintptr
socketDescriptor
);
#endif
};
class
Servatrice_IslServer
:
public
QTcpServer
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment