From kde-commits Tue Oct 31 21:33:11 2017 From: Montel Laurent Date: Tue, 31 Oct 2017 21:33:11 +0000 To: kde-commits Subject: [pimcommon] src: GIT_SILENT: coding style (silent) Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=150948560228292 Git commit 4c4f10fe0fbe61796a75a451fd28140f47909de4 by Montel Laurent. Committed on 31/10/2017 at 21:33. Pushed by mlaurent into branch 'master'. GIT_SILENT: coding style M +3 -3 src/pimcommon/autocorrection/autocorrectionwidget.cpp M +0 -1 src/pimcommon/logactivities/logactivitiesmanager.cpp M +33 -11 src/pimcommon/templatewidgets/templatelistwidget.cpp M +3 -1 src/pimcommon/translator/translatorwidget.cpp M +5 -7 src/pimcommon/widgets/autotests/lineeditwithcompleterngtest.= cpp M +0 -1 src/pimcommon/widgets/tests/testspellchecklineedit.cpp M +9 -3 src/pimcommonakonadi/acl/aclentrydialog.cpp M +13 -6 src/pimcommonakonadi/acl/aclmanager.cpp M +1 -1 src/pimcommonakonadi/acl/aclmodifyjob.cpp https://commits.kde.org/pimcommon/4c4f10fe0fbe61796a75a451fd28140f47909de4 diff --git a/src/pimcommon/autocorrection/autocorrectionwidget.cpp b/src/pi= mcommon/autocorrection/autocorrectionwidget.cpp index 54c37e8..c3b9a34 100644 --- a/src/pimcommon/autocorrection/autocorrectionwidget.cpp +++ b/src/pimcommon/autocorrection/autocorrectionwidget.cpp @@ -292,7 +292,7 @@ void AutoCorrectionWidget::selectSingleQuoteCharOpen() = void AutoCorrectionWidget::selectSingleQuoteCharClose() { - QPointer dlg =3D new KPIMTextEd= it::SelectSpecialCharDialog (this); + QPointer dlg =3D new KPIMTextEd= it::SelectSpecialCharDialog(this); dlg->showSelectButton(false); dlg->setCurrentChar(d->m_singleQuotes.end); dlg->autoInsertChar(); @@ -314,7 +314,7 @@ void AutoCorrectionWidget::setDefaultSingleQuotes() = void AutoCorrectionWidget::selectDoubleQuoteCharOpen() { - QPointer dlg =3D new KPIMTextEd= it::SelectSpecialCharDialog (this); + QPointer dlg =3D new KPIMTextEd= it::SelectSpecialCharDialog(this); dlg->showSelectButton(false); dlg->setCurrentChar(d->m_doubleQuotes.begin); dlg->autoInsertChar(); @@ -328,7 +328,7 @@ void AutoCorrectionWidget::selectDoubleQuoteCharOpen() = void AutoCorrectionWidget::selectDoubleQuoteCharClose() { - QPointer dlg =3D new KPIMTextEd= it::SelectSpecialCharDialog (this); + QPointer dlg =3D new KPIMTextEd= it::SelectSpecialCharDialog(this); dlg->showSelectButton(false); dlg->setCurrentChar(d->m_doubleQuotes.end); dlg->autoInsertChar(); diff --git a/src/pimcommon/logactivities/logactivitiesmanager.cpp b/src/pim= common/logactivities/logactivitiesmanager.cpp index cacc790..81bc8e5 100644 --- a/src/pimcommon/logactivities/logactivitiesmanager.cpp +++ b/src/pimcommon/logactivities/logactivitiesmanager.cpp @@ -21,7 +21,6 @@ #include #include = - using namespace PimCommon; = Q_GLOBAL_STATIC(LogActivitiesManager, s_pLogActivitiesSelf) diff --git a/src/pimcommon/templatewidgets/templatelistwidget.cpp b/src/pim= common/templatewidgets/templatelistwidget.cpp index 3f549e5..65f2b59 100644 --- a/src/pimcommon/templatewidgets/templatelistwidget.cpp +++ b/src/pimcommon/templatewidgets/templatelistwidget.cpp @@ -166,32 +166,48 @@ public: QMenu *menu =3D new QMenu(q); = if (!listSelectedIsEmpty) { - menu->addAction(i18n("Insert template"), q, [this]() { slotIns= ertTemplate(); }); + menu->addAction(i18n("Insert template"), q, [this]() { + slotInsertTemplate(); + }); menu->addSeparator(); } = - menu->addAction(i18n("Add..."), q, [this]() { slotAdd(); }); + menu->addAction(i18n("Add..."), q, [this]() { + slotAdd(); + }); if (!listSelectedIsEmpty) { const bool defaultTemplate =3D lstSelectedItems.first()->data(= TemplateListWidget::DefaultTemplate).toBool(); if (lstSelectedItems.count() =3D=3D 1) { - menu->addAction(defaultTemplate ? i18n("Show...") : i18n("= Modify..."), q, [this]() { slotModify(); }); - menu->addAction(i18n("Duplicate"), q, [this]() { slotDupli= cate(); }); + menu->addAction(defaultTemplate ? i18n("Show...") : i18n("= Modify..."), q, [this]() { + slotModify(); + }); + menu->addAction(i18n("Duplicate"), q, [this]() { + slotDuplicate(); + }); } if (lstSelectedItems.count() =3D=3D 1 && !defaultTemplate) { menu->addSeparator(); - menu->addAction(QIcon::fromTheme(QStringLiteral("edit-dele= te")), i18n("Remove"), q, [this]() { slotRemove(); }); + menu->addAction(QIcon::fromTheme(QStringLiteral("edit-dele= te")), i18n("Remove"), q, [this]() { + slotRemove(); + }); } } menu->addSeparator(); if (q->count() > 0) { - menu->addAction(i18n("Export..."), q, [this]() { slotExportTem= plates(); }); + menu->addAction(i18n("Export..."), q, [this]() { + slotExportTemplates(); + }); } - menu->addAction(i18n("Import..."), q, [this]() { slotImportTemplat= es(); }); + menu->addAction(i18n("Import..."), q, [this]() { + slotImportTemplates(); + }); = if (KAuthorized::authorize(QStringLiteral("ghns"))) { if (!knewstuffConfigName.isEmpty()) { menu->addSeparator(); - QAction *act =3D menu->addAction(i18n("Download new Templa= tes..."), q, [this]() { slotDownloadTemplates(); }); + QAction *act =3D menu->addAction(i18n("Download new Templa= tes..."), q, [this]() { + slotDownloadTemplates(); + }); act->setIcon(QIcon::fromTheme(QStringLiteral("get-hot-new-= stuff"))); } } @@ -283,9 +299,15 @@ TemplateListWidget::TemplateListWidget(const QString &= configName, QWidget *paren setContextMenuPolicy(Qt::CustomContextMenu); setDragDropMode(QAbstractItemView::DragDrop); = - connect(this, &TemplateListWidget::customContextMenuRequested, this, [= this](const QPoint &p) { d->slotContextMenu(p); }); - connect(this, &TemplateListWidget::doubleClicked, this, [this]() { d->= slotModify(); }); - connect(this, &TemplateListWidget::insertNewTemplate, this, [this](con= st QString &tmp) { d->slotInsertNewTemplate(tmp); }); + connect(this, &TemplateListWidget::customContextMenuRequested, this, [= this](const QPoint &p) { + d->slotContextMenu(p); + }); + connect(this, &TemplateListWidget::doubleClicked, this, [this]() { + d->slotModify(); + }); + connect(this, &TemplateListWidget::insertNewTemplate, this, [this](con= st QString &tmp) { + d->slotInsertNewTemplate(tmp); + }); } = TemplateListWidget::~TemplateListWidget() diff --git a/src/pimcommon/translator/translatorwidget.cpp b/src/pimcommon/= translator/translatorwidget.cpp index c5320d8..9215655 100644 --- a/src/pimcommon/translator/translatorwidget.cpp +++ b/src/pimcommon/translator/translatorwidget.cpp @@ -307,7 +307,9 @@ void TranslatorWidget::init() slotFromLanguageChanged(0, true); slotTextChanged(); readConfig(); - connect(d->from, QOverload::of(&MinimumComboBox::currentIndexChan= ged), this, [this](int val) {slotFromLanguageChanged(val, false);}); + connect(d->from, QOverload::of(&MinimumComboBox::currentIndexChan= ged), this, [this](int val) { + slotFromLanguageChanged(val, false); + }); connect(d->from, QOverload::of(&MinimumComboBox::currentIndexChan= ged), this, &TranslatorWidget::slotConfigChanged); = connect(d->to, QOverload::of(&MinimumComboBox::currentIndexChange= d), this, &TranslatorWidget::slotConfigChanged); diff --git a/src/pimcommon/widgets/autotests/lineeditwithcompleterngtest.cp= p b/src/pimcommon/widgets/autotests/lineeditwithcompleterngtest.cpp index 797017b..9535eae 100644 --- a/src/pimcommon/widgets/autotests/lineeditwithcompleterngtest.cpp +++ b/src/pimcommon/widgets/autotests/lineeditwithcompleterngtest.cpp @@ -25,18 +25,16 @@ QTEST_MAIN(LineEditWithCompleterNgTest) LineEditWithCompleterNgTest::LineEditWithCompleterNgTest(QObject *parent) : QObject(parent) { - } = void LineEditWithCompleterNgTest::shouldHaveDefaultValue() { - PimCommon::LineEditWithCompleterNg w; - QVERIFY(w.completer()); - QVERIFY(w.completer()->model()); - QCOMPARE(w.completer()->model()->rowCount(), 0); + PimCommon::LineEditWithCompleterNg w; + QVERIFY(w.completer()); + QVERIFY(w.completer()->model()); + QCOMPARE(w.completer()->model()->rowCount(), 0); } = - void LineEditWithCompleterNgTest::shouldAddCompletionItem() { PimCommon::LineEditWithCompleterNg w; @@ -54,7 +52,7 @@ void LineEditWithCompleterNgTest::shouldAddCompletionItem= () void LineEditWithCompleterNgTest::shouldClearCompleter() { PimCommon::LineEditWithCompleterNg w; - for (int i =3D 0; i < 10 ;++i) { + for (int i =3D 0; i < 10; ++i) { w.addCompletionItem(QStringLiteral("ff%1").arg(i)); } QCOMPARE(w.completer()->model()->rowCount(), 10); diff --git a/src/pimcommon/widgets/tests/testspellchecklineedit.cpp b/src/p= imcommon/widgets/tests/testspellchecklineedit.cpp index 4c0788a..e9408eb 100644 --- a/src/pimcommon/widgets/tests/testspellchecklineedit.cpp +++ b/src/pimcommon/widgets/tests/testspellchecklineedit.cpp @@ -18,7 +18,6 @@ #include #include = - #include #include = diff --git a/src/pimcommonakonadi/acl/aclentrydialog.cpp b/src/pimcommonako= nadi/acl/aclentrydialog.cpp index afec01d..ec23f88 100644 --- a/src/pimcommonakonadi/acl/aclentrydialog.cpp +++ b/src/pimcommonakonadi/acl/aclentrydialog.cpp @@ -137,9 +137,15 @@ AclEntryDialog::AclEntryDialog(QWidget *parent) layout->addWidget(label, 2, 0, 1, 3); layout->setRowStretch(2, 10); = - connect(d->mUserIdLineEdit, &KPIM::AddresseeLineEdit::textChanged, thi= s, [this]() { d->slotChanged(); }); - connect(button, &QPushButton::clicked, this, [this]() { d->slotSelectA= ddresses(); }); - connect(d->mButtonGroup, QOverload::of(&QButtonGrou= p::buttonClicked), this, [this]() { d->slotChanged(); }); + connect(d->mUserIdLineEdit, &KPIM::AddresseeLineEdit::textChanged, thi= s, [this]() { + d->slotChanged(); + }); + connect(button, &QPushButton::clicked, this, [this]() { + d->slotSelectAddresses(); + }); + connect(d->mButtonGroup, QOverload::of(&QButtonGrou= p::buttonClicked), this, [this]() { + d->slotChanged(); + }); = d->mOkButton->setEnabled(false); = diff --git a/src/pimcommonakonadi/acl/aclmanager.cpp b/src/pimcommonakonadi= /acl/aclmanager.cpp index e84ca6d..86b96b0 100644 --- a/src/pimcommonakonadi/acl/aclmanager.cpp +++ b/src/pimcommonakonadi/acl/aclmanager.cpp @@ -176,20 +176,28 @@ public: , mChanged(false) { mAddAction =3D new QAction(i18n("Add Entry..."), q); - q->connect(mAddAction, &QAction::triggered, q, [this]() { addAcl()= ; }); + q->connect(mAddAction, &QAction::triggered, q, [this]() { + addAcl(); + }); = mEditAction =3D new QAction(i18n("Edit Entry..."), q); mEditAction->setEnabled(false); - q->connect(mEditAction, &QAction::triggered, q, [this]() { editAcl= (); }); + q->connect(mEditAction, &QAction::triggered, q, [this]() { + editAcl(); + }); = mDeleteAction =3D new QAction(i18n("Remove Entry"), q); mDeleteAction->setEnabled(false); - q->connect(mDeleteAction, &QAction::triggered, q, [this]() { delet= eAcl(); } ); + q->connect(mDeleteAction, &QAction::triggered, q, [this]() { + deleteAcl(); + }); = mModel =3D new AclModel(q); = mSelectionModel =3D new QItemSelectionModel(mModel); - q->connect(mSelectionModel, &QItemSelectionModel::selectionChanged= , q, [this]() { selectionChanged(); }); + q->connect(mSelectionModel, &QItemSelectionModel::selectionChanged= , q, [this]() { + selectionChanged(); + }); } = ~Private() @@ -298,9 +306,8 @@ public: = QString resource =3D collection.resource(); if (resource.contains(QStringLiteral("akonadi_kolabproxy_resource"= ))) { - const QString basename =3D Akonadi::ServerManager::agentServic= eName(Akonadi::ServerManager::Agent, - QS= tringLiteral("akonadi_kolabproxy_resource")); + = QStringLiteral("akonadi_kolabproxy_resource")); = QDBusInterface interface(basename, QStringLiteral("/KolabProxy= ")); if (interface.isValid()) { diff --git a/src/pimcommonakonadi/acl/aclmodifyjob.cpp b/src/pimcommonakona= di/acl/aclmodifyjob.cpp index 64d1748..f402e12 100644 --- a/src/pimcommonakonadi/acl/aclmodifyjob.cpp +++ b/src/pimcommonakonadi/acl/aclmodifyjob.cpp @@ -72,7 +72,7 @@ bool AclModifyJob::canAdministrate(PimCommon::ImapAclAttr= ibute *attribute, const QString resource =3D collection.resource(); if (resource.contains(QLatin1String("akonadi_kolabproxy_resource"))) { const QString basename =3D Akonadi::ServerManager::agentServiceNam= e(Akonadi::ServerManager::Agent, - QStrin= gLiteral("akonadi_kolabproxy_resource")); + = QStringLiteral("akonadi_kolabproxy_resource")); QDBusInterface interface(basename, QLatin1String("/KolabProxy")); if (interface.isValid()) { QDBusReply reply =3D interface.call(QLatin1String("im= apResourceForCollection"), collection.remoteId().toLongLong());