diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:17:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:17:02 -0600 |
| commit | 4816c4a735e1704c433dbe42155bf3887180d8ea (patch) | |
| tree | 868b82f46bee5214e7b8251e79ce56d4c1453c9a /kopete/protocols/msn/webcam.h | |
| parent | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (diff) | |
| download | tdenetwork-4816c4a735e1704c433dbe42155bf3887180d8ea.tar.gz tdenetwork-4816c4a735e1704c433dbe42155bf3887180d8ea.zip | |
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/msn/webcam.h')
| -rw-r--r-- | kopete/protocols/msn/webcam.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h index 64a555c5..a056fe24 100644 --- a/kopete/protocols/msn/webcam.h +++ b/kopete/protocols/msn/webcam.h @@ -18,7 +18,7 @@ #if MSN_WEBCAM -namespace KNetwork{ class TDEServerSocket; class KBufferedSocket; } +namespace KNetwork{ class TDEServerSocket; class TDEBufferedSocket; } class MimicWrapper; class TQLabel; @@ -55,7 +55,7 @@ class Webcam : public TransferContext KNetwork::TDEServerSocket *m_listener; - KNetwork::KBufferedSocket *m_webcamSocket; + KNetwork::TDEBufferedSocket *m_webcamSocket; enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ; @@ -67,8 +67,8 @@ class Webcam : public TransferContext MimicWrapper *m_mimic; MSNWebcamDialog *m_widget; - TQValueList<KNetwork::KBufferedSocket* > m_allSockets; - TQMap<KNetwork::KBufferedSocket*, WebcamStatus> m_webcamStates; + TQValueList<KNetwork::TDEBufferedSocket* > m_allSockets; + TQMap<KNetwork::TDEBufferedSocket*, WebcamStatus> m_webcamStates; int m_timerId; int m_timerFps; |