Silence warnings in misc files (gui, psp2, mfc, mouse)

RPCS3 · Nov 2, 2017 · 7b220da · 7b220da
1 parent b986286
commit 7b220da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/rpcs3/Emu/Cell/MFC.cpp b/rpcs3/Emu/Cell/MFC.cpp
@@ -50,9 +50,8 @@ void fmt_class_string<MFC>::format(std::string& out, u64 arg)
 		case MFC_BARRIER_CMD: return "BARRIER";
 		case MFC_EIEIO_CMD: return "EIEIO";
 		case MFC_SYNC_CMD: return "SYNC";
+		default: return unknown;
 		}
-
-		return unknown;
 	});
 }
 

diff --git a/rpcs3/Emu/PSP2/ARMv7DisAsm.cpp b/rpcs3/Emu/PSP2/ARMv7DisAsm.cpp
@@ -258,6 +258,9 @@ void ARMv7DisAsm::Write(const std::string& value)
 	case CPUDisAsm_InterpreterMode:
 		last_opcode += fmt::format(": %s", str);
 		break;
+	case CPUDisAsm_CompilerElfMode:
+		write("ERROR: Trying to load unimplemented CPU DisAsm mode, CompilerElfMode.");
+		break;
 	}
 }
 

diff --git a/rpcs3/basic_mouse_handler.cpp b/rpcs3/basic_mouse_handler.cpp
@@ -55,6 +55,7 @@ bool basic_mouse_handler::eventFilter(QObject* target, QEvent* ev)
 		case QEvent::Wheel:
 			MouseScroll(static_cast<QWheelEvent*>(ev));
 			break;
+		default: return false;
 		}
 	}
 	return false;

diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h
@@ -236,7 +236,7 @@ private Q_SLOTS:
 	/** Override inherited method from Qt to allow signalling when close happened.*/
 	void closeEvent(QCloseEvent* event) override;
 	void resizeEvent(QResizeEvent *event) override;
-	bool eventFilter(QObject *object, QEvent *event);
+	bool eventFilter(QObject *object, QEvent *event) override;
 private:
 	QPixmap PaintedPixmap(const QImage& img, bool paintConfigIcon = false);
 	bool Boot(const GameInfo& info);