From 2023254b7e900d31834365ed1759739dac3bc346 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 9 Dec 2023 21:28:02 -0500 Subject: [PATCH] Ensure every class has a QWidget or QObject parent parameter --- parts/exd/exdpart.cpp | 5 +++-- parts/exd/exdpart.h | 2 +- parts/exl/exlpart.cpp | 5 +++-- parts/exl/exlpart.h | 2 +- parts/mdl/mdlpart.cpp | 5 +++-- parts/mdl/mdlpart.h | 2 +- parts/shpk/shpkpart.cpp | 5 +++-- parts/shpk/shpkpart.h | 2 +- parts/tex/texpart.cpp | 5 +++-- parts/tex/texpart.h | 2 +- sagasu/include/filetreemodel.h | 2 +- sagasu/src/filetreemodel.cpp | 6 +++--- 12 files changed, 24 insertions(+), 19 deletions(-) diff --git a/parts/exd/exdpart.cpp b/parts/exd/exdpart.cpp index c095621..222e4cb 100644 --- a/parts/exd/exdpart.cpp +++ b/parts/exd/exdpart.cpp @@ -14,8 +14,9 @@ #include #include -EXDPart::EXDPart(GameData *data) - : data(data) +EXDPart::EXDPart(GameData *data, QWidget *parent) + : QWidget(parent) + , data(data) { auto layout = new QVBoxLayout(); setLayout(layout); diff --git a/parts/exd/exdpart.h b/parts/exd/exdpart.h index 66924ca..2c2c2a9 100644 --- a/parts/exd/exdpart.h +++ b/parts/exd/exdpart.h @@ -15,7 +15,7 @@ class EXDPart : public QWidget Q_OBJECT public: - explicit EXDPart(GameData *data); + explicit EXDPart(GameData *data, QWidget *parent = nullptr); void loadSheet(const QString &name, physis_Buffer buffer); diff --git a/parts/exl/exlpart.cpp b/parts/exl/exlpart.cpp index f0153ef..155a5f5 100644 --- a/parts/exl/exlpart.cpp +++ b/parts/exl/exlpart.cpp @@ -11,8 +11,9 @@ #include #include -EXLPart::EXLPart(GameData *data) - : data(data) +EXLPart::EXLPart(GameData *data, QWidget *parent) + : QWidget(parent) + , data(data) { auto layout = new QVBoxLayout(); m_tableWidget = new QTableWidget(); diff --git a/parts/exl/exlpart.h b/parts/exl/exlpart.h index fad4fd9..d5e21be 100644 --- a/parts/exl/exlpart.h +++ b/parts/exl/exlpart.h @@ -12,7 +12,7 @@ class EXLPart : public QWidget Q_OBJECT public: - explicit EXLPart(GameData *data); + explicit EXLPart(GameData *data, QWidget *parent = nullptr); void load(physis_Buffer file); diff --git a/parts/mdl/mdlpart.cpp b/parts/mdl/mdlpart.cpp index 60128a2..078cab8 100644 --- a/parts/mdl/mdlpart.cpp +++ b/parts/mdl/mdlpart.cpp @@ -17,8 +17,9 @@ #include "filecache.h" #include "vulkanwindow.h" -MDLPart::MDLPart(GameData *data, FileCache &cache) - : data(data) +MDLPart::MDLPart(GameData *data, FileCache &cache, QWidget *parent) + : QWidget(parent) + , data(data) , cache(cache) { auto viewportLayout = new QVBoxLayout(); diff --git a/parts/mdl/mdlpart.h b/parts/mdl/mdlpart.h index b03301e..886334b 100644 --- a/parts/mdl/mdlpart.h +++ b/parts/mdl/mdlpart.h @@ -20,7 +20,7 @@ class MDLPart : public QWidget Q_OBJECT public: - explicit MDLPart(GameData *data, FileCache &cache); + explicit MDLPart(GameData *data, FileCache &cache, QWidget *parent = nullptr); void exportModel(const QString &fileName); RenderModel &getModel(int index); diff --git a/parts/shpk/shpkpart.cpp b/parts/shpk/shpkpart.cpp index 07442a0..744b0b6 100644 --- a/parts/shpk/shpkpart.cpp +++ b/parts/shpk/shpkpart.cpp @@ -10,8 +10,9 @@ dxvk::Logger dxvk::Logger::s_instance("dxbc.log"); -SHPKPart::SHPKPart(GameData *data) - : data(data) +SHPKPart::SHPKPart(GameData *data, QWidget *parent) + : QWidget(parent) + , data(data) { auto layout = new QVBoxLayout(); setLayout(layout); diff --git a/parts/shpk/shpkpart.h b/parts/shpk/shpkpart.h index ccbfe66..b8f47b3 100644 --- a/parts/shpk/shpkpart.h +++ b/parts/shpk/shpkpart.h @@ -14,7 +14,7 @@ class SHPKPart : public QWidget Q_OBJECT public: - explicit SHPKPart(GameData *data); + explicit SHPKPart(GameData *data, QWidget *parent = nullptr); void load(physis_Buffer buffer); diff --git a/parts/tex/texpart.cpp b/parts/tex/texpart.cpp index 877d2a5..9bfde30 100644 --- a/parts/tex/texpart.cpp +++ b/parts/tex/texpart.cpp @@ -6,8 +6,9 @@ #include #include -TexPart::TexPart(GameData *data) - : data(data) +TexPart::TexPart(GameData *data, QWidget *parent) + : QWidget(parent) + , data(data) { auto layout = new QVBoxLayout(); setLayout(layout); diff --git a/parts/tex/texpart.h b/parts/tex/texpart.h index c643757..2e49a11 100644 --- a/parts/tex/texpart.h +++ b/parts/tex/texpart.h @@ -13,7 +13,7 @@ class TexPart : public QWidget Q_OBJECT public: - explicit TexPart(GameData *data); + explicit TexPart(GameData *data, QWidget *parent = nullptr); void load(physis_Buffer file); diff --git a/sagasu/include/filetreemodel.h b/sagasu/include/filetreemodel.h index 13ee532..37c2e68 100644 --- a/sagasu/include/filetreemodel.h +++ b/sagasu/include/filetreemodel.h @@ -26,7 +26,7 @@ class FileTreeModel : public QAbstractItemModel Q_OBJECT public: - explicit FileTreeModel(bool showUnknown, const QString &gamePath, GameData *data); + explicit FileTreeModel(bool showUnknown, const QString &gamePath, GameData *data, QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/sagasu/src/filetreemodel.cpp b/sagasu/src/filetreemodel.cpp index 1cd8354..b7079ed 100644 --- a/sagasu/src/filetreemodel.cpp +++ b/sagasu/src/filetreemodel.cpp @@ -6,10 +6,10 @@ #include -FileTreeModel::FileTreeModel(bool showUnknown, const QString &gamePath, GameData *data) - : gameData(data) +FileTreeModel::FileTreeModel(bool showUnknown, const QString &gamePath, GameData *data, QObject *parent) + : QAbstractItemModel(parent) + , gameData(data) , m_showUnknown(showUnknown) - , QAbstractItemModel() { rootItem = new TreeInformation(); rootItem->type = TreeType::Root;