This repository has been archived by the owner. It is now read-only.

/synergy-stable-builds forked from symless/synergy-core

Permalink
Browse files

Brutally replace all reinterpret_casts with static_casts

  • Loading branch information...
@nlyan
nlyan committed Sep 19, 2016
1 parent e6a3caa commit f3d1470e58b5a7f76e388b2bf170a9e5d2dd4729
Unified Split
Showing with 213 additions and 213 deletions.
  1. +6 −6 src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
  2. +8 −8 src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp
  3. +8 −8 src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
  4. +1 −1 src/gui/src/SynergyLocale.cpp
  5. +1 −1 src/lib/arch/unix/ArchMultithreadPosix.cpp
  6. +6 −6 src/lib/arch/unix/ArchNetworkBSD.cpp
  7. +7 −7 src/lib/arch/win32/ArchMiscWindows.cpp
  8. +2 −2 src/lib/arch/win32/ArchMultithreadWindows.cpp
  9. +5 −5 src/lib/arch/win32/ArchNetworkWinsock.cpp
  10. +11 −11 src/lib/arch/win32/ArchTaskBarWindows.cpp
  11. +1 −1 src/lib/arch/win32/ArchTimeWindows.cpp
  12. +1 −1 src/lib/base/EventQueue.cpp
  13. +25 −25 src/lib/base/Unicode.cpp
  14. +5 −5 src/lib/client/Client.cpp
  15. +2 −2 src/lib/io/StreamBuffer.cpp
  16. +1 −1 src/lib/io/StreamFilter.cpp
  17. +1 −1 src/lib/mt/Thread.cpp
  18. +1 −1 src/lib/net/SecureSocket.cpp
  19. +1 −1 src/lib/net/SocketMultiplexer.cpp
  20. +1 −1 src/lib/net/TCPListenSocket.cpp
  21. +1 −1 src/lib/net/TCPSocket.cpp
  22. +1 −1 src/lib/platform/MSWindowsClipboardBitmapConverter.cpp
  23. +5 −5 src/lib/platform/MSWindowsDesks.cpp
  24. +4 −4 src/lib/platform/MSWindowsScreen.cpp
  25. +2 −2 src/lib/platform/MSWindowsScreenSaver.cpp
  26. +2 −2 src/lib/platform/OSXClipboardBMPConverter.cpp
  27. +1 −1 src/lib/platform/OSXKeyState.cpp
  28. +1 −1 src/lib/platform/OSXScreen.cpp
  29. +13 −13 src/lib/platform/OSXUchrKeyResource.cpp
  30. +10 −10 src/lib/platform/XWindowsClipboard.cpp
  31. +2 −2 src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp
  32. +2 −2 src/lib/platform/XWindowsClipboardBMPConverter.cpp
  33. +1 −1 src/lib/platform/XWindowsKeyState.cpp
  34. +4 −4 src/lib/platform/XWindowsScreen.cpp
  35. +7 −7 src/lib/platform/XWindowsUtil.cpp
  36. +2 −2 src/lib/server/ClientListener.cpp
  37. +4 −4 src/lib/server/InputFilter.cpp
  38. +21 −21 src/lib/server/Server.cpp
  39. +2 −2 src/lib/synergy/ClientApp.cpp
  40. +5 −5 src/lib/synergy/ClipboardChunk.cpp
  41. +1 −1 src/lib/synergy/IClipboard.cpp
  42. +1 −1 src/lib/synergy/KeyState.cpp
  43. +14 −14 src/lib/synergy/ProtocolUtil.cpp
  44. +1 −1 src/lib/synergy/ServerApp.cpp
  45. +1 −1 src/lib/synergy/StreamChunker.cpp
  46. +11 −11 src/test/integtests/net/NetworkTests.cpp
View
12 src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
@@ -221,7 +221,7 @@ MSWindowsClientTaskBarReceiver::primaryAction()
const IArchTaskBarReceiver::Icon
MSWindowsClientTaskBarReceiver::getIcon() const
{
- return reinterpret_cast<Icon>(m_icon[getStatus()]);
+ return static_cast<Icon>(m_icon[getStatus()]);
}
void
@@ -263,7 +263,7 @@ MSWindowsClientTaskBarReceiver::loadIcon(UINT id)
IMAGE_ICON,
0, 0,
LR_DEFAULTCOLOR);
- return reinterpret_cast<HICON>(icon);
+ return static_cast<HICON>(icon);
}
void
@@ -287,8 +287,8 @@ MSWindowsClientTaskBarReceiver::createWindow()
MAKEINTRESOURCE(IDD_TASKBAR_STATUS),
NULL,
(DLGPROC)&MSWindowsClientTaskBarReceiver::staticDlgProc,
- reinterpret_cast<LPARAM>(
- reinterpret_cast<void*>(this)));
+ static_cast<LPARAM>(
+ static_cast<void*>(this)));
// window should appear on top of everything, including (especially)
// the task bar.
@@ -337,8 +337,8 @@ MSWindowsClientTaskBarReceiver::staticDlgProc(HWND hwnd,
// and put it in the extra window data then forward the call.
MSWindowsClientTaskBarReceiver* self = NULL;
if (msg == WM_INITDIALOG) {
- self = reinterpret_cast<MSWindowsClientTaskBarReceiver*>(
- reinterpret_cast<void*>(lParam));
+ self = static_cast<MSWindowsClientTaskBarReceiver*>(
+ static_cast<void*>(lParam));
SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) lParam);
}
else {
View
16 src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp
@@ -238,7 +238,7 @@ MSWindowsPortableTaskBarReceiver::primaryAction()
const IArchTaskBarReceiver::Icon
MSWindowsPortableTaskBarReceiver::getIcon() const
{
- return reinterpret_cast<Icon>(m_icon[getStatus()]);
+ return static_cast<Icon>(m_icon[getStatus()]);
}
void
@@ -280,7 +280,7 @@ MSWindowsPortableTaskBarReceiver::loadIcon(UINT id)
IMAGE_ICON,
0, 0,
LR_DEFAULTCOLOR);
- return reinterpret_cast<HICON>(icon);
+ return static_cast<HICON>(icon);
}
void
@@ -304,8 +304,8 @@ MSWindowsPortableTaskBarReceiver::createWindow()
MAKEINTRESOURCE(IDD_TASKBAR_STATUS),
NULL,
(DLGPROC)&MSWindowsPortableTaskBarReceiver::staticDlgProc,
- reinterpret_cast<LPARAM>(
- reinterpret_cast<void*>(this)));
+ static_cast<LPARAM>(
+ static_cast<void*>(this)));
// window should appear on top of everything, including (especially)
// the task bar.
@@ -354,16 +354,16 @@ MSWindowsPortableTaskBarReceiver::staticDlgProc(HWND hwnd,
// and put it in the extra window data then forward the call.
MSWindowsPortableTaskBarReceiver* self = NULL;
if (msg == WM_INITDIALOG) {
- self = reinterpret_cast<MSWindowsPortableTaskBarReceiver*>(
- reinterpret_cast<void*>(lParam));
+ self = static_cast<MSWindowsPortableTaskBarReceiver*>(
+ static_cast<void*>(lParam));
SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
}
else {
// get the extra window data and forward the call
LONG data = (LONG)GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (data != 0) {
- self = reinterpret_cast<MSWindowsPortableTaskBarReceiver*>(
- reinterpret_cast<void*>(data));
+ self = static_cast<MSWindowsPortableTaskBarReceiver*>(
+ static_cast<void*>(data));
}
}
View
16 src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
@@ -252,7 +252,7 @@ MSWindowsServerTaskBarReceiver::primaryAction()
const IArchTaskBarReceiver::Icon
MSWindowsServerTaskBarReceiver::getIcon() const
{
- return reinterpret_cast<Icon>(m_icon[getStatus()]);
+ return static_cast<Icon>(m_icon[getStatus()]);
}
void
@@ -294,7 +294,7 @@ MSWindowsServerTaskBarReceiver::loadIcon(UINT id)
IMAGE_ICON,
0, 0,
LR_DEFAULTCOLOR);
- return reinterpret_cast<HICON>(icon);
+ return static_cast<HICON>(icon);
}
void
@@ -318,8 +318,8 @@ MSWindowsServerTaskBarReceiver::createWindow()
MAKEINTRESOURCE(IDD_TASKBAR_STATUS),
NULL,
(DLGPROC)&MSWindowsServerTaskBarReceiver::staticDlgProc,
- reinterpret_cast<LPARAM>(
- reinterpret_cast<void*>(this)));
+ static_cast<LPARAM>(
+ static_cast<void*>(this)));
// window should appear on top of everything, including (especially)
// the task bar.
@@ -368,16 +368,16 @@ MSWindowsServerTaskBarReceiver::staticDlgProc(HWND hwnd,
// and put it in the extra window data then forward the call.
MSWindowsServerTaskBarReceiver* self = NULL;
if (msg == WM_INITDIALOG) {
- self = reinterpret_cast<MSWindowsServerTaskBarReceiver*>(
- reinterpret_cast<void*>(lParam));
+ self = static_cast<MSWindowsServerTaskBarReceiver*>(
+ static_cast<void*>(lParam));
SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
}
else {
// get the extra window data and forward the call
LONG data = (LONG)GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (data != 0) {
- self = reinterpret_cast<MSWindowsServerTaskBarReceiver*>(
- reinterpret_cast<void*>(data));
+ self = static_cast<MSWindowsServerTaskBarReceiver*>(
+ static_cast<void*>(data));
}
}
View
2 src/gui/src/SynergyLocale.cpp
@@ -29,7 +29,7 @@ SynergyLocale::SynergyLocale()
void SynergyLocale::loadLanguages()
{
QResource resource(":/res/lang/Languages.xml");
- QByteArray bytes(reinterpret_cast<const char*>(resource.data()), resource.size());
+ QByteArray bytes(static_cast<const char*>(resource.data()), resource.size());
QXmlStreamReader xml(bytes);
while (!xml.atEnd())
View
2 src/lib/arch/unix/ArchMultithreadPosix.cpp
@@ -697,7 +697,7 @@ void*
ArchMultithreadPosix::threadFunc(void* vrep)
{
// get the thread
- ArchThreadImpl* thread = reinterpret_cast<ArchThreadImpl*>(vrep);
+ ArchThreadImpl* thread = static_cast<ArchThreadImpl*>(vrep);
// setup pthreads
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
View
12 src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -646,7 +646,7 @@ ArchNetworkBSD::newAnyAddr(EAddressFamily family)
switch (family) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
ipAddr->sin_family = AF_INET;
ipAddr->sin_port = 0;
ipAddr->sin_addr.s_addr = INADDR_ANY;
@@ -738,7 +738,7 @@ ArchNetworkBSD::addrToName(ArchNetAddress addr)
// mutexed name lookup (ugh)
ARCH->lockMutex(m_mutex);
struct hostent* info = gethostbyaddr(
- reinterpret_cast<const char*>(&addr->m_addr),
+ static_cast<const char*>(&addr->m_addr),
addr->m_len, addr->m_addr.sa_family);
if (info == NULL) {
ARCH->unlockMutex(m_mutex);
@@ -762,7 +762,7 @@ ArchNetworkBSD::addrToString(ArchNetAddress addr)
switch (getAddrFamily(addr)) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
ARCH->lockMutex(m_mutex);
std::string s = inet_ntoa(ipAddr->sin_addr);
ARCH->unlockMutex(m_mutex);
@@ -797,7 +797,7 @@ ArchNetworkBSD::setAddrPort(ArchNetAddress addr, int port)
switch (getAddrFamily(addr)) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
ipAddr->sin_port = htons(port);
break;
}
@@ -816,7 +816,7 @@ ArchNetworkBSD::getAddrPort(ArchNetAddress addr)
switch (getAddrFamily(addr)) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
return ntohs(ipAddr->sin_port);
}
@@ -834,7 +834,7 @@ ArchNetworkBSD::isAnyAddr(ArchNetAddress addr)
switch (getAddrFamily(addr)) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
return (ipAddr->sin_addr.s_addr == INADDR_ANY &&
addr->m_len == (socklen_t)sizeof(struct sockaddr_in));
}
View
14 src/lib/arch/win32/ArchMiscWindows.cpp
@@ -234,7 +234,7 @@ ArchMiscWindows::setValue(HKEY key,
return;
}
RegSetValueEx(key, name, 0, REG_SZ,
- reinterpret_cast<const BYTE*>(value.c_str()),
+ static_cast<const BYTE*>(value.c_str()),
(DWORD)value.size() + 1);
}
@@ -247,7 +247,7 @@ ArchMiscWindows::setValue(HKEY key, const TCHAR* name, DWORD value)
return;
}
RegSetValueEx(key, name, 0, REG_DWORD,
- reinterpret_cast<CONST BYTE*>(&value),
+ static_cast<CONST BYTE*>(&value),
sizeof(DWORD));
}
@@ -262,7 +262,7 @@ ArchMiscWindows::setValueBinary(HKEY key,
return;
}
RegSetValueEx(key, name, 0, REG_BINARY,
- reinterpret_cast<const BYTE*>(value.data()),
+ static_cast<const BYTE*>(value.data()),
(DWORD)value.size());
}
@@ -287,7 +287,7 @@ ArchMiscWindows::readBinaryOrString(HKEY key, const TCHAR* name, DWORD type)
// read it
result = RegQueryValueEx(key, name, 0, &actualType,
- reinterpret_cast<BYTE*>(buffer), &size);
+ static_cast<BYTE*>(buffer), &size);
if (result != ERROR_SUCCESS || actualType != type) {
delete[] buffer;
return std::string();
@@ -322,7 +322,7 @@ ArchMiscWindows::readValueInt(HKEY key, const TCHAR* name)
DWORD value;
DWORD size = sizeof(value);
LONG result = RegQueryValueEx(key, name, 0, &type,
- reinterpret_cast<BYTE*>(&value), &size);
+ static_cast<BYTE*>(&value), &size);
if (result != ERROR_SUCCESS || type != REG_DWORD) {
return 0;
}
@@ -374,7 +374,7 @@ ArchMiscWindows::setThreadExecutionState(DWORD busyModes)
if (s_stes == NULL) {
HINSTANCE kernel = LoadLibrary("kernel32.dll");
if (kernel != NULL) {
- s_stes = reinterpret_cast<STES_t>(GetProcAddress(kernel,
+ s_stes = static_cast<STES_t>(GetProcAddress(kernel,
"SetThreadExecutionState"));
}
if (s_stes == NULL) {
@@ -414,7 +414,7 @@ ArchMiscWindows::wakeupDisplay()
if (s_stes == NULL) {
HINSTANCE kernel = LoadLibrary("kernel32.dll");
if (kernel != NULL) {
- s_stes = reinterpret_cast<STES_t>(GetProcAddress(kernel,
+ s_stes = static_cast<STES_t>(GetProcAddress(kernel,
"SetThreadExecutionState"));
}
if (s_stes == NULL) {
View
4 src/lib/arch/win32/ArchMultithreadWindows.cpp
@@ -303,7 +303,7 @@ ArchMultithreadWindows::newThread(ThreadFunc func, void* data)
// create thread
unsigned int id = 0;
- thread->m_thread = reinterpret_cast<HANDLE>(_beginthreadex(NULL, 0,
+ thread->m_thread = static_cast<HANDLE>(_beginthreadex(NULL, 0,
threadFunc, (void*)thread, 0, &id));
thread->m_id = static_cast<DWORD>(id);
@@ -661,7 +661,7 @@ unsigned int __stdcall
ArchMultithreadWindows::threadFunc(void* vrep)
{
// get the thread
- ArchThreadImpl* thread = reinterpret_cast<ArchThreadImpl*>(vrep);
+ ArchThreadImpl* thread = static_cast<ArchThreadImpl*>(vrep);
// run thread
s_instance->doThreadFunc(thread);
View
10 src/lib/arch/win32/ArchNetworkWinsock.cpp
@@ -754,7 +754,7 @@ ArchNetworkWinsock::addrToName(ArchNetAddress addr)
// name lookup
struct hostent* info = gethostbyaddr_winsock(
- reinterpret_cast<const char FAR*>(&addr->m_addr),
+ static_cast<const char FAR*>(&addr->m_addr),
addr->m_len, addr->m_addr.sa_family);
if (info == NULL) {
throwNameError(getsockerror_winsock());
@@ -772,7 +772,7 @@ ArchNetworkWinsock::addrToString(ArchNetAddress addr)
switch (getAddrFamily(addr)) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
return inet_ntoa_winsock(ipAddr->sin_addr);
}
@@ -804,7 +804,7 @@ ArchNetworkWinsock::setAddrPort(ArchNetAddress addr, int port)
switch (getAddrFamily(addr)) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
ipAddr->sin_port = htons_winsock(static_cast<u_short>(port));
break;
}
@@ -823,7 +823,7 @@ ArchNetworkWinsock::getAddrPort(ArchNetAddress addr)
switch (getAddrFamily(addr)) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
return ntohs_winsock(ipAddr->sin_port);
}
@@ -841,7 +841,7 @@ ArchNetworkWinsock::isAnyAddr(ArchNetAddress addr)
switch (getAddrFamily(addr)) {
case kINET: {
struct sockaddr_in* ipAddr =
- reinterpret_cast<struct sockaddr_in*>(&addr->m_addr);
+ static_cast<struct sockaddr_in*>(&addr->m_addr);
return (addr->m_len == sizeof(struct sockaddr_in) &&
ipAddr->sin_addr.s_addr == INADDR_ANY);
}
Oops, something went wrong.

0 comments on commit f3d1470

Please sign in to comment.