diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
| commit | f5aca1a1b402bd7ebc944dc6e6fe65828d863365 (patch) | |
| tree | 4a0fdd8e166d5c4b03543279d332b9a858ef62df /src/itoserver.cpp | |
| parent | 10c557562e1d67c55314c212371ea9cb7f802863 (diff) | |
| download | libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.gz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.bz2 libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.xz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.zip | |
Bu::FString is now String, and there's a shell script to fix any other programs
that were using fstring, I hope.
Diffstat (limited to 'src/itoserver.cpp')
| -rw-r--r-- | src/itoserver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/itoserver.cpp b/src/itoserver.cpp index ea737bf..80e5bfb 100644 --- a/src/itoserver.cpp +++ b/src/itoserver.cpp | |||
| @@ -47,7 +47,7 @@ void Bu::ItoServer::addPort( int nPort, int nPoolSize ) | |||
| 47 | hServers.insert( nSocket, s ); | 47 | hServers.insert( nSocket, s ); |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | void Bu::ItoServer::addPort( const FString &sAddr, int nPort, int nPoolSize ) | 50 | void Bu::ItoServer::addPort( const String &sAddr, int nPort, int nPoolSize ) |
| 51 | { | 51 | { |
| 52 | TcpServerSocket *s = new TcpServerSocket( sAddr, nPort, nPoolSize ); | 52 | TcpServerSocket *s = new TcpServerSocket( sAddr, nPort, nPoolSize ); |
| 53 | int nSocket = s->getSocket(); | 53 | int nSocket = s->getSocket(); |
| @@ -163,7 +163,7 @@ void Bu::ItoServer::ItoClient::run() | |||
| 163 | while( !qMsg.isEmpty() ) | 163 | while( !qMsg.isEmpty() ) |
| 164 | { | 164 | { |
| 165 | imProto.lock(); | 165 | imProto.lock(); |
| 166 | Bu::FString *pMsg = qMsg.dequeue(); | 166 | Bu::String *pMsg = qMsg.dequeue(); |
| 167 | pClient->onMessage( *pMsg ); | 167 | pClient->onMessage( *pMsg ); |
| 168 | delete pMsg; | 168 | delete pMsg; |
| 169 | pClient->processOutput(); | 169 | pClient->processOutput(); |
| @@ -205,7 +205,7 @@ Bu::ItoServer::SrvClientLink::~SrvClientLink() | |||
| 205 | { | 205 | { |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | void Bu::ItoServer::SrvClientLink::sendMessage( const Bu::FString &sMsg ) | 208 | void Bu::ItoServer::SrvClientLink::sendMessage( const Bu::String &sMsg ) |
| 209 | { | 209 | { |
| 210 | if( !pClient->imProto.trylock() ) | 210 | if( !pClient->imProto.trylock() ) |
| 211 | { | 211 | { |
| @@ -215,7 +215,7 @@ void Bu::ItoServer::SrvClientLink::sendMessage( const Bu::FString &sMsg ) | |||
| 215 | } | 215 | } |
| 216 | else | 216 | else |
| 217 | { | 217 | { |
| 218 | Bu::FString *pMsg = new Bu::FString( sMsg ); | 218 | Bu::String *pMsg = new Bu::String( sMsg ); |
| 219 | pClient->qMsg.enqueue( pMsg ); | 219 | pClient->qMsg.enqueue( pMsg ); |
| 220 | } | 220 | } |
| 221 | } | 221 | } |
