sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt: Work around QList<QPair> marshalling issue

Browse Source
This commit is contained in:
Stenzek
2024-06-24 00:28:44 +10:00
parent 6bfd862cb3
commit 6021e435ba
7 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/duckstation-qt/setupwizarddialog.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>.
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>.
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#pragma once
@@ -7,12 +7,15 @@
#include "ui_setupwizarddialog.h"
#include "core/bios.h"
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QtWidgets/QDialog>
#include "core/bios.h"
#include <string>
#include <utility>
#include <vector>
class SetupWizardDialog final : public QDialog
{
@@ -42,9 +45,9 @@ private Q_SLOTS:
void refreshDirectoryList();
void resizeDirectoryListColumns();
void onInputDevicesEnumerated(const QList<QPair<QString, QString>>& devices);
void onInputDeviceConnected(const QString& identifier, const QString& device_name);
void onInputDeviceDisconnected(const QString& identifier);
void onInputDevicesEnumerated(const std::vector<std::pair<std::string, std::string>>& devices);
void onInputDeviceConnected(const std::string& identifier, const std::string& device_name);
void onInputDeviceDisconnected(const std::string& identifier);
protected:
void resizeEvent(QResizeEvent* event);
@@ -79,5 +82,5 @@ private:
std::array<QLabel*, Page_Count> m_page_labels;
QList<QPair<QString, QString>> m_device_list;
std::vector<std::pair<std::string, std::string>> m_device_list;
};