Commit 889d9fe0 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Added destructor to XAttOne.

parent 3eaf7f35
...@@ -183,6 +183,7 @@ int XAttOneQt::change_value(int set_focus) ...@@ -183,6 +183,7 @@ int XAttOneQt::change_value(int set_focus)
set_prompt(Lng::translate("value >")); set_prompt(Lng::translate("value >"));
input_open = 1; input_open = 1;
} }
toplevel->update();
return XATT__SUCCESS; return XATT__SUCCESS;
} }
...@@ -232,9 +233,13 @@ void XAttOneQt::pop() ...@@ -232,9 +233,13 @@ void XAttOneQt::pop()
::pop(toplevel); ::pop(toplevel);
} }
XAttOneQt::~XAttOneQt()
{
delete cmd_entry;
}
void XAttOneQtWidget::closeEvent(QCloseEvent* event) void XAttOneQtWidget::closeEvent(QCloseEvent* event)
{ {
debug_print("XAttOneQtWidget::closeEvent\n");
if (attone->close_cb) { if (attone->close_cb) {
(attone->close_cb)(attone->parent_ctx, attone); (attone->close_cb)(attone->parent_ctx, attone);
} else { } else {
...@@ -288,11 +293,8 @@ XAttOneQt::XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx, ...@@ -288,11 +293,8 @@ XAttOneQt::XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
// Buttons // Buttons
QDialogButtonBox* buttons = new QDialogButtonBox(); QDialogButtonBox* buttons = new QDialogButtonBox();
buttons->addButton(QDialogButtonBox::Ok); buttons->addButton(QDialogButtonBox::Ok);
buttons->button(QDialogButtonBox::Ok)->setFixedSize(70, 25);
buttons->addButton(QDialogButtonBox::Apply); buttons->addButton(QDialogButtonBox::Apply);
buttons->button(QDialogButtonBox::Apply)->setFixedSize(70, 25);
buttons->addButton(QDialogButtonBox::Cancel); buttons->addButton(QDialogButtonBox::Cancel);
buttons->button(QDialogButtonBox::Cancel)->setFixedSize(70, 25);
QObject::connect(buttons->button(QDialogButtonBox::Ok), SIGNAL(clicked()), QObject::connect(buttons->button(QDialogButtonBox::Ok), SIGNAL(clicked()),
toplevel, SLOT(activate_cmd_scrolled_ok())); toplevel, SLOT(activate_cmd_scrolled_ok()));
QObject::connect(buttons->button(QDialogButtonBox::Apply), SIGNAL(clicked()), QObject::connect(buttons->button(QDialogButtonBox::Apply), SIGNAL(clicked()),
...@@ -322,11 +324,7 @@ XAttOneQt::XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx, ...@@ -322,11 +324,7 @@ XAttOneQt::XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
toplevel->setLayout(vbox); toplevel->setLayout(vbox);
toplevel->show(); toplevel->show();
if (priv & pwr_mPrv_RtWrite || priv & pwr_mPrv_System) { access_rw = ((priv & pwr_mPrv_RtWrite) || (priv & pwr_mPrv_System));
access_rw = 1;
} else {
access_rw = 0;
}
msg_label->setVisible(false); msg_label->setVisible(false);
if (access_rw) { if (access_rw) {
......
...@@ -52,6 +52,7 @@ class XAttOneQt : public XAttOne { ...@@ -52,6 +52,7 @@ class XAttOneQt : public XAttOne {
public: public:
XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx, pwr_sAttrRef* xa_objar, XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
char* xa_title, unsigned int xa_priv, int* xa_sts); char* xa_title, unsigned int xa_priv, int* xa_sts);
~XAttOneQt();
QWidget* form_widget; QWidget* form_widget;
QLabel* msg_label; QLabel* msg_label;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment