From c9961ff00a8c877a4c0b9f7520ecf44e44e3a2d6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 16 Oct 2022 14:21:17 +0300 Subject: [PATCH] kmail: use object instead of pointer for KEmailDialog plugs memory leaks and fixes user and password saving (done in KEMail destructor) Signed-off-by: Ivailo Monev --- kmail/main.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kmail/main.cpp b/kmail/main.cpp index f3175155..c7fe3b66 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -51,16 +51,16 @@ int main(int argc, char **argv) { option.add("+[url]", ki18n("URL to be opened")); KCmdLineArgs::addCmdLineOptions(option); - KApplication *app = new KApplication(); - KEMailDialog *dialog = new KEMailDialog(); - dialog->show(); + KApplication *kapplication = new KApplication(); + KEMailDialog kemaildialog; + kemaildialog.show(); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); for (int pos = 0; pos < args->count(); pos++) { const KUrl argurl = args->url(pos); if (argurl.hasQueryItem("subject")) { - dialog->setSubject(argurl.queryItemValue("subject")); + kemaildialog.setSubject(argurl.queryItemValue("subject")); } QStringList mailto; @@ -73,17 +73,17 @@ int main(int argc, char **argv) { if (mailto.isEmpty()) { mailto.append(argurl.url().replace(QLatin1String("mailto:"), QString())); } - dialog->setTo(mailto); + kemaildialog.setTo(mailto); if (argurl.hasQueryItem("body")) { - dialog->setMessage(argurl.queryItemValue("body")); + kemaildialog.setMessage(argurl.queryItemValue("body")); } if (argurl.hasQueryItem("attach")) { - dialog->setAttach(splitMailArg(argurl.queryItemValue("attach"))); + kemaildialog.setAttach(splitMailArg(argurl.queryItemValue("attach"))); } break; } - return app->exec(); + return kapplication->exec(); } -- 2.11.0