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

dropped "c" prefix from class names

Browse Source
This commit is contained in:
Nick Bolton
2014-11-11 13:51:47 +00:00
parent f6c05e7635
commit e8e156f0e2
382 changed files with 7430 additions and 7423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
View File

@@ -43,8 +43,8 @@ const UINT CMSWindowsClientTaskBarReceiver::s_stateToIconID[kMaxState] =
};
CMSWindowsClientTaskBarReceiver::CMSWindowsClientTaskBarReceiver(
HINSTANCE appInstance, const CBufferedLogOutputter* logBuffer, IEventQueue* events) :
CClientTaskBarReceiver(events),
HINSTANCE appInstance, const BufferedLogOutputter* logBuffer, IEventQueue* events) :
ClientTaskBarReceiver(events),
m_appInstance(appInstance),
m_window(NULL),
m_logBuffer(logBuffer)
@@ -229,8 +229,8 @@ CMSWindowsClientTaskBarReceiver::copyLog() const
{
if (m_logBuffer != NULL) {
// collect log buffer
CString data;
for (CBufferedLogOutputter::const_iterator index = m_logBuffer->begin();
String data;
for (BufferedLogOutputter::const_iterator index = m_logBuffer->begin();
index != m_logBuffer->end(); ++index) {
data += *index;
data += "\n";
@@ -297,14 +297,14 @@ CMSWindowsClientTaskBarReceiver::createWindow()
SetWindowLongPtr(m_window, GWL_EXSTYLE, style);
// tell the task bar about this dialog
CArchTaskBarWindows::addDialog(m_window);
ArchTaskBarWindows::addDialog(m_window);
}
void
CMSWindowsClientTaskBarReceiver::destroyWindow()
{
if (m_window != NULL) {
CArchTaskBarWindows::removeDialog(m_window);
ArchTaskBarWindows::removeDialog(m_window);
DestroyWindow(m_window);
m_window = NULL;
}
@@ -359,14 +359,14 @@ CMSWindowsClientTaskBarReceiver::staticDlgProc(HWND hwnd,
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer, IEventQueue* events)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
CArchMiscWindows::setIcons(
(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
ArchMiscWindows::setIcons(
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
32, 32, LR_SHARED),
(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
16, 16, LR_SHARED));

12
src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h
View File

@@ -23,13 +23,13 @@
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
class CBufferedLogOutputter;
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of CClientTaskBarReceiver for Microsoft Windows
class CMSWindowsClientTaskBarReceiver : public CClientTaskBarReceiver {
//! Implementation of ClientTaskBarReceiver for Microsoft Windows
class CMSWindowsClientTaskBarReceiver : public ClientTaskBarReceiver {
public:
CMSWindowsClientTaskBarReceiver(HINSTANCE, const CBufferedLogOutputter*, IEventQueue* events);
CMSWindowsClientTaskBarReceiver(HINSTANCE, const BufferedLogOutputter*, IEventQueue* events);
virtual ~CMSWindowsClientTaskBarReceiver();
// IArchTaskBarReceiver overrides
@@ -42,7 +42,7 @@ public:
protected:
void copyLog() const;
// CClientTaskBarReceiver overrides
// ClientTaskBarReceiver overrides
virtual void onStatusChanged();
private:
@@ -62,7 +62,7 @@ private:
HWND m_window;
HMENU m_menu;
HICON m_icon[kMaxState];
const CBufferedLogOutputter* m_logBuffer;
const BufferedLogOutputter* m_logBuffer;
static const UINT s_stateToIconID[];
};

22
src/cmd/synergyc/OSXClientTaskBarReceiver.cpp
View File

@@ -20,50 +20,50 @@
#include "arch/Arch.h"
//
// COSXClientTaskBarReceiver
// OSXClientTaskBarReceiver
//
COSXClientTaskBarReceiver::COSXClientTaskBarReceiver(
const CBufferedLogOutputter*,
OSXClientTaskBarReceiver::OSXClientTaskBarReceiver(
const BufferedLogOutputter*,
IEventQueue* events) :
CClientTaskBarReceiver(events)
ClientTaskBarReceiver(events)
{
// add ourself to the task bar
ARCH->addReceiver(this);
}
COSXClientTaskBarReceiver::~COSXClientTaskBarReceiver()
OSXClientTaskBarReceiver::~OSXClientTaskBarReceiver()
{
ARCH->removeReceiver(this);
}
void
COSXClientTaskBarReceiver::showStatus()
OSXClientTaskBarReceiver::showStatus()
{
// do nothing
}
void
COSXClientTaskBarReceiver::runMenu(int, int)
OSXClientTaskBarReceiver::runMenu(int, int)
{
// do nothing
}
void
COSXClientTaskBarReceiver::primaryAction()
OSXClientTaskBarReceiver::primaryAction()
{
// do nothing
}
const IArchTaskBarReceiver::Icon
COSXClientTaskBarReceiver::getIcon() const
OSXClientTaskBarReceiver::getIcon() const
{
return NULL;
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer, IEventQueue* events)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
return new COSXClientTaskBarReceiver(logBuffer, events);
return new OSXClientTaskBarReceiver(logBuffer, events);
}

10
src/cmd/synergyc/OSXClientTaskBarReceiver.h
View File

@@ -20,14 +20,14 @@
#include "synergy/ClientTaskBarReceiver.h"
class CBufferedLogOutputter;
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of CClientTaskBarReceiver for OS X
class COSXClientTaskBarReceiver : public CClientTaskBarReceiver {
//! Implementation of ClientTaskBarReceiver for OS X
class OSXClientTaskBarReceiver : public ClientTaskBarReceiver {
public:
COSXClientTaskBarReceiver(const CBufferedLogOutputter*, IEventQueue* events);
virtual ~COSXClientTaskBarReceiver();
OSXClientTaskBarReceiver(const BufferedLogOutputter*, IEventQueue* events);
virtual ~OSXClientTaskBarReceiver();
// IArchTaskBarReceiver overrides
virtual void showStatus();

6
src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp
View File

@@ -24,9 +24,9 @@
//
CXWindowsClientTaskBarReceiver::CXWindowsClientTaskBarReceiver(
const CBufferedLogOutputter*,
const BufferedLogOutputter*,
IEventQueue* events) :
CClientTaskBarReceiver(events)
ClientTaskBarReceiver(events)
{
// add ourself to the task bar
ARCH->addReceiver(this);
@@ -62,7 +62,7 @@ CXWindowsClientTaskBarReceiver::getIcon() const
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer, IEventQueue* events)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
return new CXWindowsClientTaskBarReceiver(logBuffer, events);
}

8
src/cmd/synergyc/XWindowsClientTaskBarReceiver.h
View File

@@ -20,14 +20,14 @@
#include "synergy/ClientTaskBarReceiver.h"
class CBufferedLogOutputter;
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of CClientTaskBarReceiver for X Windows
class CXWindowsClientTaskBarReceiver : public CClientTaskBarReceiver {
//! Implementation of ClientTaskBarReceiver for X Windows
class CXWindowsClientTaskBarReceiver : public ClientTaskBarReceiver {
public:
CXWindowsClientTaskBarReceiver(
const CBufferedLogOutputter*, IEventQueue* events);
const BufferedLogOutputter*, IEventQueue* events);
virtual ~CXWindowsClientTaskBarReceiver();
// IArchTaskBarReceiver overrides

10
src/cmd/synergyc/synergyc.cpp
View File

@@ -36,15 +36,15 @@ main(int argc, char** argv)
{
#if SYSAPI_WIN32
// record window instance for tray icon, etc
CArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
#endif
CArch arch;
Arch arch;
arch.init();
CLog log;
CEventQueue events;
Log log;
EventQueue events;
CClientApp app(&events, createTaskBarReceiver);
ClientApp app(&events, createTaskBarReceiver);
return app.run(argc, argv);
}

4
src/cmd/synergyd/synergyd.cpp
View File

@@ -25,7 +25,7 @@
int
main(int argc, char** argv)
{
CDaemonApp app;
DaemonApp app;
return app.run(argc, argv);
}
@@ -37,7 +37,7 @@ main(int argc, char** argv)
int WINAPI
WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
{
CDaemonApp app;
DaemonApp app;
return app.run(__argc, __argv);
}

26
src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp
View File

@@ -42,8 +42,8 @@ const UINT CMSWindowsPortableTaskBarReceiver::s_stateToIconID[kMaxState] =
};
CMSWindowsPortableTaskBarReceiver::CMSWindowsPortableTaskBarReceiver(
HINSTANCE appInstance, const CBufferedLogOutputter* logBuffer, IEventQueue* events) :
CPortableTaskBarReceiver(events),
HINSTANCE appInstance, const BufferedLogOutputter* logBuffer, IEventQueue* events) :
PortableTaskBarReceiver(events),
m_events(events),
m_appInstance(appInstance),
m_window(NULL),
@@ -181,17 +181,17 @@ CMSWindowsPortableTaskBarReceiver::runMenu(int x, int y)
break;
case IDC_RELOAD_CONFIG:
m_events->addEvent(CEvent(m_events->forCServerApp().reloadConfig(),
m_events->addEvent(Event(m_events->forCServerApp().reloadConfig(),
m_events->getSystemTarget()));
break;
case IDC_FORCE_RECONNECT:
m_events->addEvent(CEvent(m_events->forCServerApp().forceReconnect(),
m_events->addEvent(Event(m_events->forCServerApp().forceReconnect(),
m_events->getSystemTarget()));
break;
case ID_SYNERGY_RESETSERVER:
m_events->addEvent(CEvent(m_events->forCServerApp().resetServer(),
m_events->addEvent(Event(m_events->forCServerApp().resetServer(),
m_events->getSystemTarget()));
break;
@@ -246,8 +246,8 @@ CMSWindowsPortableTaskBarReceiver::copyLog() const
{
if (m_logBuffer != NULL) {
// collect log buffer
CString data;
for (CBufferedLogOutputter::const_iterator index = m_logBuffer->begin();
String data;
for (BufferedLogOutputter::const_iterator index = m_logBuffer->begin();
index != m_logBuffer->end(); ++index) {
data += *index;
data += "\n";
@@ -314,14 +314,14 @@ CMSWindowsPortableTaskBarReceiver::createWindow()
SetWindowLongPtr(m_window, GWL_EXSTYLE, style);
// tell the task bar about this dialog
CArchTaskBarWindows::addDialog(m_window);
ArchTaskBarWindows::addDialog(m_window);
}
void
CMSWindowsPortableTaskBarReceiver::destroyWindow()
{
if (m_window != NULL) {
CArchTaskBarWindows::removeDialog(m_window);
ArchTaskBarWindows::removeDialog(m_window);
DestroyWindow(m_window);
m_window = NULL;
}
@@ -377,14 +377,14 @@ CMSWindowsPortableTaskBarReceiver::staticDlgProc(HWND hwnd,
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer, IEventQueue* events)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
CArchMiscWindows::setIcons(
(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
ArchMiscWindows::setIcons(
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
32, 32, LR_SHARED),
(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
16, 16, LR_SHARED));

12
src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.h
View File

@@ -23,13 +23,13 @@
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
class CBufferedLogOutputter;
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of CPortableTaskBarReceiver for Microsoft Windows
class CMSWindowsPortableTaskBarReceiver : public CPortableTaskBarReceiver {
//! Implementation of PortableTaskBarReceiver for Microsoft Windows
class CMSWindowsPortableTaskBarReceiver : public PortableTaskBarReceiver {
public:
CMSWindowsPortableTaskBarReceiver(HINSTANCE, const CBufferedLogOutputter*, IEventQueue* events);
CMSWindowsPortableTaskBarReceiver(HINSTANCE, const BufferedLogOutputter*, IEventQueue* events);
virtual ~CMSWindowsPortableTaskBarReceiver();
// IArchTaskBarReceiver overrides
@@ -42,7 +42,7 @@ public:
protected:
void copyLog() const;
// CPortableTaskBarReceiver overrides
// PortableTaskBarReceiver overrides
virtual void onStatusChanged();
private:
@@ -62,7 +62,7 @@ private:
HWND m_window;
HMENU m_menu;
HICON m_icon[kMaxState];
const CBufferedLogOutputter* m_logBuffer;
const BufferedLogOutputter* m_logBuffer;
IEventQueue* m_events;
static const UINT s_stateToIconID[];

20
src/cmd/synergyp/OSXPortableTaskBarReceiver.cpp
View File

@@ -20,47 +20,47 @@
#include "arch/Arch.h"
//
// COSXServerTaskBarReceiver
// OSXServerTaskBarReceiver
//
COSXServerTaskBarReceiver::COSXServerTaskBarReceiver(
const CBufferedLogOutputter*)
OSXServerTaskBarReceiver::OSXServerTaskBarReceiver(
const BufferedLogOutputter*)
{
// add ourself to the task bar
ARCH->addReceiver(this);
}
COSXServerTaskBarReceiver::~COSXServerTaskBarReceiver()
OSXServerTaskBarReceiver::~OSXServerTaskBarReceiver()
{
ARCH->removeReceiver(this);
}
void
COSXServerTaskBarReceiver::showStatus()
OSXServerTaskBarReceiver::showStatus()
{
// do nothing
}
void
COSXServerTaskBarReceiver::runMenu(int, int)
OSXServerTaskBarReceiver::runMenu(int, int)
{
// do nothing
}
void
COSXServerTaskBarReceiver::primaryAction()
OSXServerTaskBarReceiver::primaryAction()
{
// do nothing
}
const IArchTaskBarReceiver::Icon
COSXServerTaskBarReceiver::getIcon() const
OSXServerTaskBarReceiver::getIcon() const
{
return NULL;
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer)
{
return new COSXServerTaskBarReceiver(logBuffer);
return new OSXServerTaskBarReceiver(logBuffer);
}

10
src/cmd/synergyp/OSXPortableTaskBarReceiver.h
View File

@@ -20,13 +20,13 @@
#include "synergyp/PortableTaskBarReceiver.h"
class CBufferedLogOutputter;
class BufferedLogOutputter;
//! Implementation of CPortableTaskBarReceiver for OS X
class COSXServerTaskBarReceiver : public CPortableTaskBarReceiver {
//! Implementation of PortableTaskBarReceiver for OS X
class OSXServerTaskBarReceiver : public PortableTaskBarReceiver {
public:
COSXServerTaskBarReceiver(const CBufferedLogOutputter*);
virtual ~COSXServerTaskBarReceiver();
OSXServerTaskBarReceiver(const BufferedLogOutputter*);
virtual ~OSXServerTaskBarReceiver();
// IArchTaskBarReceiver overrides
virtual void showStatus();

4
src/cmd/synergyp/XWindowsPortableTaskBarReceiver.cpp
View File

@@ -24,7 +24,7 @@
//
CXWindowsServerTaskBarReceiver::CXWindowsServerTaskBarReceiver(
const CBufferedLogOutputter*)
const BufferedLogOutputter*)
{
// add ourself to the task bar
ARCH->addReceiver(this);
@@ -60,7 +60,7 @@ CXWindowsServerTaskBarReceiver::getIcon() const
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer)
{
return new CXWindowsServerTaskBarReceiver(logBuffer);
}

8
src/cmd/synergyp/XWindowsPortableTaskBarReceiver.h
View File

@@ -20,12 +20,12 @@
#include "synergyp/PortableTaskBarReceiver.h"
class CBufferedLogOutputter;
class BufferedLogOutputter;
//! Implementation of CPortableTaskBarReceiver for X Windows
class CXWindowsServerTaskBarReceiver : public CPortableTaskBarReceiver {
//! Implementation of PortableTaskBarReceiver for X Windows
class CXWindowsServerTaskBarReceiver : public PortableTaskBarReceiver {
public:
CXWindowsServerTaskBarReceiver(const CBufferedLogOutputter*);
CXWindowsServerTaskBarReceiver(const BufferedLogOutputter*);
virtual ~CXWindowsServerTaskBarReceiver();
// IArchTaskBarReceiver overrides

14
src/cmd/synergyp/synergyp.cpp
View File

@@ -39,16 +39,16 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, INT nCmdSh
{
#if SYSAPI_WIN32
// record window instance for tray icon, etc
CArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
#endif
CArch arch;
Arch arch;
arch.init();
CLog log;
CEventQueue events;
Log log;
EventQueue events;
CLOG->insert(new CMesssageBoxLogOutputter());
CLOG->insert(new MesssageBoxLogOutputter());
int argc = __argc;
char** argv = __argv;
@@ -79,11 +79,11 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, INT nCmdSh
}
if (server) {
CServerApp app(&events, createTaskBarReceiver);
ServerApp app(&events, createTaskBarReceiver);
return app.run(argc, argv);
}
else if (client) {
CClientApp app(&events, createTaskBarReceiver);
ClientApp app(&events, createTaskBarReceiver);
return app.run(argc, argv);
}

30
src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
View File

@@ -43,8 +43,8 @@ const UINT CMSWindowsServerTaskBarReceiver::s_stateToIconID[kMaxState] =
};
CMSWindowsServerTaskBarReceiver::CMSWindowsServerTaskBarReceiver(
HINSTANCE appInstance, const CBufferedLogOutputter* logBuffer, IEventQueue* events) :
CServerTaskBarReceiver(events),
HINSTANCE appInstance, const BufferedLogOutputter* logBuffer, IEventQueue* events) :
ServerTaskBarReceiver(events),
m_events(events),
m_appInstance(appInstance),
m_window(NULL),
@@ -93,7 +93,7 @@ CMSWindowsServerTaskBarReceiver::showStatus()
std::string status = getToolTip();
// get the connect clients, if any
const CClients& clients = getClients();
const Clients& clients = getClients();
// done getting status
unlock();
@@ -103,7 +103,7 @@ CMSWindowsServerTaskBarReceiver::showStatus()
SendMessage(child, WM_SETTEXT, 0, (LPARAM)status.c_str());
child = GetDlgItem(m_window, IDC_TASKBAR_STATUS_CLIENTS);
SendMessage(child, LB_RESETCONTENT, 0, 0);
for (CClients::const_iterator index = clients.begin();
for (Clients::const_iterator index = clients.begin();
index != clients.end(); ) {
const char* client = index->c_str();
if (++index == clients.end()) {
@@ -195,17 +195,17 @@ CMSWindowsServerTaskBarReceiver::runMenu(int x, int y)
break;
case IDC_RELOAD_CONFIG:
m_events->addEvent(CEvent(m_events->forCServerApp().reloadConfig(),
m_events->addEvent(Event(m_events->forCServerApp().reloadConfig(),
m_events->getSystemTarget()));
break;
case IDC_FORCE_RECONNECT:
m_events->addEvent(CEvent(m_events->forCServerApp().forceReconnect(),
m_events->addEvent(Event(m_events->forCServerApp().forceReconnect(),
m_events->getSystemTarget()));
break;
case ID_SYNERGY_RESETSERVER:
m_events->addEvent(CEvent(m_events->forCServerApp().resetServer(),
m_events->addEvent(Event(m_events->forCServerApp().resetServer(),
m_events->getSystemTarget()));
break;
@@ -260,8 +260,8 @@ CMSWindowsServerTaskBarReceiver::copyLog() const
{
if (m_logBuffer != NULL) {
// collect log buffer
CString data;
for (CBufferedLogOutputter::const_iterator index = m_logBuffer->begin();
String data;
for (BufferedLogOutputter::const_iterator index = m_logBuffer->begin();
index != m_logBuffer->end(); ++index) {
data += *index;
data += "\n";
@@ -328,14 +328,14 @@ CMSWindowsServerTaskBarReceiver::createWindow()
SetWindowLongPtr(m_window, GWL_EXSTYLE, style);
// tell the task bar about this dialog
CArchTaskBarWindows::addDialog(m_window);
ArchTaskBarWindows::addDialog(m_window);
}
void
CMSWindowsServerTaskBarReceiver::destroyWindow()
{
if (m_window != NULL) {
CArchTaskBarWindows::removeDialog(m_window);
ArchTaskBarWindows::removeDialog(m_window);
DestroyWindow(m_window);
m_window = NULL;
}
@@ -391,14 +391,14 @@ CMSWindowsServerTaskBarReceiver::staticDlgProc(HWND hwnd,
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer, IEventQueue* events)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
CArchMiscWindows::setIcons(
(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
ArchMiscWindows::setIcons(
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
32, 32, LR_SHARED),
(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
16, 16, LR_SHARED));

12
src/cmd/synergys/MSWindowsServerTaskBarReceiver.h
View File

@@ -23,13 +23,13 @@
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
class CBufferedLogOutputter;
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of CServerTaskBarReceiver for Microsoft Windows
class CMSWindowsServerTaskBarReceiver : public CServerTaskBarReceiver {
//! Implementation of ServerTaskBarReceiver for Microsoft Windows
class CMSWindowsServerTaskBarReceiver : public ServerTaskBarReceiver {
public:
CMSWindowsServerTaskBarReceiver(HINSTANCE, const CBufferedLogOutputter*, IEventQueue* events);
CMSWindowsServerTaskBarReceiver(HINSTANCE, const BufferedLogOutputter*, IEventQueue* events);
virtual ~CMSWindowsServerTaskBarReceiver();
// IArchTaskBarReceiver overrides
@@ -42,7 +42,7 @@ public:
protected:
void copyLog() const;
// CServerTaskBarReceiver overrides
// ServerTaskBarReceiver overrides
virtual void onStatusChanged();
private:
@@ -62,7 +62,7 @@ private:
HWND m_window;
HMENU m_menu;
HICON m_icon[kMaxState];
const CBufferedLogOutputter* m_logBuffer;
const BufferedLogOutputter* m_logBuffer;
IEventQueue* m_events;
static const UINT s_stateToIconID[];

22
src/cmd/synergys/OSXServerTaskBarReceiver.cpp
View File

@@ -20,48 +20,48 @@
#include "arch/Arch.h"
//
// COSXServerTaskBarReceiver
// OSXServerTaskBarReceiver
//
COSXServerTaskBarReceiver::COSXServerTaskBarReceiver(
const CBufferedLogOutputter*, IEventQueue* events) :
CServerTaskBarReceiver(events)
OSXServerTaskBarReceiver::OSXServerTaskBarReceiver(
const BufferedLogOutputter*, IEventQueue* events) :
ServerTaskBarReceiver(events)
{
// add ourself to the task bar
ARCH->addReceiver(this);
}
COSXServerTaskBarReceiver::~COSXServerTaskBarReceiver()
OSXServerTaskBarReceiver::~OSXServerTaskBarReceiver()
{
ARCH->removeReceiver(this);
}
void
COSXServerTaskBarReceiver::showStatus()
OSXServerTaskBarReceiver::showStatus()
{
// do nothing
}
void
COSXServerTaskBarReceiver::runMenu(int, int)
OSXServerTaskBarReceiver::runMenu(int, int)
{
// do nothing
}
void
COSXServerTaskBarReceiver::primaryAction()
OSXServerTaskBarReceiver::primaryAction()
{
// do nothing
}
const IArchTaskBarReceiver::Icon
COSXServerTaskBarReceiver::getIcon() const
OSXServerTaskBarReceiver::getIcon() const
{
return NULL;
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer, IEventQueue* events)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
return new COSXServerTaskBarReceiver(logBuffer, events);
return new OSXServerTaskBarReceiver(logBuffer, events);
}

10
src/cmd/synergys/OSXServerTaskBarReceiver.h
View File

@@ -20,13 +20,13 @@
#include "synergy/ServerTaskBarReceiver.h"
class CBufferedLogOutputter;
class BufferedLogOutputter;
//! Implementation of CServerTaskBarReceiver for OS X
class COSXServerTaskBarReceiver : public CServerTaskBarReceiver {
//! Implementation of ServerTaskBarReceiver for OS X
class OSXServerTaskBarReceiver : public ServerTaskBarReceiver {
public:
COSXServerTaskBarReceiver(const CBufferedLogOutputter*, IEventQueue* events);
virtual ~COSXServerTaskBarReceiver();
OSXServerTaskBarReceiver(const BufferedLogOutputter*, IEventQueue* events);
virtual ~OSXServerTaskBarReceiver();
// IArchTaskBarReceiver overrides
virtual void showStatus();

6
src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp
View File

@@ -24,8 +24,8 @@
//
CXWindowsServerTaskBarReceiver::CXWindowsServerTaskBarReceiver(
const CBufferedLogOutputter*, IEventQueue* events) :
CServerTaskBarReceiver(events)
const BufferedLogOutputter*, IEventQueue* events) :
ServerTaskBarReceiver(events)
{
// add ourself to the task bar
ARCH->addReceiver(this);
@@ -61,7 +61,7 @@ CXWindowsServerTaskBarReceiver::getIcon() const
}
IArchTaskBarReceiver*
createTaskBarReceiver(const CBufferedLogOutputter* logBuffer, IEventQueue* events)
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
return new CXWindowsServerTaskBarReceiver(logBuffer, events);
}

8
src/cmd/synergys/XWindowsServerTaskBarReceiver.h
View File

@@ -20,14 +20,14 @@
#include "synergy/ServerTaskBarReceiver.h"
class CBufferedLogOutputter;
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of CServerTaskBarReceiver for X Windows
class CXWindowsServerTaskBarReceiver : public CServerTaskBarReceiver {
//! Implementation of ServerTaskBarReceiver for X Windows
class CXWindowsServerTaskBarReceiver : public ServerTaskBarReceiver {
public:
CXWindowsServerTaskBarReceiver(
const CBufferedLogOutputter*, IEventQueue* events);
const BufferedLogOutputter*, IEventQueue* events);
virtual ~CXWindowsServerTaskBarReceiver();
// IArchTaskBarReceiver overrides

10
src/cmd/synergys/synergys.cpp
View File

@@ -36,15 +36,15 @@ main(int argc, char** argv)
{
#if SYSAPI_WIN32
// record window instance for tray icon, etc
CArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
#endif
CArch arch;
Arch arch;
arch.init();
CLog log;
CEventQueue events;
Log log;
EventQueue events;
CServerApp app(&events, createTaskBarReceiver);
ServerApp app(&events, createTaskBarReceiver);
return app.run(argc, argv);
}

6
src/cmd/syntool/syntool.cpp
View File

@@ -23,12 +23,12 @@ main(int argc, char** argv)
{
#if SYSAPI_WIN32
// record window instance for tray icon, etc
CArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
#endif
CArch arch;
Arch arch;
arch.init();
CToolApp app;
ToolApp app;
return app.run(argc, argv);
}