claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for conflicting types of Display

Browse Source
This commit is contained in:
Joakim L. Gilje
2025-06-24 18:46:45 +02:00
parent 6a8eaf507c
commit 33cee0cc46
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/qt_vmmanager_details.cpp
View File

@@ -26,6 +26,8 @@
extern bool windows_is_light_theme(); extern bool windows_is_light_theme();
#endif #endif
using namespace VMManager;
VMManagerDetails::VMManagerDetails(QWidget *parent) : VMManagerDetails::VMManagerDetails(QWidget *parent) :
QWidget(parent), ui(new Ui::VMManagerDetails) { QWidget(parent), ui(new Ui::VMManagerDetails) {
ui->setupUi(this); ui->setupUi(this);

1
src/qt/qt_vmmanager_detailsection.cpp
View File

@@ -21,6 +21,7 @@
#include <QPushButton> #include <QPushButton>
const QString VMManagerDetailSection::sectionSeparator = ";"; const QString VMManagerDetailSection::sectionSeparator = ";";
using namespace VMManager;
VMManagerDetailSection:: VMManagerDetailSection::
VMManagerDetailSection(const QString &sectionName) VMManagerDetailSection(const QString &sectionName)

2
src/qt/qt_vmmanager_detailsection.hpp
View File

@@ -60,7 +60,7 @@ public:
~VMManagerDetailSection() override; ~VMManagerDetailSection() override;
void addSection(const QString &name, const QString &value, Display::Name displayField = Display::Name::Unknown); void addSection(const QString &name, const QString &value, VMManager::Display::Name displayField = VMManager::Display::Name::Unknown);
void clear(); void clear();
CollapseButton *collapseButton; CollapseButton *collapseButton;

2
src/qt/qt_vmmanager_system.cpp
View File

@@ -51,6 +51,8 @@ extern "C" {
#include <86box/mouse.h> #include <86box/mouse.h>
} }
using namespace VMManager;
VMManagerSystem::VMManagerSystem(const QString &sysconfig_file) { VMManagerSystem::VMManagerSystem(const QString &sysconfig_file) {
// The 86Box configuration file // The 86Box configuration file

7
src/qt/qt_vmmanager_system.hpp
View File

@@ -34,6 +34,8 @@ inline uint qHash(const T &t, uint seed) { \
return ::qHash(static_cast<typename std::underlying_type<T>::type>(t), seed); \ return ::qHash(static_cast<typename std::underlying_type<T>::type>(t), seed); \
} }
namespace VMManager {
Q_NAMESPACE
namespace Display { namespace Display {
Q_NAMESPACE Q_NAMESPACE
enum class Name { enum class Name {
@@ -58,11 +60,12 @@ enum class Name {
Q_ENUM_NS(Name) Q_ENUM_NS(Name)
QHASH_FOR_CLASS_ENUM(Name) QHASH_FOR_CLASS_ENUM(Name)
} }
}
class VMManagerSystem : public QWidget { class VMManagerSystem : public QWidget {
Q_OBJECT Q_OBJECT
typedef QHash<Display::Name, QString> display_table_t; typedef QHash<VMManager::Display::Name, QString> display_table_t;
typedef QHash <QString, QHash <QString, QString>> config_hash_t; typedef QHash <QString, QHash <QString, QString>> config_hash_t;
public: public:
@@ -127,7 +130,7 @@ public:
bool window_obscured; bool window_obscured;
QString getDisplayValue(Display::Name key); QString getDisplayValue(VMManager::Display::Name key);
QFileInfoList getScreenshots(); QFileInfoList getScreenshots();
inline bool operator==(const VMManagerSystem &rhs) const inline bool operator==(const VMManagerSystem &rhs) const