diff options
| author | Lorn Potter <lopotter@ljp-linux-vm.localdomain> | 2010-06-17 04:11:33 (GMT) |
|---|---|---|
| committer | Lorn Potter <lopotter@ljp-linux-vm.localdomain> | 2010-06-17 04:11:33 (GMT) |
| commit | 8335adf60299b728c0bf7a346a5afd94a3d56712 (patch) | |
| tree | a8057969ac369ddffec9fa2b92e10cdf1fc319eb /src/network/socket/qlocalsocket_p.h | |
| parent | 0948de26bca9a68a354b436895bdf9e2db9c4288 (diff) | |
| parent | 30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff) | |
| download | Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.zip Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.gz Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.bz2 | |
Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7
Diffstat (limited to 'src/network/socket/qlocalsocket_p.h')
| -rw-r--r-- | src/network/socket/qlocalsocket_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index 0f1c23c..57ca3c2 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/src/network/socket/qlocalsocket_p.h @@ -135,7 +135,7 @@ public: void _q_canWrite(); void _q_pipeClosed(); void _q_emitReadyRead(); - DWORD bytesAvailable(); + DWORD checkPipeState(); void startAsyncRead(); bool completeAsyncRead(); void checkReadyRead(); |