summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/mail2/addresspicker.cpp10
-rw-r--r--noncore/unsupported/mail2/attachdiag.cpp10
-rw-r--r--noncore/unsupported/mail2/configdiag.cpp21
-rw-r--r--noncore/unsupported/mail2/rename.cpp28
4 files changed, 35 insertions, 34 deletions
diff --git a/noncore/unsupported/mail2/addresspicker.cpp b/noncore/unsupported/mail2/addresspicker.cpp
index 178fe27..7f32725 100644
--- a/noncore/unsupported/mail2/addresspicker.cpp
+++ b/noncore/unsupported/mail2/addresspicker.cpp
@@ -83,35 +83,35 @@ void AddressPicker::accept()
QListBoxItem *item = addressList->firstItem();
QString names;
while (item) {
if (item->selected())
names += item->text() + ", ";
item = item->next();
}
names.replace(names.length() - 2, 2, "");
if (names.isEmpty()) {
QMessageBox::information(this, tr("Error"), tr("<p>You have to select"
" at least one address entry.</p>"), tr("Ok"));
return;
}
selectedNames = names;
QDialog::accept();
}
QString AddressPicker::getNames()
{
QString names = 0;
- AddressPicker *picker = new AddressPicker(0, 0, true);
- picker->showMaximized();
- picker->show();
+ AddressPicker picker(0, 0, true);
+ picker.showMaximized();
+ picker.show();
- int ret = picker->exec();
+ int ret = picker.exec();
if (QDialog::Accepted == ret) {
- return picker->selectedNames;
+ return picker.selectedNames;
}
return 0;
}
diff --git a/noncore/unsupported/mail2/attachdiag.cpp b/noncore/unsupported/mail2/attachdiag.cpp
index bedf3c4..36e1948 100644
--- a/noncore/unsupported/mail2/attachdiag.cpp
+++ b/noncore/unsupported/mail2/attachdiag.cpp
@@ -36,36 +36,36 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
cancelButton->setIconSet(Resource::loadPixmap("editdelete"));
layout->addWidget(cancelButton, 1, 1);
connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), SLOT(fileSelected(const DocLnk &)));
connect(attachButton, SIGNAL(clicked()), SLOT(accept()));
connect(cancelButton, SIGNAL(clicked()), SLOT(close()));
if (fileSelector->selected() != NULL)
currentFile = *fileSelector->selected();
if (fileSelector->fileCount() == 0) {
attachButton->setEnabled(false);
fileSelector->setEnabled(false);
}
}
void AttachDiag::fileSelected(const DocLnk &file)
{
currentFile = file;
}
DocLnk AttachDiag::getFile(QWidget *parent)
{
- AttachDiag *attach = new AttachDiag(parent, 0, true);
- attach->showMaximized();
- attach->show();
+ AttachDiag attach(parent, 0, true);
+ attach.showMaximized();
+ attach.show();
- if (QDialog::Accepted == attach->exec()) {
- return attach->currentFile;
+ if (QDialog::Accepted == attach.exec()) {
+ return attach.currentFile;
}
return DocLnk();
}
diff --git a/noncore/unsupported/mail2/configdiag.cpp b/noncore/unsupported/mail2/configdiag.cpp
index be1f1f4..b89b937 100644
--- a/noncore/unsupported/mail2/configdiag.cpp
+++ b/noncore/unsupported/mail2/configdiag.cpp
@@ -58,73 +58,74 @@ void ConfigDiag::accept()
{
_configBenD->setGroup("Settings");
_configBenD->writeEntry("Disabled", disabled->isChecked());
_configBenD->writeEntry("PlaySound", playSound->isChecked());
_configBenD->writeEntry("BlinkLed", blinkLed->isChecked());
_configBenD->writeEntry("CheckDelay", checkDelay->value());
_configBenD->write();
QDialog::accept();
}
void ConfigDiag::slotFillLists()
{
accountList->clear();
QValueList<Account> accounts = ConfigFile::getAccounts();
QValueList<Account>::Iterator it;
for (it = accounts.begin(); it != accounts.end(); it++)
(void) new AccountListItem(accountList, *it);
}
void ConfigDiag::slotNewAccount()
{
- AccountEditor *editor = new AccountEditor(Account(), 0, 0, true);
- editor->showMaximized();
- editor->show();
+ Account account;
+ AccountEditor editor(account, 0, 0, true);
+ editor.showMaximized();
+ editor.show();
- if (QDialog::Accepted == editor->exec()) {
- ConfigFile::updateAccount(editor->_account);
+ if (QDialog::Accepted == editor.exec()) {
+ ConfigFile::updateAccount(editor._account);
slotFillLists();
emit changed();
}
}
void ConfigDiag::slotEditAccount()
{
if (!accountList->currentItem()) {
QMessageBox::information(this, tr("Error"), tr("<p>You have to select an account first.</p>"), tr("Ok"));
return;
}
Account account = ((AccountListItem *)accountList->currentItem())->account();
- AccountEditor *editor = new AccountEditor(account, 0, 0, true);
- editor->showMaximized();
- editor->show();
+ AccountEditor editor(account, 0, 0, true);
+ editor.showMaximized();
+ editor.show();
- if (QDialog::Accepted == editor->exec()) {
- ConfigFile::updateAccount(editor->_account);
+ if (QDialog::Accepted == editor.exec()) {
+ ConfigFile::updateAccount(editor._account);
slotFillLists();
emit changed();
}
}
void ConfigDiag::slotDelAccount()
{
if (!accountList->currentItem()) {
QMessageBox::information(this, tr("Error"), tr("<p>You have to select an account first.</p>"), tr("Ok"));
return;
}
Account account = ((AccountListItem *)accountList->currentItem())->account();
int ret = QMessageBox::information(this, tr("Question"), tr("<p>Do you relly want to delete the selected account?</p>"), tr("Yes"), tr("No"));
if (1 == ret) return;
ConfigFile::deleteAccount(account);
slotFillLists();
emit changed();
}
void ConfigDiag::slotTestSettings()
{
testbutton->setEnabled(false);
diff --git a/noncore/unsupported/mail2/rename.cpp b/noncore/unsupported/mail2/rename.cpp
index 8c2fde1..627db0b 100644
--- a/noncore/unsupported/mail2/rename.cpp
+++ b/noncore/unsupported/mail2/rename.cpp
@@ -1,39 +1,39 @@
#include <qlineedit.h>
#include <qlabel.h>
#include "rename.h"
Rename::Rename(QWidget *parent, const char *name, bool modal, WFlags fl)
: RenameBase(parent, name, modal, fl)
{
}
QString Rename::rename(const QString &on, QWidget *parent)
{
- Rename *rename = new Rename(parent, 0, true);
- rename->oldName->setText(on);
- rename->newName->setText(on);
- rename->newName->setFocus();
+ Rename rename(parent, 0, true);
+ rename.oldName->setText(on);
+ rename.newName->setText(on);
+ rename.newName->setFocus();
- if (rename->exec() == QDialog::Accepted) {
- return rename->newName->text();
+ if (rename.exec() == QDialog::Accepted) {
+ return rename.newName->text();
}
return QString(0);
}
QString Rename::getText(const QString &caption, const QString &secondLabel, QWidget *parent)
{
- Rename *rename = new Rename(parent, 0, true);
- rename->firstLabel->hide();
- rename->oldName->hide();
- rename->setCaption(caption);
- rename->secondLabel->setText(secondLabel);
-
- if (rename->exec() == QDialog::Accepted) {
- return rename->newName->text();
+ Rename rename(parent, 0, true);
+ rename.firstLabel->hide();
+ rename.oldName->hide();
+ rename.setCaption(caption);
+ rename.secondLabel->setText(secondLabel);
+
+ if (rename.exec() == QDialog::Accepted) {
+ return rename.newName->text();
}
return QString(0);
}