Use unique_ptr for ui objects (#31)

src/MainWindow.cpp

@@ -1,6 +1,6 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
-#include "dialogs/CreatenewDialog.h"
+#include "dialogs/CreateNewDialog.h"
 #include "dialogs/CommentsDialog.h"
 #include "dialogs/AboutDialog.h"
 #include "dialogs/RenameDialog.h"
@@ -38,7 +38,7 @@
 #include "utils/Highlighter.h"
 #include "utils/HexAsciiHighlighter.h"
 #include "utils/Helpers.h"
-#include "dialogs/NewfileDialog.h"
+#include "dialogs/NewFileDialog.h"
 
 #include "widgets/MemoryWidget.h"
 #include "widgets/functionswidget.h"
@@ -84,7 +84,7 @@ static void registerCustomFonts()
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
-    core(new CutterCore()),
+    core(new CutterCore),
     memoryDock(nullptr),
     notepadDock(nullptr),
     asmDock(nullptr),
@@ -119,7 +119,6 @@ MainWindow::MainWindow(QWidget *parent) :
 MainWindow::~MainWindow()
 {
     qDeleteAll(asmSyntaxes);
-    delete ui;
     delete core;
 }
 
@@ -752,7 +751,7 @@ void MainWindow::on_actionCalculator_triggered()
 
 void MainWindow::on_actionCreate_File_triggered()
 {
-    createNewDialog *n = new createNewDialog(this);
+    CreateNewDialog *n = new CreateNewDialog(this);
     n->exec();
 }
 

src/MainWindow.h

@@ -3,6 +3,7 @@
 
 #include <QMainWindow>
 #include <QList>
+#include <memory>
 #include "radarewebserver.h"
 #include "cutter.h" // only needed for ut64
 
@@ -44,7 +45,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    CutterCore *core;
+    CutterCore* core;
     MemoryWidget    *memoryDock;
     Notepad         *notepadDock;
 
@@ -185,7 +186,7 @@ private:
     ut64 hexdumpBottomOffset;
     QString filename;
     QList<DockWidget *> dockWidgets;
-    Ui::MainWindow   *ui;
+    std::unique_ptr<Ui::MainWindow> ui;
     Highlighter      *highlighter;
     AsciiHighlighter *hex_highlighter;
     GraphicsBar      *graphicsBar;

src/analthread.cpp

@@ -34,7 +34,7 @@ void AnalThread::start(MainWindow *main, int level, QList<QString> advanced)
 void AnalThread::run()
 {
     const auto optionsDialog = dynamic_cast<OptionsDialog *>(parent());
-    const auto ui = optionsDialog->ui;
+    const auto& ui = optionsDialog->ui;
     int va = ui->vaCheckBox->isChecked();
     ut64 loadaddr = 0LL;
     ut64 mapaddr = 0LL;

src/cutter.pro

@@ -62,10 +62,8 @@ SOURCES += \
     utils/RichTextPainter.cpp \
     dialogs/OptionsDialog.cpp \
     dialogs/AboutDialog.cpp \
-    dialogs/AsmoptionsDialog.cpp \
     dialogs/CommentsDialog.cpp \
     dialogs/FlagDialog.cpp \
-    dialogs/NewfileDialog.cpp \
     dialogs/RenameDialog.cpp \
     dialogs/XrefsDialog.cpp \
     MainWindow.cpp \
@@ -73,8 +71,10 @@ SOURCES += \
     utils/HexAsciiHighlighter.cpp \
     utils/HexHighlighter.cpp \
     utils/Highlighter.cpp \
-    dialogs/CreatenewDialog.cpp \
+    utils/MdHighlighter.cpp \
-    utils/MdHighlighter.cpp
+    dialogs/AsmOptionsDialog.cpp \
+    dialogs/CreateNewDialog.cpp \
+    dialogs/NewFileDialog.cpp
 
 HEADERS  += \
     widgets/pieview.h \
@@ -110,16 +110,16 @@ HEADERS  += \
     dialogs/FlagDialog.h \
     dialogs/RenameDialog.h \
     dialogs/XrefsDialog.h \
-    dialogs/CreatenewDialog.h \
     utils/Helpers.h \
     utils/HexAsciiHighlighter.h \
     utils/HexHighlighter.h \
     MainWindow.h \
     utils/Highlighter.h \
     utils/MdHighlighter.h \
-    dialogs/NewfileDialog.h \
     Settings.h \
-    dialogs/OptionsDialog.h
+    dialogs/OptionsDialog.h \
+    dialogs/CreateNewDialog.h \
+    dialogs/NewFileDialog.h
 
 FORMS    += \
     widgets/notepad.ui \
@@ -144,10 +144,10 @@ FORMS    += \
     dialogs/FlagDialog.ui \
     dialogs/RenameDialog.ui \
     dialogs/XrefsDialog.ui \
-    dialogs/CreatenewDialog.ui \
     dialogs/NewfileDialog.ui \
     dialogs/OptionsDialog.ui \
-    MainWindow.ui
+    MainWindow.ui \
+    dialogs/CreateNewDialog.ui
 
 RESOURCES += \
     resources.qrc

src/dialogs/AboutDialog.cpp

@@ -17,10 +17,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
                           "Hugo Teso <hugo.teso@gmail.org>\nSoon to be thousands more!"));
 }
 
-AboutDialog::~AboutDialog()
+AboutDialog::~AboutDialog() {}
-{
-    delete ui;
-}
 
 void AboutDialog::on_buttonBox_rejected()
 {

src/dialogs/AboutDialog.h

@@ -2,6 +2,7 @@
 #define ABOUTDIALOG_H
 
 #include <QDialog>
+#include <memory>
 
 namespace Ui
 {
@@ -20,7 +21,7 @@ private slots:
     void on_buttonBox_rejected();
 
 private:
-    Ui::AboutDialog *ui;
+    std::unique_ptr<Ui::AboutDialog> ui;
 };
 
 #endif // ABOUTDIALOG_H

src/dialogs/AsmOptionsDialog.cpp

@@ -5,10 +5,11 @@
 
 #include "utils/Helpers.h"
 
-AsmOptionsDialog::AsmOptionsDialog(CutterCore *core, QWidget *parent) : QDialog(parent), ui(new Ui::AsmOptionsDialog)
+AsmOptionsDialog::AsmOptionsDialog(CutterCore *core, QWidget *parent)
+  : QDialog(parent),
+    core(core),
+    ui(new Ui::AsmOptionsDialog)
 {
-    this->core = core;
-
     ui->setupUi(this);
 
     ui->buttonBox->addButton(tr("Save as Defaults"), QDialogButtonBox::ButtonRole::ApplyRole);
@@ -21,10 +22,7 @@ AsmOptionsDialog::AsmOptionsDialog(CutterCore *core, QWidget *parent) : QDialog(
     updateFromVars();
 }
 
-AsmOptionsDialog::~AsmOptionsDialog()
+AsmOptionsDialog::~AsmOptionsDialog() {}
-{
-    delete ui;
-}
 
 void AsmOptionsDialog::updateFromVars()
 {

src/dialogs/AsmOptionsDialog.h

@@ -4,6 +4,7 @@
 
 #include <QDialog>
 #include <QPushButton>
+#include <memory>
 
 #include "cutter.h"
 
@@ -23,7 +24,7 @@ public:
 private:
     CutterCore *core;
 
-    Ui::AsmOptionsDialog *ui;
+    std::unique_ptr<Ui::AsmOptionsDialog> ui;
 
     void updateFromVars();
 

src/dialogs/CommentsDialog.cpp

@@ -9,10 +9,7 @@ CommentsDialog::CommentsDialog(QWidget *parent) :
     setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
 }
 
-CommentsDialog::~CommentsDialog()
+CommentsDialog::~CommentsDialog() {}
-{
-    delete ui;
-}
 
 void CommentsDialog::on_buttonBox_accepted()
 {

src/dialogs/CommentsDialog.h

@@ -2,6 +2,7 @@
 #define COMMENTSDIALOG_H
 
 #include <QDialog>
+#include <memory>
 
 namespace Ui
 {
@@ -24,7 +25,7 @@ private slots:
     void on_buttonBox_rejected();
 
 private:
-    Ui::CommentsDialog *ui;
+    std::unique_ptr<Ui::CommentsDialog> ui;
 };
 
 #endif // COMMENTSDIALOG_H

src/dialogs/CreateNewDialog.cpp

@@ -1,37 +1,34 @@
 #include <QMessageBox>
-#include "dialogs/NewfileDialog.h"
+#include "dialogs/NewFileDialog.h"
-#include "dialogs/CreatenewDialog.h"
+#include "dialogs/CreateNewDialog.h"
-#include "ui_CreatenewDialog.h"
+#include "ui_CreateNewDialog.h"
 #include "r_util.h"
 
-createNewDialog::createNewDialog(QWidget *parent) :
+CreateNewDialog::CreateNewDialog(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::createNewDialog)
+    ui(new Ui::CreateNewDialog),
+    w(new MainWindow)
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
-    w = new MainWindow(nullptr);
 }
 
-createNewDialog::~createNewDialog()
+CreateNewDialog::~CreateNewDialog() {}
-{
-    delete ui;
-}
 
-void createNewDialog::on_pushButton_2_clicked()
+void CreateNewDialog::on_pushButton_2_clicked()
 {
     // Close dialog and open OptionsDialog
     close();
-    NewFileDialog *n = new NewFileDialog(nullptr);
+    NewFileDialog *n = new NewFileDialog(nullptr); // TODO: This leaks
     n->show();
 }
 
-void createNewDialog::on_pushButton_3_clicked()
+void CreateNewDialog::on_pushButton_3_clicked()
 {
     close();
 }
 
-void createNewDialog::on_exampleButton_clicked()
+void CreateNewDialog::on_exampleButton_clicked()
 {
     QString type = ui->comboType->currentText();
     QString str;
@@ -70,7 +67,7 @@ void createNewDialog::on_exampleButton_clicked()
     // }
 }
 
-void createNewDialog::on_buttonCreate_clicked()
+void CreateNewDialog::on_buttonCreate_clicked()
 {
     RCoreLocked lcore = w->core->core();
     QString type = ui->comboType->currentText();
@@ -219,6 +216,7 @@ void createNewDialog::on_buttonCreate_clicked()
         __alert("TODO: non-raw fileformat is not yet supported");
         created = false;
         delete w->core;
+        w->core = nullptr;
     }
 
     if (created)

src/dialogs/CreateNewDialog.h

@@ -3,19 +3,20 @@
 
 #include <QDialog>
 #include "MainWindow.h"
+#include <memory>
 
 namespace Ui
 {
-    class createNewDialog;
+    class CreateNewDialog;
 }
 
-class createNewDialog : public QDialog
+class CreateNewDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit createNewDialog(QWidget *parent = 0);
+    explicit CreateNewDialog(QWidget *parent = 0);
-    ~createNewDialog();
+    ~CreateNewDialog();
 
 private slots:
     void on_pushButton_2_clicked();
@@ -27,7 +28,7 @@ private slots:
     void on_buttonCreate_clicked();
 
 private:
-    Ui::createNewDialog *ui;
+    std::unique_ptr<Ui::CreateNewDialog> ui;
     MainWindow *w;
 };
 

src/dialogs/CreateNewDialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>createNewDialog</class>
+ <class>CreateNewDialog</class>
- <widget class="QDialog" name="createNewDialog">
+ <widget class="QDialog" name="CreateNewDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -42,7 +42,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="resources.qrc">:/img/logo-small.png</pixmap>
+          <pixmap>:/img/logo-small.png</pixmap>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -451,8 +451,6 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="resources.qrc"/>
- </resources>
  <connections/>
 </ui>

src/dialogs/FlagDialog.cpp

@@ -3,23 +3,19 @@
 
 FlagDialog::FlagDialog(CutterCore *core, RVA offset, QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::FlagDialog)
+    ui(new Ui::FlagDialog),
+    core(core),
+    offset(offset)
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
 
-    this->core = core;
-    this->offset = offset;
-
     auto size_validator = new QIntValidator(ui->sizeEdit);
     size_validator->setBottom(1);
     ui->sizeEdit->setValidator(size_validator);
 }
 
-FlagDialog::~FlagDialog()
+FlagDialog::~FlagDialog() {}
-{
-    delete ui;
-}
 
 void FlagDialog::on_buttonBox_accepted()
 {

src/dialogs/FlagDialog.h

@@ -2,6 +2,7 @@
 #define FLAGDIALOG_H
 
 #include <QDialog>
+#include <memory>
 #include "cutter.h"
 
 namespace Ui
@@ -22,7 +23,7 @@ private slots:
     void on_buttonBox_rejected();
 
 private:
-    Ui::FlagDialog *ui;
+    std::unique_ptr<Ui::FlagDialog> ui;
 
     CutterCore *core;
     RVA offset;

src/dialogs/NewFileDialog.cpp

@@ -1,6 +1,6 @@
 #include "OptionsDialog.h"
-#include "dialogs/CreatenewDialog.h"
+#include "dialogs/CreateNewDialog.h"
-#include "dialogs/NewfileDialog.h"
+#include "dialogs/NewFileDialog.h"
 #include "ui_NewfileDialog.h"
 
 #include <QFileDialog>
@@ -111,10 +111,7 @@ NewFileDialog::NewFileDialog(QWidget *parent) :
     settings.setValue("recentFileList", files);
 }
 
-NewFileDialog::~NewFileDialog()
+NewFileDialog::~NewFileDialog() {}
-{
-    delete ui;
-}
 
 void NewFileDialog::on_loadFileButton_clicked()
 {
@@ -214,7 +211,7 @@ void NewFileDialog::on_createButton_clicked()
 {
     // Close dialog and open create new file dialog
     close();
-    createNewDialog *n = new createNewDialog(nullptr);
+    CreateNewDialog *n = new CreateNewDialog(nullptr);
     n->exec();
 }
 

src/dialogs/NewFileDialog.h

@@ -3,6 +3,7 @@
 
 #include <QDialog>
 #include <QListWidgetItem>
+#include <memory>
 
 namespace Ui
 {
@@ -36,7 +37,7 @@ private slots:
     void on_actionClear_all_triggered();
 
 private:
-    Ui::NewFileDialog *ui;
+    std::unique_ptr<Ui::NewFileDialog> ui;
 
     static const int MaxRecentFiles = 5;
 };

src/dialogs/OptionsDialog.cpp

@@ -1,7 +1,7 @@
 #include "OptionsDialog.h"
 #include "ui_OptionsDialog.h"
 #include "MainWindow.h"
-#include "dialogs/NewfileDialog.h"
+#include "dialogs/NewFileDialog.h"
 #include "utils/Helpers.h"
 
 // TODO: remove us
@@ -66,10 +66,7 @@ OptionsDialog::OptionsDialog(MainWindow *main):
     this->main->core->tryFile(fi.filePath(), fi.isWritable());
 }
 
-OptionsDialog::~OptionsDialog()
+OptionsDialog::~OptionsDialog() {}
-{
-    delete ui;
-}
 
 void OptionsDialog::updateCPUComboBox()
 {

src/dialogs/OptionsDialog.h

@@ -3,6 +3,7 @@
 
 #include <QDialog>
 #include <QStringList>
+#include <memory>
 #include "cutter.h"
 #include "analthread.h"
 #include "ui_OptionsDialog.h"
@@ -46,7 +47,7 @@ private:
 
     void updateCPUComboBox();
 public:
-    Ui::OptionsDialog *ui;
+    std::unique_ptr<Ui::OptionsDialog> ui;
     QString getSelectedArch();
     QString getSelectedCPU();
     int getSelectedBits();

src/dialogs/RenameDialog.cpp

@@ -9,10 +9,7 @@ RenameDialog::RenameDialog(QWidget *parent) :
     setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
 }
 
-RenameDialog::~RenameDialog()
+RenameDialog::~RenameDialog() {}
-{
-    delete ui;
-}
 
 void RenameDialog::on_buttonBox_accepted()
 {

src/dialogs/RenameDialog.h

@@ -2,6 +2,7 @@
 #define RENAMEDIALOG_H
 
 #include <QDialog>
+#include <memory>
 
 namespace Ui
 {
@@ -25,7 +26,7 @@ private slots:
     void on_buttonBox_rejected();
 
 private:
-    Ui::RenameDialog *ui;
+    std::unique_ptr<Ui::RenameDialog> ui;
 };
 
 #endif // RENAMEDIALOG_H

src/dialogs/XrefsDialog.cpp

@@ -26,10 +26,7 @@ XrefsDialog::XrefsDialog(MainWindow *main, QWidget *parent) :
     connect(ui->previewTextEdit, SIGNAL(cursorPositionChanged()), this, SLOT(highlightCurrentLine()));
 }
 
-XrefsDialog::~XrefsDialog()
+XrefsDialog::~XrefsDialog() {}
-{
-    delete ui;
-}
 
 void XrefsDialog::fillRefs(QList<XrefDescription> refs, QList<XrefDescription> xrefs)
 {

src/dialogs/XrefsDialog.h

@@ -3,6 +3,7 @@
 
 #include <QDialog>
 #include <QTreeWidgetItem>
+#include <memory>
 #include "utils/Highlighter.h"
 #include "cutter.h"
 
@@ -40,7 +41,7 @@ private:
     RVA addr;
     QString func_name;
 
-    Ui::XrefsDialog *ui;
+    std::unique_ptr<Ui::XrefsDialog> ui;
     MainWindow *main;
 
     Highlighter      *highlighter;

src/main.cpp

@@ -4,7 +4,7 @@
 #include <QMessageBox>
 
 #include "MainWindow.h"
-#include "dialogs/NewfileDialog.h"
+#include "dialogs/NewFileDialog.h"
 #include "dialogs/OptionsDialog.h"
 
 int main(int argc, char *argv[])

src/widgets/MemoryWidget.cpp

@@ -397,10 +397,7 @@ RVA MemoryWidget::readCurrentDisassemblyOffset()
     return ele.toULongLong(0, 16);
 }
 
-MemoryWidget::~MemoryWidget()
+MemoryWidget::~MemoryWidget() {}
-{
-    delete ui;
-}
 
 void MemoryWidget::setup()
 {

src/widgets/MemoryWidget.h

@@ -10,6 +10,7 @@
 #include <QUrl>
 #include <QPlainTextEdit>
 #include <QMouseEvent>
+#include <memory>
 #include "cutter.h"
 #include "utils/Highlighter.h"
 #include "utils/HexAsciiHighlighter.h"
@@ -96,7 +97,7 @@ protected:
     bool eventFilter(QObject *obj, QEvent *event) override;
 
 private:
-    Ui::MemoryWidget *ui;
+    std::unique_ptr<Ui::MemoryWidget> ui;
 
     ut64 hexdumpTopOffset;
     ut64 hexdumpBottomOffset;

src/widgets/commentswidget.cpp

@@ -32,10 +32,7 @@ CommentsWidget::CommentsWidget(MainWindow *main, QWidget *parent) :
     ui->frame->hide();
 }
 
-CommentsWidget::~CommentsWidget()
+CommentsWidget::~CommentsWidget() {}
-{
-    delete ui;
-}
 
 void CommentsWidget::setup()
 {

src/widgets/commentswidget.h

@@ -2,6 +2,7 @@
 #define COMMENTSWIDGET_H
 
 #include "dockwidget.h"
+#include <memory>
 
 class MainWindow;
 class QTreeWidgetItem;
@@ -42,7 +43,7 @@ private slots:
     void refreshTree();
 
 private:
-    Ui::CommentsWidget *ui;
+    std::unique_ptr<Ui::CommentsWidget> ui;
     MainWindow      *main;
 };
 

src/widgets/consolewidget.cpp

@@ -153,10 +153,7 @@ ConsoleWidget::ConsoleWidget(CutterCore *core, QWidget *parent) :
     historyOnDown->setContext(Qt::WidgetShortcut);
 }
 
-ConsoleWidget::~ConsoleWidget()
+ConsoleWidget::~ConsoleWidget() {}
-{
-    delete ui;
-}
 
 void ConsoleWidget::addOutput(const QString &msg)
 {

src/widgets/consolewidget.h

@@ -2,9 +2,9 @@
 #define CONSOLEWIDGET_H
 
 #include <QWidget>
+#include <memory>
 
 class CutterCore;
-
 class QAction;
 
 namespace Ui
@@ -50,7 +50,7 @@ private:
     void historyAdd(const QString &input);
     void invalidateHistoryPosition();
 
-    Ui::ConsoleWidget *ui;
+    std::unique_ptr<Ui::ConsoleWidget> ui;
     CutterCore  *core;
     QList<QAction *> actions;
     bool debugOutputEnabled;

src/widgets/dashboard.cpp

@@ -22,10 +22,7 @@ Dashboard::Dashboard(MainWindow *main, QWidget *parent) :
     //this->updateContents();
 }
 
-Dashboard::~Dashboard()
+Dashboard::~Dashboard() {}
-{
-    delete ui;
-}
 
 void Dashboard::setup()
 {

src/widgets/dashboard.h

@@ -2,6 +2,7 @@
 #define DASHBOARD_H
 
 #include "dockwidget.h"
+#include <memory>
 
 class MainWindow;
 
@@ -25,7 +26,7 @@ public:
 private:
     void updateContents();
 
-    Ui::Dashboard   *ui;
+    std::unique_ptr<Ui::Dashboard>   ui;
     MainWindow      *main;
 };
 

src/widgets/entrypointwidget.cpp

@@ -26,10 +26,7 @@ EntrypointWidget::EntrypointWidget(MainWindow *main, QWidget *parent) :
     ui->entrypointTreeWidget->hideColumn(0);
 }
 
-EntrypointWidget::~EntrypointWidget()
+EntrypointWidget::~EntrypointWidget() {}
-{
-    delete ui;
-}
 
 void EntrypointWidget::setup()
 {

src/widgets/entrypointwidget.h

@@ -4,6 +4,7 @@
 #include "dockwidget.h"
 #include <QStyledItemDelegate>
 #include <QTreeWidgetItem>
+#include <memory>
 
 class MainWindow;
 class QTreeWidget;
@@ -29,7 +30,7 @@ private slots:
     void on_entrypointTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column);
 
 private:
-    Ui::EntrypointWidget *ui;
+    std::unique_ptr<Ui::EntrypointWidget> ui;
     MainWindow      *main;
 
     void fillEntrypoint();

src/widgets/exportswidget.cpp

@@ -145,10 +145,7 @@ ExportsWidget::ExportsWidget(MainWindow *main, QWidget *parent) :
     ui->exportsTreeView->sortByColumn(ExportsModel::OFFSET, Qt::AscendingOrder);
 }
 
-ExportsWidget::~ExportsWidget()
+ExportsWidget::~ExportsWidget() {}
-{
-    delete ui;
-}
 
 void ExportsWidget::setup()
 {

src/widgets/exportswidget.h

@@ -3,6 +3,7 @@
 
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
+#include <memory>
 #include "cutter.h"
 #include "dockwidget.h"
 
@@ -73,7 +74,7 @@ private slots:
     void on_exportsTreeView_doubleClicked(const QModelIndex &index);
 
 private:
-    Ui::ExportsWidget *ui;
+    std::unique_ptr<Ui::ExportsWidget> ui;
     MainWindow      *main;
 
     ExportsModel *exports_model;

src/widgets/flagswidget.cpp

@@ -140,10 +140,7 @@ FlagsWidget::FlagsWidget(MainWindow *main, QWidget *parent) :
     connect(main->core, SIGNAL(flagsChanged()), this, SLOT(flagsChanged()));
 }
 
-FlagsWidget::~FlagsWidget()
+FlagsWidget::~FlagsWidget() {}
-{
-    delete ui;
-}
 
 void FlagsWidget::setup()
 {

src/widgets/flagswidget.h

@@ -3,6 +3,7 @@
 
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
+#include <memory>
 #include "cutter.h"
 #include "dockwidget.h"
 
@@ -72,7 +73,7 @@ private slots:
     void flagsChanged();
 
 private:
-    Ui::FlagsWidget *ui;
+    std::unique_ptr<Ui::FlagsWidget> ui;
     MainWindow      *main;
 
     FlagsModel *flags_model;

src/widgets/functionswidget.cpp

@@ -380,10 +380,7 @@ FunctionsWidget::FunctionsWidget(MainWindow *main, QWidget *parent) :
             this, SLOT(showTitleContextMenu(const QPoint &)));
 }
 
-FunctionsWidget::~FunctionsWidget()
+FunctionsWidget::~FunctionsWidget() {}
-{
-    delete ui;
-}
 
 void FunctionsWidget::setup()
 {

src/widgets/functionswidget.h

@@ -3,6 +3,7 @@
 
 #include <QSortFilterProxyModel>
 #include <QTreeView>
+#include <memory>
 #include "cutter.h"
 #include "dockwidget.h"
 
@@ -111,7 +112,7 @@ protected:
 private:
     QTreeView *getCurrentTreeView();
 
-    Ui::FunctionsWidget *ui;
+    std::unique_ptr<Ui::FunctionsWidget> ui;
     MainWindow      *main;
 
     QList<FunctionDescription> functions;

src/widgets/importswidget.cpp

@@ -34,13 +34,11 @@ void CMyDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, c
 
 ImportsWidget::ImportsWidget(MainWindow *main, QWidget *parent) :
     DockWidget(parent),
-    ui(new Ui::ImportsWidget)
+    ui(new Ui::ImportsWidget),
+    main(main)
 {
     ui->setupUi(this);
 
-    // Radare core found in:
-    this->main = main;
-
     // Delegate
     //CMyDelegate* delegate = new CMyDelegate(ui->importsTreeWidget);
     //ui->importsTreeWidget->setItemDelegate(delegate);
@@ -48,10 +46,7 @@ ImportsWidget::ImportsWidget(MainWindow *main, QWidget *parent) :
     ui->importsTreeWidget->hideColumn(0);
 }
 
-ImportsWidget::~ImportsWidget()
+ImportsWidget::~ImportsWidget() {}
-{
-    delete ui;
-}
 
 void ImportsWidget::setup()
 {

src/widgets/importswidget.h

@@ -4,6 +4,7 @@
 #include "dockwidget.h"
 #include <QStyledItemDelegate>
 #include <QTreeWidgetItem>
+#include <memory>
 
 class MainWindow;
 class QTreeWidget;
@@ -29,7 +30,7 @@ private slots:
     void on_importsTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column);
 
 private:
-    Ui::ImportsWidget *ui;
+    std::unique_ptr<Ui::ImportsWidget> ui;
     MainWindow      *main;
 
     void fillImports();

src/widgets/notepad.cpp

@@ -42,10 +42,7 @@ Notepad::Notepad(MainWindow *main, QWidget *parent) :
             this, SLOT(showNotepadContextMenu(const QPoint &)));
 }
 
-Notepad::~Notepad()
+Notepad::~Notepad() {}
-{
-    delete ui;
-}
 
 void Notepad::setup()
 {

src/widgets/notepad.h

@@ -2,6 +2,7 @@
 #define NOTEPAD_H
 
 #include "dockwidget.h"
+#include <memory>
 
 class MainWindow;
 class MdHighlighter;
@@ -71,7 +72,7 @@ private slots:
     void on_actionHexdump_function_triggered();
 
 private:
-    Ui::Notepad         *ui;
+    std::unique_ptr<Ui::Notepad> ui;
     MdHighlighter       *highlighter;
     Highlighter         *disasm_highlighter;
     bool                isFirstTime;

src/widgets/relocswidget.cpp

@@ -17,10 +17,7 @@ RelocsWidget::RelocsWidget(MainWindow *main, QWidget *parent) :
     ui->relocsTreeWidget->hideColumn(0);
 }
 
-RelocsWidget::~RelocsWidget()
+RelocsWidget::~RelocsWidget() {}
-{
-    delete ui;
-}
 
 void RelocsWidget::setup()
 {

src/widgets/relocswidget.h

@@ -2,6 +2,7 @@
 #define RELOCSWIDGET_H
 
 #include "dashboard.h"
+#include <memory>
 
 class MainWindow;
 class QTreeWidgetItem;
@@ -27,7 +28,7 @@ private slots:
     void on_relocsTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column);
 
 private:
-    Ui::RelocsWidget *ui;
+    std::unique_ptr<Ui::RelocsWidget> ui;
     MainWindow      *main;
 
     void fillTreeWidget();

src/widgets/sdbdock.cpp

@@ -93,10 +93,7 @@ void SdbDock::on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column)
     }
 }
 
-SdbDock::~SdbDock()
+SdbDock::~SdbDock() {}
-{
-    delete ui;
-}
 
 void SdbDock::setup()
 {

src/widgets/sdbdock.h

@@ -2,6 +2,7 @@
 #define SDBDOCK_H
 
 #include "dockwidget.h"
+#include <memory>
 
 class MainWindow;
 class QTreeWidgetItem;
@@ -31,7 +32,7 @@ private slots:
     void on_treeWidget_itemChanged(QTreeWidgetItem *item, int column);
 
 private:
-    Ui::SdbDock *ui;
+    std::unique_ptr<Ui::SdbDock> ui;
     QString path;
     MainWindow      *main;
 

src/widgets/sectionsdock.cpp

@@ -25,10 +25,7 @@ SectionsDock::SectionsDock(MainWindow *main, QWidget *parent) :
             this, SLOT(showSectionsContextMenu(const QPoint &)));
 }
 
-SectionsDock::~SectionsDock()
+SectionsDock::~SectionsDock() {}
-{
-    delete ui;
-}
 
 void SectionsDock::setup()
 {

src/widgets/sectionsdock.h

@@ -2,6 +2,7 @@
 #define SECTIONSDOCK_H
 
 #include "dockwidget.h"
+#include <memory>
 
 class MainWindow;
 class SectionsWidget;
@@ -35,7 +36,7 @@ private slots:
     void on_actionHorizontal_triggered();
 
 private:
-    Ui::SectionsDock *ui;
+    std::unique_ptr<Ui::SectionsDock> ui;
     MainWindow      *main;
     SectionsWidget  *sectionsWidget;
 };

src/widgets/sidebar.cpp

@@ -33,10 +33,7 @@ SideBar::SideBar(MainWindow *main) :
     }
 }
 
-SideBar::~SideBar()
+SideBar::~SideBar() {}
-{
-    delete ui;
-}
 
 void SideBar::on_tabsButton_clicked()
 {

src/widgets/sidebar.h

@@ -2,6 +2,7 @@
 #define SIDEBAR_H
 
 #include <QWidget>
+#include <memory>
 
 class MainWindow;
 
@@ -44,7 +45,7 @@ private slots:
     void on_refreshButton_clicked();
 
 private:
-    Ui::SideBar *ui;
+    std::unique_ptr<Ui::SideBar> ui;
     MainWindow  *main;
 };
 

src/widgets/stringswidget.cpp

@@ -17,10 +17,7 @@ StringsWidget::StringsWidget(MainWindow *main, QWidget *parent) :
     ui->stringsTreeWidget->hideColumn(0);
 }
 
-StringsWidget::~StringsWidget()
+StringsWidget::~StringsWidget() {}
-{
-    delete ui;
-}
 
 void StringsWidget::setup()
 {

src/widgets/stringswidget.h

@@ -2,6 +2,7 @@
 #define STRINGSWIDGET_H
 
 #include "dockwidget.h"
+#include <memory>
 
 class MainWindow;
 class QTreeWidgetItem;
@@ -29,7 +30,7 @@ private slots:
     void on_stringsTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column);
 
 private:
-    Ui::StringsWidget *ui;
+    std::unique_ptr<Ui::StringsWidget> ui;
     MainWindow      *main;
 
     void fillTreeWidget();

src/widgets/symbolswidget.cpp

@@ -17,10 +17,7 @@ SymbolsWidget::SymbolsWidget(MainWindow *main, QWidget *parent) :
     ui->symbolsTreeWidget->hideColumn(0);
 }
 
-SymbolsWidget::~SymbolsWidget()
+SymbolsWidget::~SymbolsWidget() {}
-{
-    delete ui;
-}
 
 void SymbolsWidget::setup()
 {

src/widgets/symbolswidget.h

@@ -2,6 +2,7 @@
 #define SYMBOLSWIDGET_H
 
 #include "dockwidget.h"
+#include <memory>
 
 class MainWindow;
 class QTreeWidgetItem;
@@ -27,7 +28,7 @@ private slots:
     void on_symbolsTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column);
 
 private:
-    Ui::SymbolsWidget *ui;
+    std::unique_ptr<Ui::SymbolsWidget> ui;
     MainWindow      *main;
 
     void fillSymbols();