Merge pull request #4315 from FearlessTobi/port-1332

WebService: Backport review comments from yuzu-emu/yuzu#1332

src/citra_qt/CMakeLists.txt

@@ -208,6 +208,10 @@ target_link_libraries(citra-qt PRIVATE audio_core common core input_common netwo
 target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::OpenGL Qt5::Widgets Qt5::Multimedia)
 target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 
+if (CITRA_ENABLE_COMPATIBILITY_REPORTING)
+    add_definitions(-DCITRA_ENABLE_COMPATIBILITY_REPORTING)
+endif()
+
 if (USE_DISCORD_PRESENCE)
     target_sources(citra-qt PUBLIC
         discord_impl.cpp

src/citra_qt/compatdb.cpp

@@ -25,7 +25,11 @@ CompatDB::CompatDB(QWidget* parent)
 
 CompatDB::~CompatDB() = default;
 
-enum class CompatDBPage { Intro = 0, Selection = 1, Final = 2 };
+enum class CompatDBPage {
+    Intro = 0,
+    Selection = 1,
+    Final = 2,
+};
 
 void CompatDB::Submit() {
     QButtonGroup* compatibility = new QButtonGroup(this);

src/citra_qt/compatdb.h

@@ -21,7 +21,6 @@ public:
 private:
     std::unique_ptr<Ui::CompatDB> ui;
 
-private slots:
     void Submit();
     void EnableNext();
 };

src/citra_qt/configuration/configure_web.cpp

@@ -25,7 +25,7 @@ ConfigureWeb::ConfigureWeb(QWidget* parent)
     this->setConfiguration();
 }
 
-ConfigureWeb::~ConfigureWeb() {}
+ConfigureWeb::~ConfigureWeb() = default;
 
 void ConfigureWeb::setConfiguration() {
     ui->web_credentials_disclaimer->setWordWrap(true);
@@ -38,7 +38,7 @@ void ConfigureWeb::setConfiguration() {
 
     ui->web_signup_link->setOpenExternalLinks(true);
     ui->web_signup_link->setText(
-        tr("<a href='https://services.citra-emu.org/'><span style=\"text-decoration: underline; "
+        tr("<a href='https://profile.citra-emu.org/'><span style=\"text-decoration: underline; "
            "color:#039be5;\">Sign up</span></a>"));
     ui->web_token_info_link->setOpenExternalLinks(true);
     ui->web_token_info_link->setText(

src/citra_qt/discord_impl.h

@@ -11,7 +11,7 @@ namespace DiscordRPC {
 class DiscordImpl : public DiscordInterface {
 public:
     DiscordImpl();
-    ~DiscordImpl();
+    ~DiscordImpl() override;
 
     void Pause() override;
     void Update() override;

src/citra_qt/main.cpp

@@ -92,7 +92,7 @@ void GMainWindow::ShowTelemetryCallout() {
     }
 
     UISettings::values.callout_flags |= static_cast<uint32_t>(CalloutFlag::Telemetry);
-    static const QString telemetry_message =
+    const QString telemetry_message =
         tr("<a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous "
            "data is collected</a> to help improve Citra. "
            "<br/><br/>Would you like to share your usage data with us?");