diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
| commit | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch) | |
| tree | 78ccb5117063da3e08e3277e11054b912a9f2ae7 /kopete/protocols/msn/webcam.h | |
| parent | c48e769eb275917717e2b55eb869f7e559293ac8 (diff) | |
| download | tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/msn/webcam.h')
| -rw-r--r-- | kopete/protocols/msn/webcam.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h index d11f8b02..64a555c5 100644 --- a/kopete/protocols/msn/webcam.h +++ b/kopete/protocols/msn/webcam.h @@ -18,7 +18,7 @@ #if MSN_WEBCAM -namespace KNetwork{ class KServerSocket; class KBufferedSocket; } +namespace KNetwork{ class TDEServerSocket; class KBufferedSocket; } class MimicWrapper; class TQLabel; @@ -54,7 +54,7 @@ class Webcam : public TransferContext int getAvailablePort(); - KNetwork::KServerSocket *m_listener; + KNetwork::TDEServerSocket *m_listener; KNetwork::KBufferedSocket *m_webcamSocket; enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ; |