diff --git a/src/akonadi-contacts/emailaddressrequester.cpp b/src/akonadi-contacts/emailaddressrequester.cpp index d276cff4..b34ebf0b 100644 --- a/src/akonadi-contacts/emailaddressrequester.cpp +++ b/src/akonadi-contacts/emailaddressrequester.cpp @@ -1,130 +1,130 @@ /* Copyright (c) 2001 Marc Mutz This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "emailaddressrequester.h" #include "emailaddressselectiondialog.h" #include #include #include #include #include #include #include using namespace Akonadi; class Q_DECL_HIDDEN Akonadi::EmailAddressRequester::Private { public: Private(EmailAddressRequester *qq) : q(qq) , mLineEdit(nullptr) { } void slotAddressBook(); EmailAddressRequester *q = nullptr; KLineEdit *mLineEdit = nullptr; }; void EmailAddressRequester::Private::slotAddressBook() { QPointer dlg = new Akonadi::EmailAddressSelectionDialog(q); dlg->view()->view()->setSelectionMode(QAbstractItemView::MultiSelection); if (!dlg->exec()) { delete dlg; return; } QStringList addressList; const auto selectedAddresses = dlg->selectedAddresses(); addressList.reserve(selectedAddresses.size()); for (const Akonadi::EmailAddressSelection &selection : selectedAddresses) { addressList << selection.quotedEmail(); } QString text = mLineEdit->text().trimmed(); if (!text.isEmpty()) { if (!text.endsWith(QLatin1Char(','))) { text += QLatin1String(", "); } else { text += QLatin1Char(' '); } } mLineEdit->setText(text + addressList.join(QLatin1Char(','))); delete dlg; } EmailAddressRequester::EmailAddressRequester(QWidget *parent) : QWidget(parent) , d(new Private(this)) { QHBoxLayout *layout = new QHBoxLayout(this); layout->setSpacing(4); layout->setMargin(0); d->mLineEdit = new KLineEdit(this); - d->mLineEdit->setClearButtonShown(true); + d->mLineEdit->setClearButtonEnabled(true); d->mLineEdit->setTrapReturnKey(true); layout->addWidget(d->mLineEdit, 1); QPushButton *button = new QPushButton(this); button->setIcon(QIcon::fromTheme(QStringLiteral("help-contents"))); button->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall)); button->setFixedHeight(d->mLineEdit->sizeHint().height()); button->setToolTip(i18n("Open Address Book")); layout->addWidget(button); connect(button, &QPushButton::clicked, this, [this]() { d->slotAddressBook(); }); connect(d->mLineEdit, &KLineEdit::textChanged, this, &EmailAddressRequester::textChanged); } EmailAddressRequester::~EmailAddressRequester() { delete d; } void EmailAddressRequester::clear() { d->mLineEdit->clear(); } void EmailAddressRequester::setText(const QString &text) { d->mLineEdit->setText(text); } QString EmailAddressRequester::text() const { return d->mLineEdit->text(); } KLineEdit *EmailAddressRequester::lineEdit() const { return d->mLineEdit; } #include "moc_emailaddressrequester.cpp"