jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fixed some errors in a merge from trunk

Browse source
This commit is contained in:
Micke Prag 2010-08-30 14:01:13 +00:00
parent f6260bec82
commit ef5b4f7002
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
driver/libtelldus-core/DeviceFuhaote.cpp
View file

@ -41,7 +41,7 @@ bool DeviceFuhaote::setDeviceParameter(const std::string &strName, const std::st
/* /*
* Turn on this device * Turn on this device
*/ */
int DeviceFuhaote::turnOn(Controller *controller){ int DeviceFuhaote::turnOn(void){
std::string strCode = "S"; std::string strCode = "S";
strCode.append(getStringCode()); strCode.append(getStringCode());
@ -49,13 +49,13 @@ int DeviceFuhaote::turnOn(Controller *controller){
strCode.append(1, S); strCode.append(1, S);
strCode.append("+"); strCode.append("+");
return controller->send(strCode); return Device::send(strCode);
} }
/* /*
* Turn off this device * Turn off this device
*/ */
int DeviceFuhaote::turnOff(Controller *controller){ int DeviceFuhaote::turnOff(void){
std::string strCode = "S"; std::string strCode = "S";
strCode.append(getStringCode()); strCode.append(getStringCode());
@ -63,7 +63,7 @@ int DeviceFuhaote::turnOff(Controller *controller){
strCode.append(1, S); strCode.append(1, S);
strCode.append("+"); strCode.append("+");
return controller->send(strCode); return Device::send(strCode);
} }
bool DeviceFuhaote::parameterMatches( const std::string &name, const std::string &value ) const { bool DeviceFuhaote::parameterMatches( const std::string &name, const std::string &value ) const {

4
driver/libtelldus-core/DeviceFuhaote.h
View file

@ -21,8 +21,8 @@ namespace TelldusCore {
protected: protected:
virtual bool setDeviceParameter(const std::string &strName, const std::string &strValue); virtual bool setDeviceParameter(const std::string &strName, const std::string &strValue);
virtual int turnOn(Controller *controller); virtual int turnOn(void);
virtual int turnOff(Controller *controller); virtual int turnOff(void);
std::string getStringCode(void); std::string getStringCode(void);
std::string strCode; std::string strCode;