X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..22061f63b0ae2254d569b3c9f2d28f1add39ab1c:/lib/driver/rc.cpp diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp index 790c5f6c..39206512 100644 --- a/lib/driver/rc.cpp +++ b/lib/driver/rc.cpp @@ -40,7 +40,7 @@ int eRCDevice::getKeyCompatibleCode(const eRCKey &) const return -1; } -eRCDevice::eRCDevice(eString id, eRCDriver *driver): driver(driver), id(id) +eRCDevice::eRCDevice(std::string id, eRCDriver *driver): driver(driver), id(id) { input=driver->getInput(); driver->addCodeListener(this); @@ -127,7 +127,7 @@ eRCInputEventDriver::eRCInputEventDriver(const char *filename): eRCDriver(eRCInp } } -eString eRCInputEventDriver::getDeviceName() +std::string eRCInputEventDriver::getDeviceName() { char name[128]=""; if (handle >= 0) @@ -214,30 +214,30 @@ void eRCInput::setFile(int newh) handle=newh; } -void eRCInput::addDevice(const eString &id, eRCDevice *dev) +void eRCInput::addDevice(const std::string &id, eRCDevice *dev) { - devices.insert(std::pair(id, dev)); + devices.insert(std::pair(id, dev)); } -void eRCInput::removeDevice(const eString &id) +void eRCInput::removeDevice(const std::string &id) { devices.erase(id); } -eRCDevice *eRCInput::getDevice(const eString &id) +eRCDevice *eRCInput::getDevice(const std::string &id) { - std::map::iterator i=devices.find(id); + std::map::iterator i=devices.find(id); if (i == devices.end()) { eDebug("failed, possible choices are:"); - for (std::map::iterator i=devices.begin(); i != devices.end(); ++i) + for (std::map::iterator i=devices.begin(); i != devices.end(); ++i) eDebug("%s", i->first.c_str()); return 0; } return i->second; } -std::map &eRCInput::getDevices() +std::map &eRCInput::getDevices() { return devices; }