From kde-commits Tue Oct 31 21:33:19 2017 From: Montel Laurent Date: Tue, 31 Oct 2017 21:33:19 +0000 To: kde-commits Subject: [libksieve] src/ksieveui: GIT_SILENT: coding style (silent) Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=150948561028293 Git commit 3b09c30e1f4b763858327a7a183c0ef90e5eea85 by Montel Laurent. Committed on 31/10/2017 at 21:33. Pushed by mlaurent into branch 'master'. GIT_SILENT: coding style M +0 -1 src/ksieveui/autocreatescripts/sieveactionwidgetlister.h M +0 -1 src/ksieveui/autocreatescripts/sieveconditions/widgets/selec= theadertypecombobox.h M +4 -3 src/ksieveui/editor/sieveeditorwidget.cpp M +3 -1 src/ksieveui/editor/webengine/findbar/findbarbase.cpp M +0 -1 src/ksieveui/managescriptsjob/checkkolabkep14supportjob.cpp M +0 -1 src/ksieveui/managescriptsjob/renamescriptjob.cpp M +1 -1 src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontend= widget.cpp M +1 -1 src/ksieveui/util/util_p.h M +0 -3 src/ksieveui/vacation/autotests/vacationmailactionwidgettest= .cpp M +0 -2 src/ksieveui/vacation/vacationmailactionwidget.cpp M +0 -1 src/ksieveui/vacation/vacationmanager.h M +0 -1 src/ksieveui/widgets/managesievewidget.cpp https://commits.kde.org/libksieve/3b09c30e1f4b763858327a7a183c0ef90e5eea85 diff --git a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h b/src= /ksieveui/autocreatescripts/sieveactionwidgetlister.h index 47c67cd..08cbe75 100644 --- a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h +++ b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h @@ -51,7 +51,6 @@ public: = void setLocaleVariable(const SieveGlobalVariableActionWidget::Variable= Element &var); = - Q_SIGNALS: void addWidget(QWidget *w); void removeWidget(QWidget *w); diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selecth= eadertypecombobox.h b/src/ksieveui/autocreatescripts/sieveconditions/widget= s/selectheadertypecombobox.h index fca4c2e..809263a 100644 --- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheaderty= pecombobox.h +++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheaderty= pecombobox.h @@ -55,7 +55,6 @@ public: QString headers() const; void setListHeaders(const QMap &lst, const QStringLi= st &selectedHeaders); = - private: void slotNewHeaderTextChanged(const QString &text); void slotAddNewHeader(); diff --git a/src/ksieveui/editor/sieveeditorwidget.cpp b/src/ksieveui/edito= r/sieveeditorwidget.cpp index abaf67b..9917e37 100644 --- a/src/ksieveui/editor/sieveeditorwidget.cpp +++ b/src/ksieveui/editor/sieveeditorwidget.cpp @@ -79,7 +79,6 @@ SieveEditorWidget::SieveEditorWidget(bool useMenuBar, QWi= dget *parent) toolbar->addAction(mGenerateXml); } = - QStringList overlays; overlays << QStringLiteral("list-add"); mShareScript =3D new QAction(QIcon(new KIconEngine(QStringLiteral("get= -hot-new-stuff"), KIconLoader::global(), overlays)), i18n("Share..."), this= ); @@ -248,7 +247,8 @@ void SieveEditorWidget::updateOriginalScript() void SieveEditorWidget::print() { switch (mMode) { - case TextMode: { + case TextMode: + { bool wasModified =3D isModified(); mTextModeWidget->print(); setModified(wasModified); @@ -265,7 +265,8 @@ void SieveEditorWidget::print() void SieveEditorWidget::printPreview() { switch (mMode) { - case TextMode: { + case TextMode: + { bool wasModified =3D isModified(); mTextModeWidget->printPreview(); setModified(wasModified); diff --git a/src/ksieveui/editor/webengine/findbar/findbarbase.cpp b/src/ks= ieveui/editor/webengine/findbar/findbarbase.cpp index 512634e..8ecf5ae 100644 --- a/src/ksieveui/editor/webengine/findbar/findbarbase.cpp +++ b/src/ksieveui/editor/webengine/findbar/findbarbase.cpp @@ -139,7 +139,9 @@ void FindBarBase::autoSearch(const QString &str) mFindPrevBtn->setEnabled(isNotEmpty); mFindNextBtn->setEnabled(isNotEmpty); if (isNotEmpty) { - QTimer::singleShot(0, this, [this] () { slotSearchText(); }); + QTimer::singleShot(0, this, [this]() { + slotSearchText(); + }); } else { clearSelections(); } diff --git a/src/ksieveui/managescriptsjob/checkkolabkep14supportjob.cpp b/= src/ksieveui/managescriptsjob/checkkolabkep14supportjob.cpp index 913fb3e..2a41ffe 100644 --- a/src/ksieveui/managescriptsjob/checkkolabkep14supportjob.cpp +++ b/src/ksieveui/managescriptsjob/checkkolabkep14supportjob.cpp @@ -21,7 +21,6 @@ #include "util/util_p.h" #include = - #include "libksieve_debug.h" = using namespace KSieveUi; diff --git a/src/ksieveui/managescriptsjob/renamescriptjob.cpp b/src/ksieve= ui/managescriptsjob/renamescriptjob.cpp index 8541f46..351f162 100644 --- a/src/ksieveui/managescriptsjob/renamescriptjob.cpp +++ b/src/ksieveui/managescriptsjob/renamescriptjob.cpp @@ -20,7 +20,6 @@ = #include = - using namespace KSieveUi; = class KSieveUi::RenameScriptJobPrivate diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwi= dget.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidg= et.cpp index 9c99a5f..32d7dab 100644 --- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp +++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp @@ -189,7 +189,7 @@ void SieveScriptDebuggerFrontEndWidget::slotDebugScript= () mProcess->start(QStringLiteral("sieve-test"), QStringList() << argumen= ts); connect(mProcess, &QProcess::readyReadStandardOutput, this, &SieveScri= ptDebuggerFrontEndWidget::slotReadStandardOutput); connect(mProcess, &QProcess::readyReadStandardError, this, &SieveScrip= tDebuggerFrontEndWidget::slotReadErrorOutput); - connect(mProcess, QOverload::of(&QProcess::f= inished), this, &SieveScriptDebuggerFrontEndWidget::slotDebugFinished); + connect(mProcess, QOverload::of(&QProcess::= finished), this, &SieveScriptDebuggerFrontEndWidget::slotDebugFinished); //TODO port to new connect api //connect(mProcess, &QProcess::finished, this, &SieveScriptDebuggerFro= ntEndWidget::slotDebugFinished); mSieveTestResult->editor()->appendPlainText(QStringLiteral("----------= ----------------------------")); diff --git a/src/ksieveui/util/util_p.h b/src/ksieveui/util/util_p.h index 4113f34..2974cb2 100644 --- a/src/ksieveui/util/util_p.h +++ b/src/ksieveui/util/util_p.h @@ -80,7 +80,7 @@ bool hasKep14Support(const QStringList &sieveCapabilities= , const QStringList &av bool isKep14ProtectedName(const QString &scriptName); = KSIEVEUI_EXPORT KSieveUi::Util::AccountInfo findAccountInfo(const QString = &identifier, SieveImapPasswordProvider *provider, bool withVacationFileName, - std::uni= que_ptr &interface); + std::unique_pt= r &interface); /** * Returns all sieve account info with the given @p identifier. */ diff --git a/src/ksieveui/vacation/autotests/vacationmailactionwidgettest.c= pp b/src/ksieveui/vacation/autotests/vacationmailactionwidgettest.cpp index a34324c..d64dafc 100644 --- a/src/ksieveui/vacation/autotests/vacationmailactionwidgettest.cpp +++ b/src/ksieveui/vacation/autotests/vacationmailactionwidgettest.cpp @@ -30,7 +30,6 @@ QTEST_MAIN(VacationMailActionWidgetTest) VacationMailActionWidgetTest::VacationMailActionWidgetTest(QObject *parent) : QObject(parent) { - } = void VacationMailActionWidgetTest::shouldHaveDefaultValue() @@ -53,7 +52,6 @@ void VacationMailActionWidgetTest::shouldHaveDefaultValue= () QVERIFY(!lineEdit->isEnabled()); QVERIFY(lineEdit->isClearButtonEnabled()); = - QCOMPARE(mStackedWidget->currentIndex(), 0); = QWidget *mMoveImapFolderWidget =3D mStackedWidget->widget(1); @@ -75,7 +73,6 @@ void VacationMailActionWidgetTest::shouldSwitchComponents= () QWidget *mMoveImapFolderWidget =3D mStackedWidget->widget(1); KSieveUi::AbstractMoveImapFolderWidget *abstractMoveImapFolderWidget = =3D dynamic_cast(mMoveImapFolderW= idget); = - w.mailActionChanged(KSieveUi::VacationUtils::Keep); QCOMPARE(mStackedWidget->currentIndex(), 0); QVERIFY(w.mailActionRecipient().isEmpty()); diff --git a/src/ksieveui/vacation/vacationmailactionwidget.cpp b/src/ksiev= eui/vacation/vacationmailactionwidget.cpp index b499b00..62a2074 100644 --- a/src/ksieveui/vacation/vacationmailactionwidget.cpp +++ b/src/ksieveui/vacation/vacationmailactionwidget.cpp @@ -17,7 +17,6 @@ Boston, MA 02110-1301, USA. */ = - #include "vacationmailactionwidget.h" #include "widgets/moveimapfolderwidget.h" #include @@ -60,7 +59,6 @@ VacationMailActionWidget::VacationMailActionWidget(QWidge= t *parent) = VacationMailActionWidget::~VacationMailActionWidget() { - } = void VacationMailActionWidget::setSieveImapAccountSettings(const KSieveUi:= :SieveImapAccountSettings &account) diff --git a/src/ksieveui/vacation/vacationmanager.h b/src/ksieveui/vacatio= n/vacationmanager.h index ec81583..2cd85ce 100644 --- a/src/ksieveui/vacation/vacationmanager.h +++ b/src/ksieveui/vacation/vacationmanager.h @@ -21,7 +21,6 @@ #include #include "ksieveui_export.h" = - class QWidget; namespace KSieveUi { class VacationManagerPrivate; diff --git a/src/ksieveui/widgets/managesievewidget.cpp b/src/ksieveui/widg= ets/managesievewidget.cpp index 5c6d866..7af55dd 100644 --- a/src/ksieveui/widgets/managesievewidget.cpp +++ b/src/ksieveui/widgets/managesievewidget.cpp @@ -28,7 +28,6 @@ = #include "util/util_p.h" = - #include #include #include