#3305 Resolved namespace issue

This commit is contained in:
Jerry (Xinyu Hou) 2016-06-16 08:57:39 -07:00 committed by Andrew Nelless
parent b27a59fb0d
commit cc10e319d1
2 changed files with 6 additions and 6 deletions

View File

@ -54,4 +54,4 @@ typedef ::testing::NiceMock<MockKeyState> KeyStateImpl;
typedef UInt32 KeyID;
typedef void (*ForeachKeyCallback)(
KeyID, SInt32 group, CKeyMap::KeyItem&, void* userData);
KeyID, SInt32 group, synergy::KeyMap::KeyItem&, void* userData);

View File

@ -36,16 +36,16 @@ stubPollPressedKeys(IKeyState::KeyButtonSet& pressedKeys);
void
assertMaskIsOne(ForeachKeyCallback cb, void* userData);
const CKeyMap::KeyItem*
const synergy::KeyMap::KeyItem*
stubMapKey(
CKeyMap::Keystrokes& keys, KeyID id, SInt32 group,
CKeyMap::ModifierToKeys& activeModifiers,
synergy::KeyMap::Keystrokes& keys, KeyID id, SInt32 group,
synergy::KeyMap::ModifierToKeys& activeModifiers,
KeyModifierMask& currentState,
KeyModifierMask desiredMask,
bool isAutoRepeat);
CKeyMap::Keystroke s_stubKeystroke(1, false, false);
CKeyMap::KeyItem s_stubKeyItem;
synergy::KeyMap::Keystroke s_stubKeystroke(1, false, false);
synergy::KeyMap::KeyItem s_stubKeyItem;
TEST(CKeyStateTests, onKey_aKeyDown_keyStateOne)
{