Valgrind cleaning

They seem to delete the leaks, but valgrind is somehow still compalning for no reaosns....
aldelaro5 · Jun 29, 2018 · abc756d · abc756d
1 parent c556d35
commit abc756d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/Source/GUI/MainWindow.cpp b/Source/GUI/MainWindow.cpp
@@ -141,6 +141,7 @@ void MainWindow::startSeedFinder()
  m_btnReset->setEnabled(true);
  m_btnRerollPrediciton->setEnabled(true);
  }
+ delete wizard;
 }
 
 void MainWindow::resetPredictor()
@@ -172,4 +173,5 @@ void MainWindow::openSettings()
 {
  DlgSettings* dlg = new DlgSettings(this);
  dlg->exec();
+ delete dlg;
 }
diff --git a/Source/GUI/SeedFinder/SeedFinderWizard.cpp b/Source/GUI/SeedFinder/SeedFinderWizard.cpp
@@ -54,6 +54,12 @@ SeedFinderWizard::SeedFinderWizard(QWidget* parent, const GUICommon::gameSelecti
  [=](long value) { m_dlgProgressPrecalc->setValue(value); });
 }
 
+SeedFinderWizard::~SeedFinderWizard()
+{
+ for (auto page : m_passPages)
+ delete page;
+}
+
 std::vector<u32> SeedFinderWizard::getSeeds() const
 {
  return m_seeds;
@@ -75,6 +81,7 @@ SeedFinderPassPage* SeedFinderWizard::getSeedFinderPassPageForGame()
  default:
  return nullptr;
  }
+ m_passPages.append(page);
  QString strResultStatus("No passes done");
  if (m_seeds.size() > 1)
  strResultStatus = QString::number(m_seeds.size()) + QString(" results");
@@ -138,6 +145,7 @@ void SeedFinderWizard::precalcDone()
  "any subsequent seed finding procedure with the given settings.",
  QMessageBox::Ok);
  msg->exec();
+ delete msg;
  m_usePrecalc = true;
  }
 }
@@ -196,6 +204,7 @@ void SeedFinderWizard::pageChanged()
  m_dlgProgressPrecalc->exec();
  delete m_dlgProgressPrecalc;
  }
+ delete msg;
  }
  }
 }
@@ -217,7 +226,7 @@ void SeedFinderWizard::reject()
  else
  {
  QMessageBox* cancelPrompt =
- new QMessageBox(QMessageBox::Information, "Seed Finder Cancellation",
+ new QMessageBox(QMessageBox::Question, "Seed Finder Cancellation",
  "Are you sure you want to cancel the seed finding procedure?",
  QMessageBox::No | QMessageBox::Yes, this);
  cancelPrompt->exec();
@@ -227,6 +236,7 @@ void SeedFinderWizard::reject()
  m_seedFinderFuture.waitForFinished();
  QWizard::reject();
  }
+ delete cancelPrompt;
  }
 }
 

diff --git a/Source/GUI/SeedFinder/SeedFinderWizard.h b/Source/GUI/SeedFinder/SeedFinderWizard.h
@@ -8,6 +8,7 @@
 #include <QFuture>
 #include <QLabel>
 #include <QProgressDialog>
+#include <QVector>
 
 #include "../../Common/CommonTypes.h"
 #include "../GUICommon.h"
@@ -31,6 +32,7 @@ class SeedFinderWizard : public QWizard
 
  SeedFinderWizard(QWidget* parent, const GUICommon::gameSelection game,
  const int rtcErrorMarginSeconds, const bool useWii);
+ ~SeedFinderWizard();
 
  void accept() override;
  void reject() override;
@@ -54,6 +56,7 @@ class SeedFinderWizard : public QWizard
 
  bool m_seedFinderDone = false;
  std::vector<u32> m_seeds;
+ QVector<SeedFinderPassPage*> m_passPages;
  GUICommon::gameSelection m_game;
  bool m_cancelSeedFinderPass;
  bool m_cancelPrecalc = false;

diff --git a/Source/GUI/Settings/DlgSettings.cpp b/Source/GUI/Settings/DlgSettings.cpp
@@ -49,6 +49,14 @@ DlgSettings::DlgSettings(QWidget* parent) : QDialog(parent)
  m_oldPlatform = m_generalTab->getPlatform();
 }
 
+DlgSettings::~DlgSettings()
+{
+ delete m_buttonsDlg;
+ delete m_generalTab;
+ delete m_coloTab;
+ delete m_xdTab;
+}
+
 void DlgSettings::loadSettings()
 {
  m_generalTab->setPlatform(SConfig::getInstance().getPlatform());
@@ -100,6 +108,7 @@ void DlgSettings::precalcDeletePrompt() const
  if (xdFile.exists())
  xdFile.remove();
  }
+ delete msg;
  }
  }
 }

diff --git a/Source/GUI/Settings/DlgSettings.h b/Source/GUI/Settings/DlgSettings.h
@@ -13,6 +13,7 @@ class DlgSettings : public QDialog
 {
 public:
  DlgSettings(QWidget* parent = nullptr);
+ ~DlgSettings();
 
 private:
  void loadSettings();