Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ui and sys_net warnings #7695

Merged
merged 1 commit into from Mar 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/lv2/sys_net.cpp
Expand Up @@ -1094,7 +1094,7 @@ error_code sys_net_bnet_recvfrom(ppu_thread& ppu, s32 s, vm::ptr<void> buf, u32
ASSERT(packet.size() < len);

memcpy(buf.get_ptr(), packet.data(), packet.size());
native_result = packet.size();
native_result = ::narrow<int>(packet.size());

native_addr.ss_family = AF_INET;
(reinterpret_cast<::sockaddr_in*>(&native_addr))->sin_port = std::bit_cast<u16, be_t<u16>>(53); // htons(53)
Expand Down
12 changes: 6 additions & 6 deletions rpcs3/rpcs3qt/about_dialog.ui
Expand Up @@ -17,7 +17,7 @@
<iconset resource="../resources.qrc">
<normaloff>:/rpcs3.ico</normaloff>:/rpcs3.ico</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<layout class="QVBoxLayout" name="about_dialog_layout">
<property name="spacing">
<number>6</number>
</property>
Expand All @@ -41,10 +41,10 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QHBoxLayout" name="header_section_layout">
<item>
<widget class="QWidget" name="iconLayout" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2">
<widget class="QWidget" name="icon_widget" native="true">
<layout class="QVBoxLayout" name="icon_widget_layout">
<property name="leftMargin">
<number>0</number>
</property>
Expand Down Expand Up @@ -219,10 +219,10 @@
<x>0</x>
<y>0</y>
<width>863</width>
<height>757</height>
<height>1376</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,1,1,1">
<layout class="QHBoxLayout" name="names_layout" stretch="1,1,1,1">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/rpcs3qt/main_window.ui
Expand Up @@ -94,7 +94,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="sizeSliderContainer_layout">
<property name="spacing">
<number>0</number>
</property>
Expand Down Expand Up @@ -141,7 +141,7 @@
<x>0</x>
<y>0</y>
<width>1058</width>
<height>21</height>
<height>22</height>
</rect>
</property>
<property name="contextMenuPolicy">
Expand Down