diff --git a/include/config.h b/include/config.h index ed5403a2..f61d589e 100644 --- a/include/config.h +++ b/include/config.h @@ -15,7 +15,7 @@ enum MapSortOrder { Layout = 2, }; -class KeyValueConfigBase : public QObject +class KeyValueConfigBase { public: void save(); diff --git a/include/core/regionmap.h b/include/core/regionmap.h index a24ae1ea..03059266 100644 --- a/include/core/regionmap.h +++ b/include/core/regionmap.h @@ -79,15 +79,11 @@ public: QString city_map_name; }; -class RegionMap : public QObject +class RegionMap { - Q_OBJECT - public: RegionMap() = default; - ~RegionMap() {}; - Project *project = nullptr; QVector map_squares; diff --git a/include/ui/currentselectedmetatilespixmapitem.h b/include/ui/currentselectedmetatilespixmapitem.h index 0bc8e0e3..76c52d55 100644 --- a/include/ui/currentselectedmetatilespixmapitem.h +++ b/include/ui/currentselectedmetatilespixmapitem.h @@ -5,8 +5,7 @@ #include "metatileselector.h" #include -class CurrentSelectedMetatilesPixmapItem : public QObject, public QGraphicsPixmapItem { - Q_OBJECT +class CurrentSelectedMetatilesPixmapItem : public QGraphicsPixmapItem { public: CurrentSelectedMetatilesPixmapItem(Map *map, MetatileSelector *metatileSelector) { this->map = map; diff --git a/src/config.cpp b/src/config.cpp index 0ea49b6c..f34cdae6 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -575,7 +575,7 @@ void ProjectConfig::onNewConfigFileCreated() { form.addRow(new QLabel("Game Version"), baseGameVersionComboBox); QDialogButtonBox buttonBox(QDialogButtonBox::Ok, Qt::Horizontal, &dialog); - connect(&buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept); + QObject::connect(&buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept); form.addRow(&buttonBox); if (dialog.exec() == QDialog::Accepted) {