Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
40a46927
Commit
40a46927
authored
Oct 24, 2019
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Changed so that XttTrace can be closed by deleting the object without calling close().
parent
09eeae9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
xtt/lib/xtt/qt/xtt_trace_qt.cqt
xtt/lib/xtt/qt/xtt_trace_qt.cqt
+9
-6
No files found.
xtt/lib/xtt/qt/xtt_trace_qt.cqt
View file @
40a46927
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
#include "xtt_trace_qt.h"
#include "xtt_trace_qt.h"
#include <QAction>
#include <QAction>
#include <QCloseEvent>
#include <QMenu>
#include <QMenu>
#include <QMenuBar>
#include <QMenuBar>
#include <QSplitter>
#include <QSplitter>
...
@@ -173,14 +174,12 @@ void RtTraceQtWidget::activate_helpplclist()
...
@@ -173,14 +174,12 @@ void RtTraceQtWidget::activate_helpplclist()
RtTraceQt::~RtTraceQt()
RtTraceQt::~RtTraceQt()
{
{
trace_tNode *node, *fnode;
trace_stop();
trace_stop();
/* Delete all trace children windows */
/* Delete all trace children windows */
for (node = trace_list; node;) {
for (
trace_tNode *
node = trace_list; node;) {
delete node->tractx;
delete node->tractx;
fnode = node->Next;
trace_tNode *
fnode = node->Next;
free((char*)node);
free((char*)node);
node = fnode;
node = fnode;
}
}
...
@@ -188,6 +187,10 @@ RtTraceQt::~RtTraceQt()
...
@@ -188,6 +187,10 @@ RtTraceQt::~RtTraceQt()
nav_shell->close();
nav_shell->close();
}
}
if (toplevel) {
delete toplevel;
}
if (trace_timerid) {
if (trace_timerid) {
delete trace_timerid;
delete trace_timerid;
}
}
...
@@ -211,7 +214,7 @@ RtTrace* RtTraceQt::subwindow_new(void* ctx, pwr_tObjid oid, pwr_tStatus* sts)
...
@@ -211,7 +214,7 @@ RtTrace* RtTraceQt::subwindow_new(void* ctx, pwr_tObjid oid, pwr_tStatus* sts)
void RtTraceQtWidget::closeEvent(QCloseEvent* event)
void RtTraceQtWidget::closeEvent(QCloseEvent* event)
{
{
rt->activate_close();
rt->activate_close();
QWidget::closeEvent(event
);
event->ignore(
);
}
}
RtTraceQt::RtTraceQt(void* tr_parent_ctx, pwr_tObjid tr_objid,
RtTraceQt::RtTraceQt(void* tr_parent_ctx, pwr_tObjid tr_objid,
...
@@ -468,4 +471,4 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, pwr_tObjid tr_objid,
...
@@ -468,4 +471,4 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, pwr_tObjid tr_objid,
}
}
wow->DisplayError("Version mismatch", msg);
wow->DisplayError("Version mismatch", msg);
}
}
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment