diff options
| author | 2018-08-06 12:58:46 -0400 | |
|---|---|---|
| committer | 2018-08-06 13:27:08 -0400 | |
| commit | 00a68c5eea17db975446c499a6dbf84311441f04 (patch) | |
| tree | 654297114f26b6da04f27b630a9465036044e226 /src | |
| parent | Merge pull request #933 from lioncash/memory (diff) | |
| download | yuzu-00a68c5eea17db975446c499a6dbf84311441f04.tar.gz yuzu-00a68c5eea17db975446c499a6dbf84311441f04.tar.xz yuzu-00a68c5eea17db975446c499a6dbf84311441f04.zip | |
qt: Default destructors where applicable
Makes code consistent with our style of defaulting special member
functions where applicable.
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/about_dialog.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_dialog.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_system.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/debugger/graphics/graphics_surface.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/debugger/wait_tree.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/game_list_p.h | 14 |
9 files changed, 15 insertions, 16 deletions
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp index 39ed3bccf..a81ad2888 100644 --- a/src/yuzu/about_dialog.cpp +++ b/src/yuzu/about_dialog.cpp | |||
| @@ -15,4 +15,4 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDia | |||
| 15 | Common::g_scm_desc, QString(Common::g_build_date).left(10))); | 15 | Common::g_scm_desc, QString(Common::g_build_date).left(10))); |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | AboutDialog::~AboutDialog() {} | 18 | AboutDialog::~AboutDialog() = default; |
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index 7fd07539a..45d84f19a 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp | |||
| @@ -24,7 +24,7 @@ ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::Co | |||
| 24 | }); | 24 | }); |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | ConfigureDebug::~ConfigureDebug() {} | 27 | ConfigureDebug::~ConfigureDebug() = default; |
| 28 | 28 | ||
| 29 | void ConfigureDebug::setConfiguration() { | 29 | void ConfigureDebug::setConfiguration() { |
| 30 | ui->toggle_gdbstub->setChecked(Settings::values.use_gdbstub); | 30 | ui->toggle_gdbstub->setChecked(Settings::values.use_gdbstub); |
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index f66abf870..1ca7e876c 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp | |||
| @@ -12,7 +12,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent) : QDialog(parent), ui(new Ui:: | |||
| 12 | this->setConfiguration(); | 12 | this->setConfiguration(); |
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | ConfigureDialog::~ConfigureDialog() {} | 15 | ConfigureDialog::~ConfigureDialog() = default; |
| 16 | 16 | ||
| 17 | void ConfigureDialog::setConfiguration() {} | 17 | void ConfigureDialog::setConfiguration() {} |
| 18 | 18 | ||
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index cb7d3f8bf..04afc8724 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp | |||
| @@ -24,7 +24,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) | |||
| 24 | ui->use_docked_mode->setEnabled(!Core::System::GetInstance().IsPoweredOn()); | 24 | ui->use_docked_mode->setEnabled(!Core::System::GetInstance().IsPoweredOn()); |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | ConfigureGeneral::~ConfigureGeneral() {} | 27 | ConfigureGeneral::~ConfigureGeneral() = default; |
| 28 | 28 | ||
| 29 | void ConfigureGeneral::setConfiguration() { | 29 | void ConfigureGeneral::setConfiguration() { |
| 30 | ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); | 30 | ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); |
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 3379b7963..4afe0f81b 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp | |||
| @@ -14,7 +14,7 @@ ConfigureGraphics::ConfigureGraphics(QWidget* parent) | |||
| 14 | this->setConfiguration(); | 14 | this->setConfiguration(); |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | ConfigureGraphics::~ConfigureGraphics() {} | 17 | ConfigureGraphics::~ConfigureGraphics() = default; |
| 18 | 18 | ||
| 19 | enum class Resolution : int { | 19 | enum class Resolution : int { |
| 20 | Auto, | 20 | Auto, |
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 9be2c939c..e9ed9c38f 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp | |||
| @@ -35,7 +35,7 @@ ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui:: | |||
| 35 | this->setConfiguration(); | 35 | this->setConfiguration(); |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | ConfigureSystem::~ConfigureSystem() {} | 38 | ConfigureSystem::~ConfigureSystem() = default; |
| 39 | 39 | ||
| 40 | void ConfigureSystem::setConfiguration() { | 40 | void ConfigureSystem::setConfiguration() { |
| 41 | enabled = !Core::System::GetInstance().IsPoweredOn(); | 41 | enabled = !Core::System::GetInstance().IsPoweredOn(); |
diff --git a/src/yuzu/debugger/graphics/graphics_surface.cpp b/src/yuzu/debugger/graphics/graphics_surface.cpp index ff3efcdaa..3f7103ab9 100644 --- a/src/yuzu/debugger/graphics/graphics_surface.cpp +++ b/src/yuzu/debugger/graphics/graphics_surface.cpp | |||
| @@ -34,7 +34,8 @@ static Tegra::Texture::TextureFormat ConvertToTextureFormat( | |||
| 34 | 34 | ||
| 35 | SurfacePicture::SurfacePicture(QWidget* parent, GraphicsSurfaceWidget* surface_widget_) | 35 | SurfacePicture::SurfacePicture(QWidget* parent, GraphicsSurfaceWidget* surface_widget_) |
| 36 | : QLabel(parent), surface_widget(surface_widget_) {} | 36 | : QLabel(parent), surface_widget(surface_widget_) {} |
| 37 | SurfacePicture::~SurfacePicture() {} | 37 | |
| 38 | SurfacePicture::~SurfacePicture() = default; | ||
| 38 | 39 | ||
| 39 | void SurfacePicture::mousePressEvent(QMouseEvent* event) { | 40 | void SurfacePicture::mousePressEvent(QMouseEvent* event) { |
| 40 | // Only do something while the left mouse button is held down | 41 | // Only do something while the left mouse button is held down |
diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index f5a5697a0..3b23d0bbe 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include "core/hle/kernel/timer.h" | 14 | #include "core/hle/kernel/timer.h" |
| 15 | #include "core/hle/kernel/wait_object.h" | 15 | #include "core/hle/kernel/wait_object.h" |
| 16 | 16 | ||
| 17 | WaitTreeItem::~WaitTreeItem() {} | 17 | WaitTreeItem::~WaitTreeItem() = default; |
| 18 | 18 | ||
| 19 | QColor WaitTreeItem::GetColor() const { | 19 | QColor WaitTreeItem::GetColor() const { |
| 20 | return QColor(Qt::GlobalColor::black); | 20 | return QColor(Qt::GlobalColor::black); |
diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h index a758b77aa..2ded0ce06 100644 --- a/src/yuzu/game_list_p.h +++ b/src/yuzu/game_list_p.h | |||
| @@ -27,9 +27,8 @@ static QPixmap GetDefaultIcon(bool large) { | |||
| 27 | class GameListItem : public QStandardItem { | 27 | class GameListItem : public QStandardItem { |
| 28 | 28 | ||
| 29 | public: | 29 | public: |
| 30 | GameListItem() : QStandardItem() {} | 30 | GameListItem() = default; |
| 31 | GameListItem(const QString& string) : QStandardItem(string) {} | 31 | explicit GameListItem(const QString& string) : QStandardItem(string) {} |
| 32 | virtual ~GameListItem() override {} | ||
| 33 | }; | 32 | }; |
| 34 | 33 | ||
| 35 | /** | 34 | /** |
| @@ -45,9 +44,8 @@ public: | |||
| 45 | static const int TitleRole = Qt::UserRole + 2; | 44 | static const int TitleRole = Qt::UserRole + 2; |
| 46 | static const int ProgramIdRole = Qt::UserRole + 3; | 45 | static const int ProgramIdRole = Qt::UserRole + 3; |
| 47 | 46 | ||
| 48 | GameListItemPath() : GameListItem() {} | 47 | GameListItemPath() = default; |
| 49 | GameListItemPath(const QString& game_path, const std::vector<u8>& smdh_data, u64 program_id) | 48 | GameListItemPath(const QString& game_path, const std::vector<u8>& smdh_data, u64 program_id) { |
| 50 | : GameListItem() { | ||
| 51 | setData(game_path, FullPathRole); | 49 | setData(game_path, FullPathRole); |
| 52 | setData(qulonglong(program_id), ProgramIdRole); | 50 | setData(qulonglong(program_id), ProgramIdRole); |
| 53 | } | 51 | } |
| @@ -75,8 +73,8 @@ class GameListItemSize : public GameListItem { | |||
| 75 | public: | 73 | public: |
| 76 | static const int SizeRole = Qt::UserRole + 1; | 74 | static const int SizeRole = Qt::UserRole + 1; |
| 77 | 75 | ||
| 78 | GameListItemSize() : GameListItem() {} | 76 | GameListItemSize() = default; |
| 79 | GameListItemSize(const qulonglong size_bytes) : GameListItem() { | 77 | explicit GameListItemSize(const qulonglong size_bytes) { |
| 80 | setData(size_bytes, SizeRole); | 78 | setData(size_bytes, SizeRole); |
| 81 | } | 79 | } |
| 82 | 80 | ||