From 7cb310791b5b99a9c5d90af1dfdfc4cfb3a17918 Mon Sep 17 00:00:00 2001 From: spycrab Date: Tue, 7 Aug 2018 15:48:17 +0200 Subject: [PATCH] Cleanup: Remove some left over references to wxWidgets --- Data/dolphin-emu.6 | 2 +- Externals/licenses.md | 2 -- Source/Core/Common/Common.h | 1 - Source/Core/Common/MsgHandler.cpp | 4 ++-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Data/dolphin-emu.6 b/Data/dolphin-emu.6 index c73be76f75..9d20e890d5 100644 --- a/Data/dolphin-emu.6 +++ b/Data/dolphin-emu.6 @@ -22,7 +22,7 @@ compatibility with all PC controllers, turbo speed, networked multiplayer, and even more! .Pp .Nm -features a graphical user interface made using wxWidgets. +features a graphical user interface made using Qt 5. .Sh OPTIONS .Bl -tag -width Ds .It Fl a Ar audio , Fl Fl audio_emulation= Ns Ar audio diff --git a/Externals/licenses.md b/Externals/licenses.md index d7dadbc3d0..c899532b26 100644 --- a/Externals/licenses.md +++ b/Externals/licenses.md @@ -60,8 +60,6 @@ Dolphin includes or links code of the following third-party software projects: [LGPLv2+](http://www.surina.net/soundtouch/license.html) - [TAP-Windows](https://openvpn.net/): header only -- [wxWidgets](https://www.wxwidgets.org/): - [wxWindows Library License](https://www.wxwidgets.org/about/licence/) (LGPLv2+-like) - [XAudio2](http://msdn.microsoft.com/en-us/library/windows/desktop/hh405049.aspx): headers only - [xxHash](https://github.com/Cyan4973/xxHash): diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index 0b09b9ec19..eb0944bd8a 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -45,5 +45,4 @@ struct CrtDebugBreak #endif // Dummy macro for marking translatable strings that can not be immediately translated. -// wxWidgets does not have a true dummy macro for this. #define _trans(a) a diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp index 670023b491..43f24c9865 100644 --- a/Source/Core/Common/MsgHandler.cpp +++ b/Source/Core/Common/MsgHandler.cpp @@ -24,13 +24,13 @@ std::string DefaultStringTranslator(const char* text); static StringTranslator str_translator = DefaultStringTranslator; // Select which of these functions that are used for message boxes. If -// wxWidgets is enabled we will use wxMsgAlert() that is defined in Main.cpp +// Qt is enabled we will use QtMsgAlertHandler() that is defined in Main.cpp void RegisterMsgAlertHandler(MsgAlertHandler handler) { msg_handler = handler; } -// Select translation function. For wxWidgets use wxStringTranslator in Main.cpp +// Select translation function. void RegisterStringTranslator(StringTranslator translator) { str_translator = translator;