Git commit 1e1e7572f174b389177818eeb51398081e30abef by Montel Laurent. Committed on 30/09/2016 at 21:36. Pushed by mlaurent into branch 'master'. Astyle kdelibs M +8 -8 messagecomposer/src/composer-ng/autotests/richtextcomposerng= test.cpp M +2 -1 messagecomposer/src/composer-ng/richtextcomposerng.cpp M +0 -1 messagecomposer/src/plugineditor/plugineditormanager.cpp M +0 -1 messagecomposer/src/plugineditorcheckbeforesend/plugineditor= checkbeforesend.h M +0 -1 messagecomposer/src/plugineditorcheckbeforesend/plugineditor= checkbeforesendmanager.cpp M +0 -1 messageviewer/src/header/headerstyleplugin.h M +0 -2 messageviewer/src/header/headerstylepluginmanager.cpp M +2 -3 messageviewer/src/htmlwriter/autotests/webengineparthtmlwrit= ertest.cpp M +4 -3 messageviewer/src/viewer/viewer_p.cpp M +0 -1 messageviewer/src/viewer/viewer_p.h M +2 -2 messageviewer/src/viewer/webengine/mailwebengineview.cpp M +0 -2 messageviewer/src/viewerplugins/viewerpluginmanager.cpp M +0 -1 webengineviewer/src/urlinterceptor/networkurlinterceptorplug= inmanager.cpp http://commits.kde.org/messagelib/1e1e7572f174b389177818eeb51398081e30abef diff --git a/messagecomposer/src/composer-ng/autotests/richtextcomposerngte= st.cpp b/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.c= pp index 2528808..2b707db 100644 --- a/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp +++ b/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp @@ -379,10 +379,10 @@ void RichTextComposerNgTest::shouldLoadSignatureFromF= ile_data() QTest::addColumn("signa= tureaddtext"); = QTest::newRow("signature1") << QStringLiteral("signature1.txt") << QSt= ringLiteral("\n") - << KIdentityManagement::Signature::End <<= KIdentityManagement::Signature::AddSeparator; + << KIdentityManagement::Signature::End << = KIdentityManagement::Signature::AddSeparator; = QTest::newRow("signature2") << QStringLiteral("signature2.txt") << QSt= ringLiteral("\n") - << KIdentityManagement::Signature::End <<= KIdentityManagement::Signature::AddSeparator; + << KIdentityManagement::Signature::End << = KIdentityManagement::Signature::AddSeparator; } = void RichTextComposerNgTest::shouldLoadSignatureFromFile() @@ -453,19 +453,19 @@ void RichTextComposerNgTest::shouldLoadSignatureFromC= ommand_data() QTest::addColumn("signa= tureaddtext"); = QTest::newRow("command1") << QStringLiteral("echo \"foo\"") << QString= Literal("\n") - << KIdentityManagement::Signature::End <<= KIdentityManagement::Signature::AddSeparator; + << KIdentityManagement::Signature::End << KI= dentityManagement::Signature::AddSeparator; QTest::newRow("command2") << QStringLiteral("echo \"foo\"") << QString= Literal("foo ddd \n") - << KIdentityManagement::Signature::End <<= KIdentityManagement::Signature::AddSeparator; + << KIdentityManagement::Signature::End << KI= dentityManagement::Signature::AddSeparator; QTest::newRow("command3") << QStringLiteral("echo \"foo\"") << QString= () - << KIdentityManagement::Signature::End <<= KIdentityManagement::Signature::AddSeparator; + << KIdentityManagement::Signature::End << KI= dentityManagement::Signature::AddSeparator; QTest::newRow("command4") << QStringLiteral("echo \"foo\nsss\"") << QS= tring() - << KIdentityManagement::Signature::End <<= KIdentityManagement::Signature::AddSeparator; + << KIdentityManagement::Signature::End << KI= dentityManagement::Signature::AddSeparator; QTest::newRow("command5") << QStringLiteral("echo \"foo\nsss\n\"") << = QStringLiteral("foo ddd \n") - << KIdentityManagement::Signature::End <<= KIdentityManagement::Signature::AddSeparator; + << KIdentityManagement::Signature::End << KI= dentityManagement::Signature::AddSeparator; = //Start QTest::newRow("command6") << QStringLiteral("echo \"foo\nsss\n\"") << = QStringLiteral("foo ddd \n") - << KIdentityManagement::Signature::Start = << KIdentityManagement::Signature::AddSeparator; + << KIdentityManagement::Signature::Start << = KIdentityManagement::Signature::AddSeparator; = //Failed //QTest::newRow("command7") << QStringLiteral("echo \"foo\nsss\n\"") <= < QStringLiteral("foo ddd \n") diff --git a/messagecomposer/src/composer-ng/richtextcomposerng.cpp b/messa= gecomposer/src/composer-ng/richtextcomposerng.cpp index 4cc8e6f..3649c18 100644 --- a/messagecomposer/src/composer-ng/richtextcomposerng.cpp +++ b/messagecomposer/src/composer-ng/richtextcomposerng.cpp @@ -370,8 +370,9 @@ QString RichTextComposerNg::toCleanHtml() const = void RichTextComposerNg::forceAutoCorrection(bool selectedText) { - if (document()->isEmpty()) + if (document()->isEmpty()) { return; + } if (d->autoCorrection && d->autoCorrection->isEnabledAutoCorrection())= { const bool richText =3D (textMode() =3D=3D RichTextComposer::Rich); const int initialPosition =3D textCursor().position(); diff --git a/messagecomposer/src/plugineditor/plugineditormanager.cpp b/mes= sagecomposer/src/plugineditor/plugineditormanager.cpp index 0b83073..2297600 100644 --- a/messagecomposer/src/plugineditor/plugineditormanager.cpp +++ b/messagecomposer/src/plugineditor/plugineditormanager.cpp @@ -232,4 +232,3 @@ PluginEditor *PluginEditorManager::pluginFromIdentifier= (const QString &id) return d->pluginFromIdentifier(id); } = - diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorch= eckbeforesend.h b/messagecomposer/src/plugineditorcheckbeforesend/pluginedi= torcheckbeforesend.h index cc9754a..c59c4cd 100644 --- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo= resend.h +++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo= resend.h @@ -52,7 +52,6 @@ public: void setIsEnabled(bool enabled); bool isEnabled() const; = - Q_SIGNALS: void configChanged(); = diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorch= eckbeforesendmanager.cpp b/messagecomposer/src/plugineditorcheckbeforesend/= plugineditorcheckbeforesendmanager.cpp index 65f0f35..d7c4b20 100644 --- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo= resendmanager.cpp +++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo= resendmanager.cpp @@ -180,7 +180,6 @@ PluginEditorCheckBeforeSend *PluginEditorCheckBeforeSen= dManagerPrivate::pluginFr return {}; } = - PluginEditorCheckBeforeSendManager::PluginEditorCheckBeforeSendManager(QOb= ject *parent) : QObject(parent), d(new MessageComposer::PluginEditorCheckBeforeSendManagerPrivate(thi= s)) diff --git a/messageviewer/src/header/headerstyleplugin.h b/messageviewer/s= rc/header/headerstyleplugin.h index c5e2328..2eecf39 100644 --- a/messageviewer/src/header/headerstyleplugin.h +++ b/messageviewer/src/header/headerstyleplugin.h @@ -47,7 +47,6 @@ public: virtual QString alignment() const; virtual int elidedTextSize() const; = - void setIsEnabled(bool enabled); bool isEnabled() const; = diff --git a/messageviewer/src/header/headerstylepluginmanager.cpp b/messag= eviewer/src/header/headerstylepluginmanager.cpp index 9be74d1..799eeec 100644 --- a/messageviewer/src/header/headerstylepluginmanager.cpp +++ b/messageviewer/src/header/headerstylepluginmanager.cpp @@ -107,7 +107,6 @@ QString HeaderStylePluginManagerPrivate::configPrefixSe= ttingKey() const return QStringLiteral("PluginHeaderStyle"); } = - void HeaderStylePluginManagerPrivate::initializePluginList() { const QVector plugins =3D KPluginLoader::findPlugins(= QStringLiteral("messageviewer"), [](const KPluginMetaData & md) { @@ -199,7 +198,6 @@ MessageViewer::HeaderStylePlugin *HeaderStylePluginMana= gerPrivate::pluginFromIde return {}; } = - HeaderStylePluginManager *HeaderStylePluginManager::self() { return sInstance->headerStylePluginManager; diff --git a/messageviewer/src/htmlwriter/autotests/webengineparthtmlwriter= test.cpp b/messageviewer/src/htmlwriter/autotests/webengineparthtmlwriterte= st.cpp index 2e8b023..d868e3d 100644 --- a/messageviewer/src/htmlwriter/autotests/webengineparthtmlwritertest.cpp +++ b/messageviewer/src/htmlwriter/autotests/webengineparthtmlwritertest.cpp @@ -56,7 +56,6 @@ void WebEnginePartHtmlWriterTest::removeScriptInHtml_data= () QTest::newRow("scriptwithspace-insensitive") << QStringLiteral("boo= ") << QStringLiteral("boo<= /a>"); QTest::newRow("scriptwithremoveaccess-insensitive") << QStringLiteral(= "boo") << QStringLiteral("boo"); QTest::newRow("multiline-scriptwithspace-insensitive") << QStringLiter= al("boo") << QStringLi= teral("boo"); @@ -66,8 +65,8 @@ void WebEnginePartHtmlWriterTest::removeScriptInHtml_data= () = void WebEnginePartHtmlWriterTest::removeScriptInHtml() { - QFETCH (QString, input); - QFETCH (QString, output); + QFETCH(QString, input); + QFETCH(QString, output); QCOMPARE(MessageViewer::WebEnginePartHtmlWriter::removeJscripts(input)= , output); } = diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/view= er/viewer_p.cpp index 6f3f233..d3105df 100644 --- a/messageviewer/src/viewer/viewer_p.cpp +++ b/messageviewer/src/viewer/viewer_p.cpp @@ -163,7 +163,8 @@ template struct InvokeWrapper { R *receiver; void (C::*memberFun)(Arg); - void operator()(Arg result) { + void operator()(Arg result) + { (receiver->*memberFun)(result); } }; @@ -2267,8 +2268,9 @@ void ViewerPrivate::slotPrintMessage() return; } #ifdef WEBENGINEVIEWER_PRINT_SUPPORT - if (mCurrentPrinter) + if (mCurrentPrinter) { return; + } mCurrentPrinter =3D new QPrinter(); QPointer dialog =3D new QPrintDialog(mCurrentPrinter, mM= ainWindow); dialog->setWindowTitle(i18n("Print Document")); @@ -2291,7 +2293,6 @@ void ViewerPrivate::slotHandlePagePrinted(bool result) mCurrentPrinter =3D Q_NULLPTR; } = - void ViewerPrivate::slotSetEncoding() { if (mSelectEncodingAction) { diff --git a/messageviewer/src/viewer/viewer_p.h b/messageviewer/src/viewer= /viewer_p.h index cfa4a0b..a5070f8 100644 --- a/messageviewer/src/viewer/viewer_p.h +++ b/messageviewer/src/viewer/viewer_p.h @@ -423,7 +423,6 @@ public: QList viewerPluginActionList(MessageViewer::ViewerPluginInt= erface::SpecificFeatureTypes features); QList interceptorUrlActions(const WebEngineViewer::WebHitTe= stResult &result) const; = - void setPrintElementBackground(bool printElementBackground); = private Q_SLOTS: diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.cpp b/mes= sageviewer/src/viewer/webengine/mailwebengineview.cpp index 6f1a7f2..aa20ea9 100644 --- a/messageviewer/src/viewer/webengine/mailwebengineview.cpp +++ b/messageviewer/src/viewer/webengine/mailwebengineview.cpp @@ -240,8 +240,8 @@ void MailWebEngineView::hideAccessKeys() bool MailWebEngineView::isScrolledToBottom() const { #if QT_VERSION >=3D 0x050700 - qDebug()<<" page position " << page()->scrollPosition().y(); - qDebug()<<" content size " << page()->contentsSize().height(); + qDebug() << " page position " << page()->scrollPosition().y(); + qDebug() << " content size " << page()->contentsSize().height(); #endif qDebug() << "bool MailWebEngineView::isScrolledToBottom() const not im= plemented"; //Convert as async diff --git a/messageviewer/src/viewerplugins/viewerpluginmanager.cpp b/mess= ageviewer/src/viewerplugins/viewerpluginmanager.cpp index de6bf17..25fad56 100644 --- a/messageviewer/src/viewerplugins/viewerpluginmanager.cpp +++ b/messageviewer/src/viewerplugins/viewerpluginmanager.cpp @@ -21,7 +21,6 @@ #include "viewerplugin.h" #include "messageviewer_debug.h" = - #include #include #include @@ -203,7 +202,6 @@ ViewerPlugin *ViewerPluginManagerPrivate::pluginFromIde= ntifier(const QString &id return {}; } = - ViewerPluginManager::ViewerPluginManager(QObject *parent) : QObject(parent), d(new MessageViewer::ViewerPluginManagerPrivate(this)) diff --git a/webengineviewer/src/urlinterceptor/networkurlinterceptorplugin= manager.cpp b/webengineviewer/src/urlinterceptor/networkurlinterceptorplugi= nmanager.cpp index 4dc2a7e..384108f 100644 --- a/webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager= .cpp +++ b/webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager= .cpp @@ -190,7 +190,6 @@ NetworkUrlInterceptorPluginManager *NetworkUrlIntercept= orPluginManager::self() return sInstance->mailNetworkUrlInterceptorPluginManager; } = - NetworkUrlInterceptorPluginManager::NetworkUrlInterceptorPluginManager(QOb= ject *parent) : QObject(parent), d(new NetworkUrlInterceptorPluginManagerPrivate(this))