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

fixed: warnings on mac os x

Browse Source
This commit is contained in:
Nick Bolton
2014-02-25 15:03:43 +00:00
parent bdb4c47898
commit c44971b43d
42 changed files with 271 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/server/CClientProxy.h
View File

@@ -84,7 +84,6 @@ public:
virtual void screensaver(bool activate) = 0;
virtual void resetOptions() = 0;
virtual void setOptions(const COptionsList& options) = 0;
virtual void cryptoIv(const UInt8* iv) = 0;
virtual void draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) = 0;
virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0;

7
src/lib/server/CClientProxy1_0.cpp
View File

@@ -358,13 +358,6 @@ CClientProxy1_0::mouseWheel(SInt32, SInt32 yDelta)
CProtocolUtil::writef(getStream(), kMsgDMouseWheel1_0, yDelta);
}
void
CClientProxy1_0::cryptoIv(const UInt8* iv)
{
// ignore -- not supported in protocol 1.0
LOG((CLOG_DEBUG "cryptoIv not supported"));
}
void
CClientProxy1_0::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize)
{

1
src/lib/server/CClientProxy1_0.h
View File

@@ -59,7 +59,6 @@ public:
virtual void screensaver(bool activate);
virtual void resetOptions();
virtual void setOptions(const COptionsList& options);
virtual void cryptoIv(const UInt8* iv);
virtual void draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize);
virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize);

4
src/lib/server/CClientProxy1_3.cpp
View File

@@ -30,9 +30,9 @@
CClientProxy1_3::CClientProxy1_3(const CString& name, synergy::IStream* stream, IEventQueue* events) :
CClientProxy1_2(name, stream, events),
m_events(events),
m_keepAliveRate(kKeepAliveRate),
m_keepAliveTimer(NULL)
m_keepAliveTimer(NULL),
m_events(events)
{
setHeartbeatRate(kKeepAliveRate, kKeepAliveRate * kKeepAlivesUntilDeath);
}

4
src/lib/server/CClientProxyUnknown.cpp
View File

@@ -39,11 +39,11 @@
//
CClientProxyUnknown::CClientProxyUnknown(synergy::IStream* stream, double timeout, CServer* server, IEventQueue* events) :
m_events(events),
m_stream(stream),
m_proxy(NULL),
m_ready(false),
m_server(server)
m_server(server),
m_events(events)
{
assert(m_server != NULL);

4
src/lib/server/CConfig.cpp
View File

@@ -31,9 +31,9 @@
//
CConfig::CConfig(IEventQueue* events) :
m_events(events),
m_inputFilter(events),
m_hasLockToScreenAction(false),
m_inputFilter(events)
m_events(events)
{
// do nothing
}

56
src/lib/server/CInputFilter.cpp
View File

@@ -53,20 +53,20 @@ CInputFilter::CCondition::disablePrimary(CPrimaryClient*)
CInputFilter::CKeystrokeCondition::CKeystrokeCondition(
IEventQueue* events, IPlatformScreen::CKeyInfo* info) :
m_events(events),
m_id(0),
m_key(info->m_key),
m_mask(info->m_mask)
m_mask(info->m_mask),
m_events(events)
{
free(info);
}
CInputFilter::CKeystrokeCondition::CKeystrokeCondition(
IEventQueue* events, KeyID key, KeyModifierMask mask) :
m_events(events),
m_id(0),
m_key(key),
m_mask(mask)
m_mask(mask),
m_events(events)
{
// do nothing
}
@@ -143,18 +143,18 @@ CInputFilter::CKeystrokeCondition::disablePrimary(CPrimaryClient* primary)
CInputFilter::CMouseButtonCondition::CMouseButtonCondition(
IEventQueue* events, IPlatformScreen::CButtonInfo* info) :
m_events(events),
m_button(info->m_button),
m_mask(info->m_mask)
m_mask(info->m_mask),
m_events(events)
{
free(info);
}
CInputFilter::CMouseButtonCondition::CMouseButtonCondition(
IEventQueue* events, ButtonID button, KeyModifierMask mask) :
m_events(events),
m_button(button),
m_mask(mask)
m_mask(mask),
m_events(events)
{
// do nothing
}
@@ -227,8 +227,8 @@ CInputFilter::CMouseButtonCondition::match(const CEvent& event)
CInputFilter::CScreenConnectedCondition::CScreenConnectedCondition(
IEventQueue* events, const CString& screen) :
m_events(events),
m_screen(screen)
m_screen(screen),
m_events(events)
{
// do nothing
}
@@ -279,8 +279,8 @@ CInputFilter::CAction::~CAction()
CInputFilter::CLockCursorToScreenAction::CLockCursorToScreenAction(
IEventQueue* events, Mode mode) :
m_events(events),
m_mode(mode)
m_mode(mode),
m_events(events)
{
// do nothing
}
@@ -324,8 +324,8 @@ CInputFilter::CLockCursorToScreenAction::perform(const CEvent& event)
CInputFilter::CSwitchToScreenAction::CSwitchToScreenAction(
IEventQueue* events, const CString& screen) :
m_events(events),
m_screen(screen)
m_screen(screen),
m_events(events)
{
// do nothing
}
@@ -370,8 +370,8 @@ CInputFilter::CSwitchToScreenAction::perform(const CEvent& event)
CInputFilter::CSwitchInDirectionAction::CSwitchInDirectionAction(
IEventQueue* events, EDirection direction) :
m_events(events),
m_direction(direction)
m_direction(direction),
m_events(events)
{
// do nothing
}
@@ -414,8 +414,8 @@ CInputFilter::CSwitchInDirectionAction::perform(const CEvent& event)
CInputFilter::CKeyboardBroadcastAction::CKeyboardBroadcastAction(
IEventQueue* events, Mode mode) :
m_events(events),
m_mode(mode)
m_mode(mode),
m_events(events)
{
// do nothing
}
@@ -424,9 +424,9 @@ CInputFilter::CKeyboardBroadcastAction::CKeyboardBroadcastAction(
IEventQueue* events,
Mode mode,
const std::set<CString>& screens) :
m_events(events),
m_mode(mode),
m_screens(IKeyState::CKeyInfo::join(screens))
m_screens(IKeyState::CKeyInfo::join(screens)),
m_events(events)
{
// do nothing
}
@@ -486,9 +486,9 @@ CInputFilter::CKeyboardBroadcastAction::perform(const CEvent& event)
CInputFilter::CKeystrokeAction::CKeystrokeAction(
IEventQueue* events, IPlatformScreen::CKeyInfo* info, bool press) :
m_events(events),
m_keyInfo(info),
m_press(press)
m_press(press),
m_events(events)
{
// do nothing
}
@@ -574,9 +574,9 @@ CInputFilter::CKeystrokeAction::formatName() const
CInputFilter::CMouseButtonAction::CMouseButtonAction(
IEventQueue* events, IPlatformScreen::CButtonInfo* info, bool press) :
m_events(events),
m_buttonInfo(info),
m_press(press)
m_press(press),
m_events(events)
{
// do nothing
}
@@ -887,16 +887,16 @@ CInputFilter::CRule::getAction(bool onActivation, UInt32 index) const
// Input Filter Class
// -----------------------------------------------------------------------------
CInputFilter::CInputFilter(IEventQueue* events) :
m_events(events),
m_primaryClient(NULL)
m_primaryClient(NULL),
m_events(events)
{
// do nothing
}
CInputFilter::CInputFilter(const CInputFilter& x) :
m_events(x.m_events),
m_ruleList(x.m_ruleList),
m_primaryClient(NULL)
m_primaryClient(NULL),
m_events(x.m_events)
{
setPrimaryClient(x.m_primaryClient);
}

3
src/lib/server/CPrimaryClient.cpp
View File

@@ -28,8 +28,7 @@
CPrimaryClient::CPrimaryClient(const CString& name, CScreen* screen) :
CBaseClientProxy(name),
m_screen(screen),
m_fakeInputCount(0),
m_mock(false)
m_fakeInputCount(0)
{
// all clipboards are clean
for (UInt32 i = 0; i < kClipboardEnd; ++i) {

3
src/lib/server/CPrimaryClient.h
View File

@@ -39,7 +39,7 @@ public:
~CPrimaryClient();
#ifdef TEST_ENV
CPrimaryClient() : CBaseClientProxy(""), m_mock(true) { }
CPrimaryClient() : CBaseClientProxy("") { }
#endif
//! @name manipulators
@@ -151,7 +151,6 @@ private:
CScreen* m_screen;
bool m_clipboardDirty[kClipboardEnd];
SInt32 m_fakeInputCount;
bool m_mock;
};
#endif

3
src/lib/server/CServer.cpp
View File

@@ -48,7 +48,6 @@
//
CServer::CServer(CConfig& config, CPrimaryClient* primaryClient, CScreen* screen, IEventQueue* events, bool enableDragDrop) :
m_events(events),
m_mock(false),
m_primaryClient(primaryClient),
m_active(primaryClient),
@@ -75,6 +74,7 @@ CServer::CServer(CConfig& config, CPrimaryClient* primaryClient, CScreen* screen
m_keyboardBroadcasting(false),
m_lockedToScreen(false),
m_screen(screen),
m_events(events),
m_sendFileThread(NULL),
m_writeToDropDirThread(NULL),
m_ignoreFileTransfer(false),
@@ -190,7 +190,6 @@ CServer::CServer(CConfig& config, CPrimaryClient* primaryClient, CScreen* screen
m_inputFilter->setPrimaryClient(m_primaryClient);
// Determine if scroll lock is already set. If so, lock the cursor to the primary screen
int keyValue = m_primaryClient->getToggleMask();
if (m_primaryClient->getToggleMask() & KeyModifierScrollLock) {
LOG((CLOG_DEBUG "scroll lock on initially. locked to screen"));
m_lockedToScreen = true;