summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-22 07:41:05 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-22 07:41:05 (GMT)
commit935eb9d2eaf0e39e50fb1183500b31f6eda01149 (patch)
tree0c6a811eadbed041765e3083fefb3e4291715864
parent58fa22e9eef8baa753e7d9944da76fe44ff8d625 (diff)
Astyle kdelibs
-rw-r--r--kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp12
-rw-r--r--kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddresscheckjobtest.cpp1
-rw-r--r--kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretabwidget.cpp2
-rw-r--r--plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp4
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternaleditwidgettest.cpp2
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp2
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditdialog.cpp2
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditwidget.cpp1
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp1
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp12
10 files changed, 17 insertions, 22 deletions
diff --git a/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp b/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
index c9b1dbc..0ff4a6f 100644
--- a/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
@@ -129,9 +129,9 @@ void VCardImportExportPluginInterface::importVCard()
const QString filter = i18n("*.vcf|vCard (*.vcf)\n*|all files (*)");
urls =
- QFileDialog::getOpenFileUrls(parentWidget(), i18nc("@title:window", "Select vCard to Import"),
- QUrl(),
- filter);
+ QFileDialog::getOpenFileUrls(parentWidget(), i18nc("@title:window", "Select vCard to Import"),
+ QUrl(),
+ filter);
if (urls.isEmpty()) {
return;
@@ -154,9 +154,9 @@ void VCardImportExportPluginInterface::importVCard()
}
} else {
const QString msg = xi18nc(
- "@info",
- "<para>Unable to access vCard:</para><para>%1</para>",
- job->errorString());
+ "@info",
+ "<para>Unable to access vCard:</para><para>%1</para>",
+ job->errorString());
KMessageBox::error(parentWidget(), msg, caption);
anyFailures = true;
}
diff --git a/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddresscheckjobtest.cpp b/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddresscheckjobtest.cpp
index 70d8ed0..110bd09 100644
--- a/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddresscheckjobtest.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddresscheckjobtest.cpp
@@ -140,7 +140,6 @@ void ConfirmAddressCheckJobTest::shouldNotDuplicateValue()
QVERIFY(!job.validEmails().isEmpty());
QCOMPARE(job.validEmails(), emails);
-
job.setCheckSettings(domains, whiteList, true);
job.setAddressList(QStringList() << emails << emails);
job.start();
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretabwidget.cpp b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretabwidget.cpp
index c26b115..10a38e7 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretabwidget.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretabwidget.cpp
@@ -39,7 +39,6 @@ ConfirmAddressConfigureTabWidget::ConfirmAddressConfigureTabWidget(QWidget *pare
QVBoxLayout *layoutDomainName = new QVBoxLayout(groupBoxDomainName);
layoutDomainName->setObjectName(QStringLiteral("layoutdomainname"));
-
QHBoxLayout *radioButtonLayout = new QHBoxLayout;
layoutDomainName->addLayout(radioButtonLayout);
radioButtonLayout->setAlignment(Qt::AlignHCenter);
@@ -53,7 +52,6 @@ ConfirmAddressConfigureTabWidget::ConfirmAddressConfigureTabWidget(QWidget *pare
mRejectedDomain->setObjectName(QStringLiteral("rejectdomainname"));
radioButtonLayout->addWidget(mRejectedDomain);
-
PimCommon::SimpleStringListEditor::ButtonCode buttonCode =
static_cast<PimCommon::SimpleStringListEditor::ButtonCode>(PimCommon::SimpleStringListEditor::Add | PimCommon::SimpleStringListEditor::Remove | PimCommon::SimpleStringListEditor::Modify);
mDomainNameListEditor =
diff --git a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
index a840315..1d4aa2d 100644
--- a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
@@ -159,8 +159,8 @@ QString FancyHeaderStyle::format(KMime::Message *message) const
// cc line, if an
if (strategy->showHeader(QStringLiteral("cc")) && message->cc(false)) {
const QString str = StringUtil::emailAddrAsAnchor(message->cc(), StringUtil::DisplayFullAddress,
- QString(), StringUtil::ShowLink, StringUtil::ExpandableAddresses,
- QStringLiteral("FullCcAddressList"));
+ QString(), StringUtil::ShowLink, StringUtil::ExpandableAddresses,
+ QStringLiteral("FullCcAddressList"));
if (!str.isEmpty()) {
headerStr.append(QStringLiteral("<tr><th>%1</th>\n"
"<td>%2</td></tr>\n")
diff --git a/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternaleditwidgettest.cpp b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternaleditwidgettest.cpp
index 2acadd8..8f5b560 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternaleditwidgettest.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternaleditwidgettest.cpp
@@ -74,7 +74,7 @@ void ViewerPluginExternalEditWidgetTest::shouldGetSaveInfo_data()
void ViewerPluginExternalEditWidgetTest::shouldGetSaveInfo()
{
- QFETCH (ViewerPluginExternalScriptInfo, scriptinfo);
+ QFETCH(ViewerPluginExternalScriptInfo, scriptinfo);
ViewerPluginExternalEditWidget w;
w.setScriptInfo(scriptinfo);
QCOMPARE(scriptinfo, w.scriptInfo());
diff --git a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp
index 6cac88b..debb4c0 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp
@@ -195,7 +195,7 @@ void ViewerPluginExternalConfigureWidget::updateButtons()
}
}
-void ViewerPluginExternalConfigureWidget::slotDoubleClicked(QListWidgetItem * item)
+void ViewerPluginExternalConfigureWidget::slotDoubleClicked(QListWidgetItem *item)
{
if (item) {
modifyScript(item);
diff --git a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditdialog.cpp b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditdialog.cpp
index 4ef1a9a..e473dc7 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditdialog.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditdialog.cpp
@@ -42,7 +42,7 @@ ViewerPluginExternalEditDialog::ViewerPluginExternalEditDialog(QWidget *parent)
mainLayout->addWidget(buttonBox);
mOkButton = buttonBox->button(QDialogButtonBox::Ok);
mOkButton->setEnabled(false);
- resize(350,200);
+ resize(350, 200);
}
ViewerPluginExternalEditDialog::~ViewerPluginExternalEditDialog()
diff --git a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditwidget.cpp b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditwidget.cpp
index 7f7f481..27ce369 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditwidget.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternaleditwidget.cpp
@@ -31,7 +31,6 @@ ViewerPluginExternalEditWidget::ViewerPluginExternalEditWidget(QWidget *parent)
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mainLayout->setMargin(0);
-
mName = new QLineEdit(this);
mName->setObjectName(QStringLiteral("name"));
mainLayout->addRow(i18n("Name:"), mName);
diff --git a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp
index ba35314..cbac0a4 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp
@@ -56,4 +56,3 @@ bool MessageViewer::ViewerPluginExternalscript::hasConfigureDialog() const
#include "viewerpluginexternalscript.moc"
-
diff --git a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp
index 823680c..6bc19df 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp
@@ -104,11 +104,11 @@ void ViewerPluginExternalScriptInfo::setFileName(const QString &fileName)
bool ViewerPluginExternalScriptInfo::operator==(const ViewerPluginExternalScriptInfo &other) const
{
return (name() == other.name()) &&
- (commandLine() == other.commandLine()) &&
- (executable() == other.executable()) &&
- (description() == other.description()) &&
- (icon() == other.icon()) &&
- (isReadOnly() == other.isReadOnly()) &&
- (fileName() == other.fileName());
+ (commandLine() == other.commandLine()) &&
+ (executable() == other.executable()) &&
+ (description() == other.description()) &&
+ (icon() == other.icon()) &&
+ (isReadOnly() == other.isReadOnly()) &&
+ (fileName() == other.fileName());
}