Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix memory leaks #239

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix memory leaks #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gui/codeview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Gui {
CodeView::CodeView(QWidget *parent)
: TextView(parent)
{
auto *action = new QAction(tr("Show TreeSitter Explorer"));
auto *action = new QAction(tr("Show TreeSitter Explorer"), this);
GuiSettings::setIcon(action, ":/gui/file-tree.png");
connect(action, &QAction::triggered, this, &CodeView::treeSitterExplorerRequested);
addAction(action);
Expand Down
16 changes: 8 additions & 8 deletions src/gui/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ QWidget *MainWindow::widgetForDocument(Core::Document *document)
switch (document->type()) {
case Core::Document::Type::Rc: {
auto rcDocument = qobject_cast<Core::RcDocument *>(document);
auto rcview = new RcUi::RcFileView();
auto rcview = new RcUi::RcFileView(this);
rcview->setRcFile(rcDocument->file());
QObject::connect(rcview, &RcUi::RcFileView::languageChanged, rcDocument, &Core::RcDocument::setLanguage);
GuiSettings::setupDocumentTextEdit(rcview->textEdit(), document);
Expand All @@ -737,42 +737,42 @@ QWidget *MainWindow::widgetForDocument(Core::Document *document)
return rcview;
}
case Core::Document::Type::QtUi: {
auto uiview = new QtUiView();
auto uiview = new QtUiView(this);
uiview->setUiDocument(qobject_cast<Core::QtUiDocument *>(document));
return uiview;
}
case Core::Document::Type::Image: {
auto imageview = new ImageView();
auto imageview = new ImageView(this);
imageview->setImageDocument(qobject_cast<Core::ImageDocument *>(document));
return imageview;
}
case Core::Document::Type::Slint: {
auto slintView = new SlintView();
auto slintView = new SlintView(this);
slintView->setDocument(qobject_cast<Core::SlintDocument *>(document));
return slintView;
}
case Core::Document::Type::Qml: {

auto qmlview = new QmlView();
auto qmlview = new QmlView(this);
qmlview->setDocument(qobject_cast<Core::QmlDocument *>(document));
return qmlview;
}
case Core::Document::Type::QtTs: {
auto tsView = new QtTsView();
auto tsView = new QtTsView(this);
tsView->setTsDocument(qobject_cast<Core::QtTsDocument *>(document));
return tsView;
}
case Core::Document::Type::CSharp:
case Core::Document::Type::Cpp: {
auto codeView = new CodeView();
auto codeView = new CodeView(this);
codeView->setDocument(qobject_cast<Core::CodeDocument *>(document));
connect(codeView, &CodeView::treeSitterExplorerRequested, this, &MainWindow::inspectTreeSitter);
return codeView;
}
case Core::Document::Type::Json:
case Core::Document::Type::Text:
default: {
auto textView = new TextView();
auto textView = new TextView(this);
textView->setDocument(qobject_cast<Core::TextDocument *>(document));
return textView;
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qmlview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Gui {
QmlView::QmlView(QWidget *parent)
: TextView(parent)
{
auto *action = new QAction(tr("Run"));
auto *action = new QAction(tr("Run"), this);
GuiSettings::setIcon(action, ":/gui/eye.png");
connect(action, &QAction::triggered, this, &QmlView::runQml);
addAction(action);
Expand All @@ -41,7 +41,7 @@ void QmlView::runQml()

const QString qmlFilePath = document()->fileName();

auto *qmlView = new QQuickView();
auto *qmlView = new QQuickView(this->window()->windowHandle());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't work as expected.
It should show a new window (I suppose that's the reason why there wasn't any parents).
A way to fix that would be to use Delete_on_Close widget attribute.

qmlView->setSource(QUrl::fromLocalFile(qmlFilePath));
qmlView->show();
}
Expand Down
4 changes: 3 additions & 1 deletion src/gui/qttsview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ QtTsView::QtTsView(QWidget *parent)
: QWidget(parent)
, FindInterface(FindInterface::CanSearch)
, m_tableView(new QTableView(this))
, m_findAdapter(new FindAdapter(m_tableView))
, m_findAdapter(std::make_unique<FindAdapter>(m_tableView))
, m_searchLineEdit(new QLineEdit(this))
, m_contentProxyModel(new QtTsProxy(this))
{
Expand All @@ -173,6 +173,8 @@ QtTsView::QtTsView(QWidget *parent)
connect(m_searchLineEdit, &QLineEdit::textChanged, m_contentProxyModel, &QtTsProxy::setFilterText);
}

QtTsView::~QtTsView() = default;

void QtTsView::setTsDocument(Core::QtTsDocument *document)
{
Q_ASSERT(document);
Expand Down
3 changes: 2 additions & 1 deletion src/gui/qttsview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class QtTsView : public QWidget, public FindInterface

public:
explicit QtTsView(QWidget *parent = nullptr);
~QtTsView();

void setTsDocument(Core::QtTsDocument *document);

Expand All @@ -40,7 +41,7 @@ class QtTsView : public QWidget, public FindInterface
void updateView();

QTableView *const m_tableView;
FindAdapter *const m_findAdapter;
std::unique_ptr<FindAdapter> m_findAdapter;
QLineEdit *const m_searchLineEdit;
Core::QtTsDocument *m_document = nullptr;
QtTsProxy *const m_contentProxyModel;
Expand Down
4 changes: 3 additions & 1 deletion src/gui/qtuiview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ QtUiView::QtUiView(QWidget *parent)
: QSplitter(parent)
, FindInterface(FindInterface::CanSearch)
, m_tableView(new QTableView(this))
, m_findAdapter(new FindAdapter(m_tableView))
, m_findAdapter(std::make_unique<FindAdapter>(m_tableView))
, m_previewArea(new QMdiArea(this))
{
addWidget(m_previewArea);
Expand All @@ -119,6 +119,8 @@ QtUiView::QtUiView(QWidget *parent)
m_previewArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
}

QtUiView::~QtUiView() = default;

void QtUiView::find(const QString &searchText, int options)
{
m_findAdapter->find(searchText, options);
Expand Down
3 changes: 2 additions & 1 deletion src/gui/qtuiview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class QtUiView : public QSplitter, public FindInterface

public:
explicit QtUiView(QWidget *parent = nullptr);
~QtUiView();

void setUiDocument(Core::QtUiDocument *document);

Expand All @@ -40,7 +41,7 @@ class QtUiView : public QSplitter, public FindInterface
void updateView();

QTableView *const m_tableView;
FindAdapter *const m_findAdapter;
std::unique_ptr<FindAdapter> m_findAdapter;
QMdiArea *const m_previewArea;
Core::QtUiDocument *m_document = nullptr;
QMdiSubWindow *m_previewWindow = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/scriptpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ ScriptDialog {

ScriptPanel::ScriptPanel(QWidget *parent)
: QPlainTextEdit {parent}
, m_toolBar(new QWidget)
, m_toolBar(new QWidget(this))
{
setWindowTitle(tr("Script Panel"));
setObjectName("ScriptPanel");
Expand Down