Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 08:53:06 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Avoid dynamic casts from the type to itself

Browse Source 
This is confusing at best, perform real dynamic casts from base class
pointer to the derived one.
This commit is contained in:
Vadim Zeitlin
2026-08-06 21:59:35 +02:00
parent da2dcc4636
commit b9676176ff
1 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/sckipc.cpp
+36 -44
View File
@@ -1071,30 +1071,26 @@ wxConnectionBase *wxTCPClient::MakeConnection(const wxString& host,
// OK! Confirmation.
if ( msg_reply->GetIPCCode() == IPC_CONNECT )
{
wxTCPConnection *
connection = (wxTCPConnection *)OnMakeConnection ();
auto* const connectionBase = OnMakeConnection ();
if ( connection )
if (auto* const connection = wxDynamicCast(connectionBase, wxTCPConnection))
{
if (wxDynamicCast(connection, wxTCPConnection))
{
connection->m_sock = client;
connection->m_sock->SetTimeout(wxIPCTimeout);
connection->m_handler = handler;
connection->m_topic = topic;
connection->m_sock = client;
connection->m_sock->SetTimeout(wxIPCTimeout);
connection->m_handler = handler;
connection->m_topic = topic;
client->SetEventHandler(*handler, _SOCKET_INPUT_ID);
client->SetClientData(connection);
handler->RegisterConnectionSocket(client);
client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
client->Notify(true);
return connection;
}
else
{
delete connection;
// and fall through to delete everything else
}
client->SetEventHandler(*handler, _SOCKET_INPUT_ID);
client->SetClientData(connection);
handler->RegisterConnectionSocket(client);
client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
client->Notify(true);
return connection;
}
else
{
delete connection;
// and fall through to delete everything else
}
}
else if ( msg_reply->GetIPCCode() == IPC_FAIL )
@@ -1463,35 +1459,31 @@ void wxTCPEventHandler::OnSocketConnection(wxSocketEvent &event)
{
wxString topic = msg_conn->GetTopic();
wxTCPConnection *new_connection =
(wxTCPConnection *) ipcserv->OnAcceptConnection(topic);
auto* const connectionBase = ipcserv->OnAcceptConnection(topic);
if ( new_connection )
if ( auto* const new_connection = wxDynamicCast(connectionBase, wxTCPConnection) )
{
if ( wxDynamicCast(new_connection, wxTCPConnection) )
// Acknowledge success
wxIPCMessageConnect msg_reply(sock, topic);
if ( WriteMessageToSocket(msg_reply) )
{
// Acknowledge success
wxIPCMessageConnect msg_reply(sock, topic);
new_connection->m_topic = topic;
new_connection->m_sock = sock;
new_connection->m_handler = &wxTCPEventHandlerModule::GetHandler();
if ( WriteMessageToSocket(msg_reply) )
{
new_connection->m_topic = topic;
new_connection->m_sock = sock;
new_connection->m_handler = &wxTCPEventHandlerModule::GetHandler();
sock->SetTimeout(wxIPCTimeout);
sock->SetEventHandler(wxTCPEventHandlerModule::GetHandler(),
_SOCKET_INPUT_ID);
sock->SetClientData(new_connection);
RegisterConnectionSocket(sock);
sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
sock->Notify(true);
return;
}
sock->SetTimeout(wxIPCTimeout);
sock->SetEventHandler(wxTCPEventHandlerModule::GetHandler(),
_SOCKET_INPUT_ID);
sock->SetClientData(new_connection);
RegisterConnectionSocket(sock);
sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
sock->Notify(true);
return;
}
delete new_connection;
}
delete connectionBase;
}
}
}