From 13a1e1ed6bdbd784b0dff8c8f2e25bb01809a7eb Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 14 Mar 2016 08:57:43 +0100 Subject: [PATCH] Astyle kdelibs --- accountwizard/global.cpp | 1 - accountwizard/loadpage.cpp | 3 +-- agents/sendlateragent/sendlateragent.h | 1 - akonadiconsole/akonadibrowsermodel.cpp | 2 +- kmail/editor/kmcomposerwin.cpp | 1 - sieveeditor/sieveeditoremptytabwidgetlabel.cpp | 28 +++++++++++++------------- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/accountwizard/global.cpp b/accountwizard/global.cpp index a756b7fb12..b483c8cd53 100644 --- a/accountwizard/global.cpp +++ b/accountwizard/global.cpp @@ -124,7 +124,6 @@ QString Global::unpackAssistant(const QUrl &remotePackageUrl) } } - void Global::setPoFileName(const QString &poFileName) { sInstance->poFileName = poFileName; diff --git a/accountwizard/loadpage.cpp b/accountwizard/loadpage.cpp index 13978d590b..bd321ad3d6 100644 --- a/accountwizard/loadpage.cpp +++ b/accountwizard/loadpage.cpp @@ -69,8 +69,7 @@ void LoadPage::enterPageNext() KConfigGroup grpTranslate(&f, "Translate"); const QString poFileName = grpTranslate.readEntry("Filename"); - if (!poFileName.isEmpty()) - { + if (!poFileName.isEmpty()) { Global::setPoFileName(poFileName); m_action->trigger(); } diff --git a/agents/sendlateragent/sendlateragent.h b/agents/sendlateragent/sendlateragent.h index 62d4c68ca3..25ac0a0bf3 100644 --- a/agents/sendlateragent/sendlateragent.h +++ b/agents/sendlateragent/sendlateragent.h @@ -37,7 +37,6 @@ public: void setEnableAgent(bool b); bool enabledAgent() const; - Q_SIGNALS: void needUpdateConfigDialogBox(); diff --git a/akonadiconsole/akonadibrowsermodel.cpp b/akonadiconsole/akonadibrowsermodel.cpp index 71a180bac8..da77e830e0 100644 --- a/akonadiconsole/akonadibrowsermodel.cpp +++ b/akonadiconsole/akonadibrowsermodel.cpp @@ -357,7 +357,7 @@ bool AkonadiBrowserSortModel::lessThan(const QModelIndex &left, const QModelInde const KMime::Message::Ptr rightMail = rightItem.payload(); const KMime::Headers::Date *ldate = leftMail->date(false); const KMime::Headers::Date *rdate = rightMail->date(false); - if ( ldate && rdate) { + if (ldate && rdate) { return ldate->dateTime() < rdate->dateTime(); } else { return false; diff --git a/kmail/editor/kmcomposerwin.cpp b/kmail/editor/kmcomposerwin.cpp index d8d10c72b3..4efec8f1c2 100644 --- a/kmail/editor/kmcomposerwin.cpp +++ b/kmail/editor/kmcomposerwin.cpp @@ -121,7 +121,6 @@ #include "widgets/statusbarlabeltoggledstate.h" - // KDEPIMLIBS includes #include #include diff --git a/sieveeditor/sieveeditoremptytabwidgetlabel.cpp b/sieveeditor/sieveeditoremptytabwidgetlabel.cpp index 112a528ad7..1f05c2be31 100644 --- a/sieveeditor/sieveeditoremptytabwidgetlabel.cpp +++ b/sieveeditor/sieveeditoremptytabwidgetlabel.cpp @@ -36,19 +36,19 @@ void SieveEditorEmptyTabWidgetLabel::init() { //TODO improve text const QString placeholderText = QStringLiteral("" - "
" - "
%1
" - "
" - "
  • %2" - "
    %3
    " - "
    " - "
  • %4" - "
    %5
    " - "
  • %6" - "
    " - "
  • " - "").arg(i18n("Debug a script:"), i18nc("These action in from menu tools submenu debug sieve script", "Tools > Debug Sieve Script"), - i18n("Autogenerate script:"), i18nc("Action is from menu tools, submenu autogenerate script", "Tools > Autogenerate script"), - i18n("Import script:"), i18nc("Action is from file menu, import submenu", "File > Import")); + "
    " + "
    %1
    " + "
    " + "
  • %2" + "
    %3
    " + "
    " + "
  • %4" + "
    %5
    " + "
  • %6" + "
    " + "
  • " + "").arg(i18n("Debug a script:"), i18nc("These action in from menu tools submenu debug sieve script", "Tools > Debug Sieve Script"), + i18n("Autogenerate script:"), i18nc("Action is from menu tools, submenu autogenerate script", "Tools > Autogenerate script"), + i18n("Import script:"), i18nc("Action is from file menu, import submenu", "File > Import")); setText(placeholderText); } -- 2.11.4.GIT