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

Removed blank lines at start/end of code blocks according to Google style guidelines "whitespace/blank_line"

Browse source
This commit is contained in:
Stefan Persson 2012-12-05 12:39:44 +01:00
parent 68a041edb4
commit fcb798d466
5 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -150,7 +150,6 @@ std::wstring Socket::read(int timeout) {
} }
void Socket::write(const std::wstring &msg) { void Socket::write(const std::wstring &msg) {
OVERLAPPED oOverlap; OVERLAPPED oOverlap;
DWORD bytesWritten = 0; DWORD bytesWritten = 0;
int result; int result;

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

@ -46,7 +46,6 @@ inline void dlog(const char *fmt, ...) {
} }
inline void debuglogfilename(const int intMessage, const std::string strMessage, const std::string filename) { inline void debuglogfilename(const int intMessage, const std::string strMessage, const std::string filename) {
#ifdef _WINDOWS #ifdef _WINDOWS
static bool firstRun = true; static bool firstRun = true;
std::ofstream file; std::ofstream file;

4
telldus-core/service/SettingsWinRegistry.cpp
View file

@ -60,7 +60,6 @@ int Settings::getNumberOfNodes(Node type) const {
long lnExists = RegOpenKeyEx(d->rootKey, d->getNodePath(type).c_str(), 0, KEY_QUERY_VALUE, &hk); long lnExists = RegOpenKeyEx(d->rootKey, d->getNodePath(type).c_str(), 0, KEY_QUERY_VALUE, &hk);
if(lnExists == ERROR_SUCCESS) { if(lnExists == ERROR_SUCCESS) {
std::wstring strNumSubKeys; std::wstring strNumSubKeys;
DWORD dNumSubKeys; DWORD dNumSubKeys;
RegQueryInfoKey(hk, NULL, NULL, NULL, &dNumSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); RegQueryInfoKey(hk, NULL, NULL, NULL, &dNumSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@ -82,7 +81,6 @@ int Settings::getNodeId(Node type, int intNodeIndex) const {
long lnExists = RegOpenKeyEx(d->rootKey, d->getNodePath(type).c_str(), 0, KEY_READ, &hk); long lnExists = RegOpenKeyEx(d->rootKey, d->getNodePath(type).c_str(), 0, KEY_READ, &hk);
if(lnExists == ERROR_SUCCESS) { if(lnExists == ERROR_SUCCESS) {
wchar_t* Buff = new wchar_t[intMaxRegValueLength]; wchar_t* Buff = new wchar_t[intMaxRegValueLength];
DWORD size = intMaxRegValueLength; DWORD size = intMaxRegValueLength;
if (RegEnumKeyEx(hk, intNodeIndex, (LPWSTR)Buff, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { if (RegEnumKeyEx(hk, intNodeIndex, (LPWSTR)Buff, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {
@ -223,7 +221,6 @@ std::wstring Settings::getStringSetting(Node type, int intNodeId, const std::wst
} }
int Settings::setStringSetting(Node type, int intNodeId, const std::wstring &name, const std::wstring &value, bool parameter) { int Settings::setStringSetting(Node type, int intNodeId, const std::wstring &name, const std::wstring &value, bool parameter) {
HKEY hk; HKEY hk;
int ret = TELLSTICK_SUCCESS; int ret = TELLSTICK_SUCCESS;
@ -241,7 +238,6 @@ int Settings::setStringSetting(Node type, int intNodeId, const std::wstring &nam
RegCloseKey(hk); RegCloseKey(hk);
return ret; return ret;
} }
int Settings::getIntSetting(Node type, int intNodeId, const std::wstring &name, bool parameter) const { int Settings::getIntSetting(Node type, int intNodeId, const std::wstring &name, bool parameter) const {

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

@ -29,7 +29,6 @@ TelldusWinService::~TelldusWinService() {
delete tm; delete tm;
} }
void TelldusWinService::stop() { void TelldusWinService::stop() {
tm->stop(); tm->stop();
} }

2
telldus-core/service/TelldusWinService_win.h
View file

@ -24,7 +24,6 @@ public:
static void WINAPI serviceMain( DWORD /*argc*/, TCHAR* /*argv*/[] ); static void WINAPI serviceMain( DWORD /*argc*/, TCHAR* /*argv*/[] );
protected: protected:
void stop(); void stop();
DWORD WINAPI serviceControlHandler( DWORD controlCode, DWORD dwEventType, LPVOID lpEventData ); DWORD WINAPI serviceControlHandler( DWORD controlCode, DWORD dwEventType, LPVOID lpEventData );
@ -36,6 +35,5 @@ private:
SERVICE_STATUS_HANDLE serviceStatusHandle; SERVICE_STATUS_HANDLE serviceStatusHandle;
static DWORD WINAPI serviceControlHandler( DWORD controlCode, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext ); static DWORD WINAPI serviceControlHandler( DWORD controlCode, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext );
}; };
#endif // TELLDUS_CORE_SERVICE_TELLDUSWINSERVICE_WIN_H_ #endif // TELLDUS_CORE_SERVICE_TELLDUSWINSERVICE_WIN_H_