diff options
| author | Johann Latocha | 2010-07-07 03:53:06 +0200 |
|---|---|---|
| committer | Johann Latocha | 2010-07-07 03:53:06 +0200 |
| commit | a97a2d7bae9ebf44c8cd8b4b56cdd0ba6aaee0b0 (patch) | |
| tree | 6f281b03681feaf5b2f2db67b7634718eee53b90 /src | |
| parent | jjls first git commit ever! (svn changes since r793) (diff) | |
| download | pvs-a97a2d7bae9ebf44c8cd8b4b56cdd0ba6aaee0b0.tar.gz pvs-a97a2d7bae9ebf44c8cd8b4b56cdd0ba6aaee0b0.tar.xz pvs-a97a2d7bae9ebf44c8cd8b4b56cdd0ba6aaee0b0.zip | |
Defect #715, apply patch by Sébastien
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/pvsListenServer.cpp | 4 | ||||
| -rw-r--r-- | src/util/util.cpp | 7 | ||||
| -rw-r--r-- | src/util/util.h | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/net/pvsListenServer.cpp b/src/net/pvsListenServer.cpp index 1dac9c0..f21303e 100644 --- a/src/net/pvsListenServer.cpp +++ b/src/net/pvsListenServer.cpp @@ -245,8 +245,8 @@ bool PVSListenServer::init() return false; } ConsoleLog writeNetwork( - QString("Server is listening. Socket: ").append(int2String( - (int) _listenSocket))); + QString("Server is listening. Socket: ").append(ptr2String( + _listenSocket))); connect(_listenSocket, SIGNAL(newConnection()), this, SLOT( server_connectionRequest())); diff --git a/src/util/util.cpp b/src/util/util.cpp index c2d06a0..946168e 100644 --- a/src/util/util.cpp +++ b/src/util/util.cpp @@ -325,6 +325,13 @@ QString int2String(int intInt) return QString(tmp); } +QString ptr2String(void* ptr) +{ + char tmp[50]; + snprintf(tmp, 49, "%p", ptr); + return QString(tmp); +} + int string2Int(QString string) { return atoi(string.toUtf8().data()); diff --git a/src/util/util.h b/src/util/util.h index 37565cb..6ddefc6 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -46,6 +46,7 @@ QString readPassFromPassFile(); bool getAllowed(); QString int2String(int intInt); +QString ptr2String(void* ptr); int string2Int(QString string); int string2Int(QString string); //} // end namespace util |