From bc71c07c90d22612b6b28321a5b7a9849d22fc3a Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 24 Feb 2021 20:42:17 -0500 Subject: [PATCH] 2021-02-24 Fred Gleason * Fixed a memory leak in 'RDSchedCodesDialog'. * Fixed a memory leaks in rdadmin(1). Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ lib/rdschedcodes_dialog.cpp | 1 + rdadmin/edit_decks.cpp | 1 + rdadmin/edit_matrix.cpp | 1 + rdadmin/list_svcs.cpp | 1 - rdadmin/login.cpp | 21 +++++---------------- rdadmin/login.h | 3 --- rdadmin/rdadmin_cs.ts | 24 ++++++++++++++++++++---- rdadmin/rdadmin_de.ts | 24 ++++++++++++++++++++---- rdadmin/rdadmin_es.ts | 24 ++++++++++++++++++++---- rdadmin/rdadmin_fr.ts | 8 ++++---- rdadmin/rdadmin_nb.ts | 24 ++++++++++++++++++++---- rdadmin/rdadmin_nn.ts | 24 ++++++++++++++++++++---- rdadmin/rdadmin_pt_BR.ts | 24 ++++++++++++++++++++---- 14 files changed, 135 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdd950a7..2fafe5d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21183,3 +21183,6 @@ 2021-02-24 Fred Gleason * Fixed a regression in 'RDTransportButton' that caused keycaps to be invisible. +2021-02-24 Fred Gleason + * Fixed a memory leak in 'RDSchedCodesDialog'. + * Fixed a memory leaks in rdadmin(1). diff --git a/lib/rdschedcodes_dialog.cpp b/lib/rdschedcodes_dialog.cpp index c0472e20..72fae8b4 100644 --- a/lib/rdschedcodes_dialog.cpp +++ b/lib/rdschedcodes_dialog.cpp @@ -143,6 +143,7 @@ void RDSchedCodesDialog::paintEvent(QPaintEvent *e) p->setPen(QColor(Qt::black)); p->drawLine(sizeHint().width(),10,sizeHint().width(),210); p->end(); + delete p; } diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp index dc10157e..97d7d432 100644 --- a/rdadmin/edit_decks.cpp +++ b/rdadmin/edit_decks.cpp @@ -537,6 +537,7 @@ void EditDecks::paintEvent(QPaintEvent *e) p->setPen(QColor(Qt::black)); p->drawLine(385,10,385,sizeHint().height()-10); p->end(); + delete p; } diff --git a/rdadmin/edit_matrix.cpp b/rdadmin/edit_matrix.cpp index c867c340..9e1e1662 100644 --- a/rdadmin/edit_matrix.cpp +++ b/rdadmin/edit_matrix.cpp @@ -824,6 +824,7 @@ void EditMatrix::paintEvent(QPaintEvent *e) p->drawLine(10,232,10,364); p->end(); + delete p; } diff --git a/rdadmin/list_svcs.cpp b/rdadmin/list_svcs.cpp index ee823329..3ccfaa2c 100644 --- a/rdadmin/list_svcs.cpp +++ b/rdadmin/list_svcs.cpp @@ -18,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include #include #include diff --git a/rdadmin/login.cpp b/rdadmin/login.cpp index 417d5007..708acacd 100644 --- a/rdadmin/login.cpp +++ b/rdadmin/login.cpp @@ -18,10 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include - #include -#include #include @@ -51,17 +48,17 @@ Login::Login(QString *username,QString *password,QWidget *parent) QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(10,60,100,55); ok_button->setFont(buttonFont()); - ok_button->setText(tr("&OK")); + ok_button->setText(tr("OK")); ok_button->setDefault(true); connect(ok_button,SIGNAL(clicked()),this,SLOT(okData())); // - // CANCEL Button + // Cancel Button // QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(120,60,100,55); cancel_button->setFont(buttonFont()); - cancel_button->setText(tr("&Cancel")); + cancel_button->setText(tr("Cancel")); connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); // @@ -72,7 +69,7 @@ Login::Login(QString *username,QString *password,QWidget *parent) login_name_edit->setMaxLength(RD_MAX_PASSWORD_LENGTH); login_name_edit->setFocus(); login_name_edit->setValidator(validator); - QLabel *login_name_label=new QLabel(tr("User &Name:"),this); + QLabel *login_name_label=new QLabel(tr("User Name:"),this); login_name_label->setFont(labelFont()); login_name_label->setGeometry(10,10,85,19); login_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); @@ -85,7 +82,7 @@ Login::Login(QString *username,QString *password,QWidget *parent) login_password_edit->setMaxLength(16); login_password_edit->setEchoMode(QLineEdit::Password); login_password_edit->setValidator(validator); - QLabel *login_password_label=new QLabel(tr("&Password:"),this); + QLabel *login_password_label=new QLabel(tr("Password:"),this); login_password_label->setGeometry(10,31,85,19); login_password_label->setFont(labelFont()); login_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); @@ -123,11 +120,3 @@ void Login::cancelData() { done(false); } - - -void Login::paintEvent(QPaintEvent *paintevent) -{ - QPainter *p=new QPainter(this); - - p->end(); -} diff --git a/rdadmin/login.h b/rdadmin/login.h index b3b368d6..28b1a9cf 100644 --- a/rdadmin/login.h +++ b/rdadmin/login.h @@ -34,9 +34,6 @@ class Login : public RDDialog QSize sizeHint() const; QSizePolicy sizePolicy() const; - protected: - void paintEvent(QPaintEvent *); - private slots: void okData(); void cancelData(); diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 27b8ce55..2a6f9abd 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -6296,19 +6296,35 @@ Stále ještě chcete pokračovat? &OK - &OK + &OK &Cancel - Z&rušit + Z&rušit User &Name: - &Uživatelské jméno: + &Uživatelské jméno: &Password: - He&slo: + He&slo: + + + OK + + + + Cancel + Zrušit + + + User Name: + + + + Password: + Heslo: diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 090ec70f..4460eeb1 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -5841,19 +5841,35 @@ Wollen Sie immernoch fortfahren? &OK - &OK + &OK &Cancel - Abbre&chen + Abbre&chen User &Name: - Benutzer-&Name: + Benutzer-&Name: &Password: - &Passwort: + &Passwort: + + + OK + + + + Cancel + + + + User Name: + + + + Password: + Passwort: diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index 4655ee53..298f07e2 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -6238,19 +6238,35 @@ Do you still want to proceed? &OK - &Aceptar + &Aceptar &Cancel - &Cancelar + &Cancelar User &Name: - &Usuario: + &Usuario: &Password: - C&ontraseña: + C&ontraseña: + + + OK + + + + Cancel + Cancelar + + + User Name: + + + + Password: + Clave: diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index 42ebea78..2fea7ca3 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -4451,19 +4451,19 @@ Carts Login - &OK + OK - &Cancel + Cancel - User &Name: + User Name: - &Password: + Password: diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 8ead674d..51ec1362 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -5672,19 +5672,35 @@ Er du sikker på at du vil halda fram? &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt User &Name: - Br&ukarnamn: + Br&ukarnamn: &Password: - &Passord: + &Passord: + + + OK + + + + Cancel + + + + User Name: + + + + Password: + Passord: diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 8ead674d..51ec1362 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -5672,19 +5672,35 @@ Er du sikker på at du vil halda fram? &OK - &OK + &OK &Cancel - &Avbryt + &Avbryt User &Name: - Br&ukarnamn: + Br&ukarnamn: &Password: - &Passord: + &Passord: + + + OK + + + + Cancel + + + + User Name: + + + + Password: + Passord: diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index cd2f032c..8d3c1de1 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -5809,19 +5809,35 @@ Você quer proceder? &OK - &OK + &OK &Cancel - &Cancelar + &Cancelar User &Name: - &Usuário: + &Usuário: &Password: - &Senha: + &Senha: + + + OK + + + + Cancel + + + + User Name: + + + + Password: + Senha: