backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-05 03:17:51 +08:00
Code Issues Projects Releases Wiki Activity

- made unit testing easier by (mostly) removing the event queue singleton.

Browse Source 
- fixed code style in many places (mostly indentation).
This commit is contained in:
Nick Bolton
2013-06-29 14:17:49 +00:00
parent 13b2649fa0
commit 608074c041
143 changed files with 2220 additions and 2163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/lib/synergy/CPortableTaskBarReceiver.cpp
View File

@@ -27,7 +27,8 @@
// CPortableTaskBarReceiver
//
CPortableTaskBarReceiver::CPortableTaskBarReceiver() :
CPortableTaskBarReceiver::CPortableTaskBarReceiver(IEventQueue* events) :
m_events(events),
m_state(kNotRunning)
{
// do nothing
@@ -43,17 +44,17 @@ CPortableTaskBarReceiver::updateStatus(INode* node, const CString& errorMsg)
{
{
// update our status
m_errorMessage = errorMsg;
if (node == NULL) {
if (m_errorMessage.empty()) {
m_state = kNotRunning;
}
else {
m_state = kNotWorking;
}
}
else {
m_state = kNotConnected;
m_errorMessage = errorMsg;
if (node == NULL) {
if (m_errorMessage.empty()) {
m_state = kNotRunning;
}
else {
m_state = kNotWorking;
}
}
else {
m_state = kNotConnected;
}
// let subclasses have a go
@@ -79,7 +80,7 @@ CPortableTaskBarReceiver::getErrorMessage() const
void
CPortableTaskBarReceiver::quit()
{
EVENTQUEUE->addEvent(CEvent(CEvent::kQuit));
m_events->addEvent(CEvent(CEvent::kQuit));
}
void
@@ -118,24 +119,3 @@ CPortableTaskBarReceiver::getToolTip() const
return "";
}
}
CEvent::Type
CPortableTaskBarReceiver::getReloadConfigEvent()
{
// do nothing
return NULL;
}
CEvent::Type
CPortableTaskBarReceiver::getForceReconnectEvent()
{
// do nothing
return NULL;
}
CEvent::Type
CPortableTaskBarReceiver::getResetServerEvent()
{
// do nothing
return NULL;
}