summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2021-10-11 18:27:41 -0700
committerGravatar GitHub2021-10-11 18:27:41 -0700
commit2a77c29c6d16275f20c52a0d4791d53fd62b66da (patch)
tree85fbb6ba5cdeee714b3cfda517511bc00ff48d90
parentMerge pull request #7164 from ameerj/vmimage (diff)
parentCreate local variables for mouse and wheel positions (diff)
downloadyuzu-2a77c29c6d16275f20c52a0d4791d53fd62b66da.tar.gz
yuzu-2a77c29c6d16275f20c52a0d4791d53fd62b66da.tar.xz
yuzu-2a77c29c6d16275f20c52a0d4791d53fd62b66da.zip
Merge pull request #7161 from MightyCreak/fix-some-warnings
Fix a few warnings
-rw-r--r--src/yuzu/configuration/configure_input_player_widget.cpp4
-rw-r--r--src/yuzu/debugger/profiler.cpp12
-rw-r--r--src/yuzu/game_list.cpp3
3 files changed, 11 insertions, 8 deletions
diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp
index da328d904..f31f86339 100644
--- a/src/yuzu/configuration/configure_input_player_widget.cpp
+++ b/src/yuzu/configuration/configure_input_player_widget.cpp
@@ -1837,7 +1837,7 @@ void PlayerControlPreview::DrawLeftBody(QPainter& p, const QPointF center) {
1837 const float led_size = 5.0f; 1837 const float led_size = 5.0f;
1838 const QPointF led_position = sideview_center + QPointF(0, -36); 1838 const QPointF led_position = sideview_center + QPointF(0, -36);
1839 int led_count = 0; 1839 int led_count = 0;
1840 for (const auto color : led_color) { 1840 for (const auto& color : led_color) {
1841 p.setBrush(color); 1841 p.setBrush(color);
1842 DrawRectangle(p, led_position + QPointF(0, 12 * led_count++), led_size, led_size); 1842 DrawRectangle(p, led_position + QPointF(0, 12 * led_count++), led_size, led_size);
1843 } 1843 }
@@ -1933,7 +1933,7 @@ void PlayerControlPreview::DrawRightBody(QPainter& p, const QPointF center) {
1933 const float led_size = 5.0f; 1933 const float led_size = 5.0f;
1934 const QPointF led_position = sideview_center + QPointF(0, -36); 1934 const QPointF led_position = sideview_center + QPointF(0, -36);
1935 int led_count = 0; 1935 int led_count = 0;
1936 for (const auto color : led_color) { 1936 for (const auto& color : led_color) {
1937 p.setBrush(color); 1937 p.setBrush(color);
1938 DrawRectangle(p, led_position + QPointF(0, 12 * led_count++), led_size, led_size); 1938 DrawRectangle(p, led_position + QPointF(0, 12 * led_count++), led_size, led_size);
1939 } 1939 }
diff --git a/src/yuzu/debugger/profiler.cpp b/src/yuzu/debugger/profiler.cpp
index 7a6f84d96..33110685a 100644
--- a/src/yuzu/debugger/profiler.cpp
+++ b/src/yuzu/debugger/profiler.cpp
@@ -143,24 +143,28 @@ void MicroProfileWidget::hideEvent(QHideEvent* ev) {
143} 143}
144 144
145void MicroProfileWidget::mouseMoveEvent(QMouseEvent* ev) { 145void MicroProfileWidget::mouseMoveEvent(QMouseEvent* ev) {
146 MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0); 146 const auto mouse_position = ev->pos();
147 MicroProfileMousePosition(mouse_position.x() / x_scale, mouse_position.y() / y_scale, 0);
147 ev->accept(); 148 ev->accept();
148} 149}
149 150
150void MicroProfileWidget::mousePressEvent(QMouseEvent* ev) { 151void MicroProfileWidget::mousePressEvent(QMouseEvent* ev) {
151 MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0); 152 const auto mouse_position = ev->pos();
153 MicroProfileMousePosition(mouse_position.x() / x_scale, mouse_position.y() / y_scale, 0);
152 MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton); 154 MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton);
153 ev->accept(); 155 ev->accept();
154} 156}
155 157
156void MicroProfileWidget::mouseReleaseEvent(QMouseEvent* ev) { 158void MicroProfileWidget::mouseReleaseEvent(QMouseEvent* ev) {
157 MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0); 159 const auto mouse_position = ev->pos();
160 MicroProfileMousePosition(mouse_position.x() / x_scale, mouse_position.y() / y_scale, 0);
158 MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton); 161 MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton);
159 ev->accept(); 162 ev->accept();
160} 163}
161 164
162void MicroProfileWidget::wheelEvent(QWheelEvent* ev) { 165void MicroProfileWidget::wheelEvent(QWheelEvent* ev) {
163 MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 166 const auto wheel_position = ev->position().toPoint();
167 MicroProfileMousePosition(wheel_position.x() / x_scale, wheel_position.y() / y_scale,
164 ev->angleDelta().y() / 120); 168 ev->angleDelta().y() / 120);
165 ev->accept(); 169 ev->accept();
166} 170}
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index f9d949e75..ba54423ff 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -159,8 +159,7 @@ GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} {
159 * @return true if the haystack contains all words of userinput 159 * @return true if the haystack contains all words of userinput
160 */ 160 */
161static bool ContainsAllWords(const QString& haystack, const QString& userinput) { 161static bool ContainsAllWords(const QString& haystack, const QString& userinput) {
162 const QStringList userinput_split = 162 const QStringList userinput_split = userinput.split(QLatin1Char{' '}, Qt::SkipEmptyParts);
163 userinput.split(QLatin1Char{' '}, QString::SplitBehavior::SkipEmptyParts);
164 163
165 return std::all_of(userinput_split.begin(), userinput_split.end(), 164 return std::all_of(userinput_split.begin(), userinput_split.end(),
166 [&haystack](const QString& s) { return haystack.contains(s); }); 165 [&haystack](const QString& s) { return haystack.contains(s); });