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

Remove extra blank lines according to Google style guidelines "whitespace/blank_line"

Browse source
This commit is contained in:
Micke Prag 2012-02-29 10:47:01 +01:00
parent 110dcc2c57
commit dc357ddeca
21 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
telldus-core/client/CallbackDispatcher.cpp
View file

@ -65,6 +65,5 @@ void TDEventDispatcher::fireEvent() {
return; return;
} }
((TDControllerEvent)callback->event)(data->controllerId, data->changeEvent, data->changeType, data->newValue.c_str(), callback->id, callback->context); ((TDControllerEvent)callback->event)(data->controllerId, data->changeEvent, data->changeType, data->newValue.c_str(), callback->id, callback->context);
} }
} }

2
telldus-core/client/Client.cpp
View file

@ -23,7 +23,6 @@ public:
std::wstring sensorCache, controllerCache; std::wstring sensorCache, controllerCache;
TelldusCore::Mutex mutex; TelldusCore::Mutex mutex;
CallbackMainDispatcher callbackMainDispatcher; CallbackMainDispatcher callbackMainDispatcher;
}; };
Client *Client::instance = 0; Client *Client::instance = 0;
@ -147,7 +146,6 @@ void Client::run() {
} }
std::wstring Client::sendToService(const Message &msg) { std::wstring Client::sendToService(const Message &msg) {
int tries = 0; int tries = 0;
std::wstring readData; std::wstring readData;
while(tries < 20) { while(tries < 20) {

1
telldus-core/common/Message.cpp
View file

@ -109,7 +109,6 @@ bool Message::nextIsString(const std::wstring &message) {
} }
std::wstring Message::takeString(std::wstring *message) { std::wstring Message::takeString(std::wstring *message) {
if (!Message::nextIsString(*message)) { if (!Message::nextIsString(*message)) {
return L""; return L"";
} }

1
telldus-core/common/Message.h
View file

@ -30,7 +30,6 @@ namespace TelldusCore {
static int takeInt(std::wstring *); static int takeInt(std::wstring *);
private: private:
}; };
} }

1
telldus-core/service/ConnectionListener_unix.cpp
View file

@ -87,7 +87,6 @@ void ConnectionListener::run() {
ConnectionListenerEventData *data = new ConnectionListenerEventData(); ConnectionListenerEventData *data = new ConnectionListenerEventData();
data->socket = new TelldusCore::Socket(clientSocket); data->socket = new TelldusCore::Socket(clientSocket);
d->waitEvent->signal(data); d->waitEvent->signal(data);
} }
close(serverSocket); close(serverSocket);
} }

1
telldus-core/service/Controller.cpp
View file

@ -37,7 +37,6 @@ void Controller::publishData(const std::string &msg) const {
} }
void Controller::decodePublishData(const std::string &data) const { void Controller::decodePublishData(const std::string &data) const {
std::list<std::string> msgList = Protocol::decodeData(data); std::list<std::string> msgList = Protocol::decodeData(data);
for (std::list<std::string>::iterator msgIt = msgList.begin(); msgIt != msgList.end(); ++msgIt) { for (std::list<std::string>::iterator msgIt = msgList.begin(); msgIt != msgList.end(); ++msgIt) {

1
telldus-core/service/ControllerManager.cpp
View file

@ -127,7 +127,6 @@ Controller *ControllerManager::getBestControllerById(int id) {
} }
} }
return 0; return 0;
} }
void ControllerManager::loadControllers() { void ControllerManager::loadControllers() {

1
telldus-core/service/Device.cpp
View file

@ -50,7 +50,6 @@ int Device::getLastSentCommand(int methodsSupported) {
lastSentCommand = TELLSTICK_TURNOFF; lastSentCommand = TELLSTICK_TURNOFF;
} }
return lastSentCommand; return lastSentCommand;
} }
int Device::getMethods() const { int Device::getMethods() const {

2
telldus-core/service/DeviceManager.cpp
View file

@ -144,7 +144,6 @@ int DeviceManager::getDeviceMethods(int deviceId, std::set<int> &duplicateDevice
} }
DeviceMap::iterator it = d->devices.find(deviceId); DeviceMap::iterator it = d->devices.find(deviceId);
if (it != d->devices.end()) { if (it != d->devices.end()) {
{ {
TelldusCore::MutexLocker deviceLocker(it->second); TelldusCore::MutexLocker deviceLocker(it->second);
type = it->second->getType(); type = it->second->getType();
@ -522,7 +521,6 @@ int DeviceManager::doGroupAction(const std::wstring devices, const int action, c
// If no devices support the method the default value will be returned (method not supported) // If no devices support the method the default value will be returned (method not supported)
retval = deviceReturnValue; retval = deviceReturnValue;
} }
} }
return retval; return retval;
} }

1
telldus-core/service/ProtocolFuhaote.cpp
View file

@ -56,6 +56,5 @@ std::string ProtocolFuhaote::getStringForMethod(int method, unsigned char, Contr
strReturn.append(1, S); strReturn.append(1, S);
strReturn.append("+"); strReturn.append("+");
return strReturn; return strReturn;
} }

1
telldus-core/service/ProtocolGroup.h
View file

@ -14,7 +14,6 @@ class ProtocolGroup : public Protocol {
public: public:
virtual int methods() const; virtual int methods() const;
virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller); virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller);
}; };
#endif // TELLDUS_CORE_SERVICE_PROTOCOLGROUP_H_ #endif // TELLDUS_CORE_SERVICE_PROTOCOLGROUP_H_

1
telldus-core/service/ProtocolIkea.cpp
View file

@ -129,5 +129,4 @@ std::string ProtocolIkea::getStringForMethod(int method, unsigned char level, Co
strReturn.append("+"); strReturn.append("+");
return strReturn; return strReturn;
} }

3
telldus-core/service/ProtocolRisingSun.cpp
View file

@ -100,11 +100,9 @@ std::string ProtocolRisingSun::getStringCodeSwitch(int method) {
return ""; return "";
} }
return strReturn; return strReturn;
} }
std::string ProtocolRisingSun::getCodeSwitchTuple(int intToConvert) { std::string ProtocolRisingSun::getCodeSwitchTuple(int intToConvert) {
std::string strReturn = ""; std::string strReturn = "";
for(int i = 0; i < 4; ++i) { for(int i = 0; i < 4; ++i) {
if (i == intToConvert) { if (i == intToConvert) {
@ -114,5 +112,4 @@ std::string ProtocolRisingSun::getCodeSwitchTuple(int intToConvert) {
} }
} }
return strReturn; return strReturn;
} }

2
telldus-core/service/ProtocolSartano.cpp
View file

@ -19,7 +19,6 @@ std::string ProtocolSartano::getStringForMethod(int method, unsigned char, Contr
} }
std::string ProtocolSartano::getStringForCode(const std::wstring &strCode, int method) { std::string ProtocolSartano::getStringForCode(const std::wstring &strCode, int method) {
std::string strReturn("S"); std::string strReturn("S");
for (size_t i = 0; i < strCode.length(); ++i) { for (size_t i = 0; i < strCode.length(); ++i) {
@ -39,7 +38,6 @@ std::string ProtocolSartano::getStringForCode(const std::wstring &strCode, int m
} }
return strReturn; return strReturn;
} }
std::string ProtocolSartano::decodeData(ControllerMessage &dataMsg) { std::string ProtocolSartano::decodeData(ControllerMessage &dataMsg) {

1
telldus-core/service/ProtocolScene.h
View file

@ -14,7 +14,6 @@ class ProtocolScene : public Protocol {
public: public:
virtual int methods() const; virtual int methods() const;
virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller); virtual std::string getStringForMethod(int method, unsigned char data, Controller *controller);
}; };
#endif // TELLDUS_CORE_SERVICE_PROTOCOLSCENE_H_ #endif // TELLDUS_CORE_SERVICE_PROTOCOLSCENE_H_

1
telldus-core/service/ProtocolSilvanChip.cpp
View file

@ -122,7 +122,6 @@ std::string ProtocolSilvanChip::getStringForMethod(int method, unsigned char dat
} }
std::string ProtocolSilvanChip::getString(const std::string &preamble, const std::string &one, const std::string &zero, int button) { std::string ProtocolSilvanChip::getString(const std::string &preamble, const std::string &one, const std::string &zero, int button) {
int intHouse = this->getIntParameter(L"house", 1, 1048575); int intHouse = this->getIntParameter(L"house", 1, 1048575);
std::string strReturn = preamble; std::string strReturn = preamble;

1
telldus-core/service/ProtocolX10.cpp
View file

@ -111,7 +111,6 @@ std::string ProtocolX10::getStringForMethod(int method, unsigned char data, Cont
strReturn.append( reinterpret_cast<const char*>(STOP_CODE) ); strReturn.append( reinterpret_cast<const char*>(STOP_CODE) );
strReturn.append("+"); strReturn.append("+");
return strReturn; return strReturn;
} }
std::string ProtocolX10::decodeData(ControllerMessage& dataMsg) { std::string ProtocolX10::decodeData(ControllerMessage& dataMsg) {

2
telldus-core/service/SettingsConfuse.cpp
View file

@ -156,7 +156,6 @@ int Settings::removeNode(Node type, int intNodeId) {
// Print all opts // Print all opts
for(int i = 0; d->cfg->opts[i].name; i++) { for(int i = 0; d->cfg->opts[i].name; i++) {
// Check if it isn't a device section // Check if it isn't a device section
if (strcmp(d->cfg->opts[i].name, strType.c_str()) != 0) { if (strcmp(d->cfg->opts[i].name, strType.c_str()) != 0) {
cfg_opt_print(&d->cfg->opts[i], fp); cfg_opt_print(&d->cfg->opts[i], fp);
@ -416,7 +415,6 @@ bool readConfig(cfg_t **cfg) {
} }
bool readVarConfig(cfg_t **cfg) { bool readVarConfig(cfg_t **cfg) {
cfg_opt_t device_opts[] = { cfg_opt_t device_opts[] = {
CFG_INT(const_cast<char *>("state"), 0, CFGF_NONE), CFG_INT(const_cast<char *>("state"), 0, CFGF_NONE),
CFG_STR(const_cast<char *>("stateValue"), const_cast<char *>(""), CFGF_NONE), CFG_STR(const_cast<char *>("stateValue"), const_cast<char *>(""), CFGF_NONE),

2
telldus-core/service/TellStick_libftdi.cpp
View file

@ -65,7 +65,6 @@ TellStick::TellStick(int controllerId, TelldusCore::EventRef event, TelldusCore:
ftdi_set_latency_timer(&d->ftHandle, 16); ftdi_set_latency_timer(&d->ftHandle, 16);
if (d->open) { if (d->open) {
if (td.pid == 0x0C31) { if (td.pid == 0x0C31) {
this->setBaud(9600); this->setBaud(9600);
} else { } else {
@ -258,7 +257,6 @@ std::list<TellStickDescriptor> TellStick::findAll() {
} }
return tellstick; return tellstick;
} }
bool TellStick::stillConnected() const { bool TellStick::stillConnected() const {