diff options
| author | scop <scop> | 2005-03-22 22:06:10 +0000 |
|---|---|---|
| committer | scop <scop> | 2005-03-22 22:06:10 +0000 |
| commit | 1390e887ee238b8b345ac583827b3006fd5e68cc (patch) | |
| tree | 70580c652d522766abe3da5b6cc5994874865f68 /dxr3unixserversocket.c | |
| parent | 49498fe0382a062ce9477eaae75d6cfb771b5890 (diff) | |
| download | vdr-plugin-dxr3-1390e887ee238b8b345ac583827b3006fd5e68cc.tar.gz vdr-plugin-dxr3-1390e887ee238b8b345ac583827b3006fd5e68cc.tar.bz2 | |
std:: fixes from HEAD.
Diffstat (limited to 'dxr3unixserversocket.c')
| -rw-r--r-- | dxr3unixserversocket.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/dxr3unixserversocket.c b/dxr3unixserversocket.c index f7b7cee..8153515 100644 --- a/dxr3unixserversocket.c +++ b/dxr3unixserversocket.c @@ -32,8 +32,6 @@ #include "dxr3interface.h" #include "dxr3log.h" -using namespace std; - #ifndef SOCKET_CHMOD #define SOCKET_CHMOD 0660 #endif @@ -147,12 +145,12 @@ void cDxr3StartStopSocket::SendStatus() { if (cDxr3Interface::Instance().IsExternalReleased()) { - string res("CloseDxr3DeviceRsp\n"); + std::string res("CloseDxr3DeviceRsp\n"); write(m_fdConnectionSocket, res.c_str(), res.size()); } else { - string res("OpenDxr3DeviceRsp\n"); + std::string res("OpenDxr3DeviceRsp\n"); write(m_fdConnectionSocket, res.c_str(), res.size()); } } @@ -162,26 +160,26 @@ void cDxr3StartStopSocket::ProcessMessage(void) { cLog::Instance() << "cDxr3StartStopSocket::ProcessMessage Rec: " << (const char*) m_msg << "\n"; - if (string((const char*)m_msg) == string("OpenDxr3DeviceCmd")) + if (std::string((const char*)m_msg) == std::string("OpenDxr3DeviceCmd")) { cDxr3Interface::Instance().ExternalReopenDevices(); SendStatus(); } - else if (string((const char*)m_msg) == string("CloseDxr3DeviceCmd")) + else if (std::string((const char*)m_msg) == std::string("CloseDxr3DeviceCmd")) { cDxr3Interface::Instance().ExternalReleaseDevices(); SendStatus(); } - else if (string((const char*)m_msg) == string("StatusDxr3DeviceCmd")) + else if (std::string((const char*)m_msg) == std::string("StatusDxr3DeviceCmd")) { SendStatus(); } - else if (string((const char *)m_msg) == string("SaveDxr3DeviceCmd")) + else if (std::string((const char *)m_msg) == std::string("SaveDxr3DeviceCmd")) { m_bSavedState = cDxr3Interface::Instance().IsExternalReleased(); SendStatus(); } - else if (string((const char *)m_msg) == string("RestoreDxr3DeviceCmd")) + else if (std::string((const char *)m_msg) == std::string("RestoreDxr3DeviceCmd")) { if (m_bSavedState) { @@ -195,7 +193,7 @@ void cDxr3StartStopSocket::ProcessMessage(void) } else { - string res("Error\n"); + std::string res("Error\n"); write(m_fdConnectionSocket, res.c_str(), res.size()); } } |