summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-21 20:47:47 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-21 20:47:47 (GMT)
commit4f99a7b6dbd81dc9cfbbbd423ce5dae577e192ce (patch)
tree06799a65210ce06dbdce38ab90cbd31ec3b34018
parent660f9e8d541a731fdf285472c7d235bc04be218c (diff)
Astyle kdelibs
-rw-r--r--src/ksieveui/autocreatescripts/autotests/selectheadersdialogtest.cpp3
-rw-r--r--src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp4
-rw-r--r--src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp2
-rw-r--r--src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp1
-rw-r--r--src/ksieveui/editor/autotests/sieveeditormenubartest.cpp2
-rw-r--r--src/ksieveui/editor/sieveeditormenubar.cpp1
-rw-r--r--src/ksieveui/editor/sieveeditortextmodewidget.cpp2
-rw-r--r--src/ksieveui/editor/webengine/sieveeditorwebengineview.h2
-rw-r--r--src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp2
-rw-r--r--src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp1
-rw-r--r--src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp1
-rw-r--r--src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp20
-rw-r--r--src/ksieveui/vacation/autotests/vacationeditwidgettest.h1
-rw-r--r--src/ksieveui/vacation/vacationeditwidget.cpp2
-rw-r--r--src/ksieveui/vacation/vacationscriptextractor.h12
15 files changed, 17 insertions, 39 deletions
diff --git a/src/ksieveui/autocreatescripts/autotests/selectheadersdialogtest.cpp b/src/ksieveui/autocreatescripts/autotests/selectheadersdialogtest.cpp
index c4986f6..2753b27 100644
--- a/src/ksieveui/autocreatescripts/autotests/selectheadersdialogtest.cpp
+++ b/src/ksieveui/autocreatescripts/autotests/selectheadersdialogtest.cpp
@@ -51,7 +51,6 @@ void SelectHeadersDialogTest::shouldHaveDefaultValue()
QVERIFY(lay);
QCOMPARE(lay->margin(), 0);
-
KSieveUi::SelectHeadersWidget *mListWidget = dlg.findChild<KSieveUi::SelectHeadersWidget *>(QStringLiteral("listwidget"));
QVERIFY(mListWidget);
@@ -64,8 +63,6 @@ void SelectHeadersDialogTest::shouldHaveDefaultValue()
QVERIFY(mNewHeader->isClearButtonEnabled());
QVERIFY(mNewHeader->trapReturnKey());
-
-
QPushButton *mAddNewHeader = dlg.findChild<QPushButton *>(QStringLiteral("addnewheader"));
QVERIFY(mAddNewHeader);
QVERIFY(!mAddNewHeader->isEnabled());
diff --git a/src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp b/src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp
index 8ae7c03..b62c639 100644
--- a/src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp
+++ b/src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp
@@ -53,7 +53,7 @@ void SelectHeaderTypeComboBoxTest::shouldHaveDefaultValue()
QVERIFY(!combox.itemText(combox.count() - 1).isEmpty());
QCOMPARE(combox.itemData(combox.count() - 1).toString(), QString());
//Don't verify first element and last as we already did
- for(int i = 1; i < combox.count()-1; ++i) {
+ for (int i = 1; i < combox.count() - 1; ++i) {
QVERIFY(!combox.itemData(i).toString().isEmpty());
QVERIFY(!combox.itemText(i).isEmpty());
}
@@ -68,7 +68,7 @@ void SelectHeaderTypeComboBoxTest::shouldHaveDefaultValue()
QCOMPARE(combox1.itemData(combox1.count() - 1).toString(), QString());
//Don't verify first element and last as we already did
- for(int i = 1; i < combox1.count() - 1; ++i) {
+ for (int i = 1; i < combox1.count() - 1; ++i) {
QVERIFY(!combox1.itemData(i).toString().isEmpty());
QVERIFY(!combox1.itemText(i).isEmpty());
}
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
index c8498f5..c7c3bbb 100644
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
@@ -50,7 +50,6 @@ SelectHeadersDialog::SelectHeadersDialog(QWidget *parent)
connect(buttonBox, &QDialogButtonBox::rejected, this, &SelectHeadersDialog::reject);
okButton->setFocus();
-
QVBoxLayout *lay = new QVBoxLayout;
lay->setObjectName(QStringLiteral("widgetlayout"));
lay->setMargin(0);
@@ -220,7 +219,6 @@ SelectHeaderTypeComboBox::~SelectHeaderTypeComboBox()
{
}
-
void SelectHeaderTypeComboBox::changeReadOnlyStatus()
{
const bool readOnly = (currentIndex() > 0);
diff --git a/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp b/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
index f421a1a..ee24d08 100644
--- a/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "sieveconditionwidgetlister.h"
#include "autocreatescriptdialog.h"
#include "autocreatescriptutil_p.h"
diff --git a/src/ksieveui/editor/autotests/sieveeditormenubartest.cpp b/src/ksieveui/editor/autotests/sieveeditormenubartest.cpp
index 3221693..34aa42e 100644
--- a/src/ksieveui/editor/autotests/sieveeditormenubartest.cpp
+++ b/src/ksieveui/editor/autotests/sieveeditormenubartest.cpp
@@ -84,7 +84,6 @@ void SieveEditorMenuBarTest::shouldDisableActions()
QVERIFY(!bar.printAction()->isEnabled());
QVERIFY(!bar.printPreviewAction()->isEnabled());
-
bar.setEditorMode(true);
QVERIFY(bar.goToLineAction()->isEnabled());
QVERIFY(bar.findAction()->isEnabled());
@@ -208,7 +207,6 @@ void SieveEditorMenuBarTest::shouldEmitSignals()
QSignalSpy spyPrintPreview(&bar, SIGNAL(printPreview()));
bar.printPreviewAction()->trigger();
-
QCOMPARE(spyZoomOut.count(), 1);
QCOMPARE(spyZoomIn.count(), 1);
QCOMPARE(spyUnComment.count(), 1);
diff --git a/src/ksieveui/editor/sieveeditormenubar.cpp b/src/ksieveui/editor/sieveeditormenubar.cpp
index 9fe1ddf..2e090b8 100644
--- a/src/ksieveui/editor/sieveeditormenubar.cpp
+++ b/src/ksieveui/editor/sieveeditormenubar.cpp
@@ -91,7 +91,6 @@ void SieveEditorMenuBar::initActions()
mPrintAction = KStandardAction::print(this, &SieveEditorMenuBar::print, this);
mPrintPreviewAction = KStandardAction::printPreview(this, &SieveEditorMenuBar::printPreview, this);
-
mZoomResetAction = new QAction(i18nc("Reset the zoom", "Reset"), this);
mZoomResetAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
connect(mZoomResetAction, &QAction::triggered, this, &SieveEditorMenuBar::zoomReset);
diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.cpp b/src/ksieveui/editor/sieveeditortextmodewidget.cpp
index 0341c1c..6375d69 100644
--- a/src/ksieveui/editor/sieveeditortextmodewidget.cpp
+++ b/src/ksieveui/editor/sieveeditortextmodewidget.cpp
@@ -342,7 +342,7 @@ bool SieveEditorTextModeWidget::hasSelection() const
void SieveEditorTextModeWidget::zoomIn()
{
- QWidget *w = mTabWidget->currentWidget();
+ QWidget *w = mTabWidget->currentWidget();
if (w == mEditorWidget) {
mTextEdit->zoomIn();
} else if (SieveEditorHelpHtmlWidget *page = qobject_cast<SieveEditorHelpHtmlWidget *>(w)) {
diff --git a/src/ksieveui/editor/webengine/sieveeditorwebengineview.h b/src/ksieveui/editor/webengine/sieveeditorwebengineview.h
index 73be14a..50c1cbc 100644
--- a/src/ksieveui/editor/webengine/sieveeditorwebengineview.h
+++ b/src/ksieveui/editor/webengine/sieveeditorwebengineview.h
@@ -32,7 +32,7 @@ public:
protected:
void contextMenuEvent(QContextMenuEvent *ev) Q_DECL_OVERRIDE;
private:
- void downloadRequested(QWebEngineDownloadItem*);
+ void downloadRequested(QWebEngineDownloadItem *);
};
}
diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
index de91a3d..e94c28f 100644
--- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
+++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
@@ -99,6 +99,6 @@ void SieveScriptDebuggerDialog::readConfig()
if (sizeDialog.isValid()) {
resize(sizeDialog);
}
- const QList<int> size{ 100 , 400};
+ const QList<int> size{ 100, 400};
mSieveScriptDebuggerWidget->setSplitterSizes(group.readEntry("Splitter", size));
}
diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
index 29cd554..9b10eb6 100644
--- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
+++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
@@ -133,7 +133,6 @@ QList<int> SieveScriptDebuggerFrontEndWidget::splitterSizes() const
return mSplitter->sizes();
}
-
void SieveScriptDebuggerFrontEndWidget::slotEmailChanged(const QString &text)
{
mDebugScript->setEnabled(!text.trimmed().isEmpty());
diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp
index af8bf84..133bb53 100644
--- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp
+++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp
@@ -68,7 +68,6 @@ void SieveScriptDebuggerWidget::setSplitterSizes(const QList<int> &sizes)
mSieveScriptFrontEnd->setSplitterSizes(sizes);
}
-
bool SieveScriptDebuggerWidget::canAccept() const
{
return mSieveScriptFrontEnd->canAccept();
diff --git a/src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp b/src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp
index b49b141..fd479b4 100644
--- a/src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp
+++ b/src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp
@@ -70,7 +70,6 @@ void VacationEditWidgetTest::shouldHaveDefaultValue()
KTimeComboBox *mStartTime = w.findChild<KTimeComboBox *>(QStringLiteral("mStartTime"));
QVERIFY(mStartTime);
-
QCheckBox *mStartTimeActive = w.findChild<QCheckBox *>(QStringLiteral("mStartTimeActive"));
QVERIFY(mStartTimeActive);
QVERIFY(!mStartTimeActive->isChecked());
@@ -94,7 +93,6 @@ void VacationEditWidgetTest::shouldHaveDefaultValue()
QVERIFY(mEndDateLabel);
QVERIFY(!mEndDateLabel->text().isEmpty());
-
QSpinBox *mIntervalSpin = w.findChild<QSpinBox *>(QStringLiteral("mIntervalSpin"));
QVERIFY(mIntervalSpin);
@@ -136,7 +134,6 @@ void VacationEditWidgetTest::shouldHaveDefaultValue()
QVERIFY(!mDomainCheck->text().isEmpty());
QVERIFY(!mDomainCheck->isChecked());
-
QLineEdit *mDomainEdit = w.findChild<QLineEdit *>(QStringLiteral("mDomainEdit"));
QVERIFY(mDomainEdit);
QVERIFY(mDomainEdit->text().isEmpty());
@@ -162,7 +159,6 @@ void VacationEditWidgetTest::shouldGetValues()
QCheckBox *mEndTimeActive = w.findChild<QCheckBox *>(QStringLiteral("mEndTimeActive"));
-
QSpinBox *mIntervalSpin = w.findChild<QSpinBox *>(QStringLiteral("mIntervalSpin"));
QLineEdit *mMailAliasesEdit = w.findChild<QLineEdit *>(QStringLiteral("mMailAliasesEdit"));
@@ -174,7 +170,6 @@ void VacationEditWidgetTest::shouldGetValues()
//QCheckBox *mSpamCheck = w.findChild<QCheckBox *>(QStringLiteral("mSpamCheck"));
//QCheckBox *mDomainCheck = w.findChild<QCheckBox *>(QStringLiteral("mDomainCheck"));
-
//QLineEdit *mDomainEdit = w.findChild<QLineEdit *>(QStringLiteral("mDomainEdit"));
bool activateVacation = true;
@@ -203,28 +198,27 @@ void VacationEditWidgetTest::shouldGetValues()
#if 0
KMime::Types::AddrSpecList mailAliases() const;
- void setMailAliases(const KMime::Types::AddrSpecList &aliases);
- void setMailAliases(const QString &aliases);
-
+ void setMailAliases(const KMime::Types::AddrSpecList & aliases);
+ void setMailAliases(const QString & aliases);
bool sendForSpam() const;
void setSendForSpam(bool enable);
QDate startDate() const;
- void setStartDate(const QDate &startDate);
+ void setStartDate(const QDate & startDate);
QTime startTime() const;
- void setStartTime(const QTime &startTime);
+ void setStartTime(const QTime & startTime);
QDate endDate() const;
- void setEndDate(const QDate &endDate);
+ void setEndDate(const QDate & endDate);
QTime endTime() const;
- void setEndTime(const QTime &endTime);
+ void setEndTime(const QTime & endTime);
VacationUtils::MailAction mailAction() const;
QString mailActionRecipient() const;
- void setMailAction(VacationUtils::MailAction action, const QString &recipient);
+ void setMailAction(VacationUtils::MailAction action, const QString & recipient);
#endif
}
diff --git a/src/ksieveui/vacation/autotests/vacationeditwidgettest.h b/src/ksieveui/vacation/autotests/vacationeditwidgettest.h
index 1839087..789fa50 100644
--- a/src/ksieveui/vacation/autotests/vacationeditwidgettest.h
+++ b/src/ksieveui/vacation/autotests/vacationeditwidgettest.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef VACATIONEDITWIDGETTEST_H
#define VACATIONEDITWIDGETTEST_H
diff --git a/src/ksieveui/vacation/vacationeditwidget.cpp b/src/ksieveui/vacation/vacationeditwidget.cpp
index 42733f9..72140fe 100644
--- a/src/ksieveui/vacation/vacationeditwidget.cpp
+++ b/src/ksieveui/vacation/vacationeditwidget.cpp
@@ -55,7 +55,7 @@ VacationEditWidget::VacationEditWidget(QWidget *parent)
// explanation label:
++row;
QLabel *configureVacationLabel = new QLabel(i18n("Configure vacation "
- "notifications to be sent:"), this);
+ "notifications to be sent:"), this);
configureVacationLabel->setObjectName(QStringLiteral("configureVacationLabel"));
glay->addWidget(configureVacationLabel, row, 0, 1, 2);
diff --git a/src/ksieveui/vacation/vacationscriptextractor.h b/src/ksieveui/vacation/vacationscriptextractor.h
index 9bb0ccc..362a678 100644
--- a/src/ksieveui/vacation/vacationscriptextractor.h
+++ b/src/ksieveui/vacation/vacationscriptextractor.h
@@ -691,12 +691,10 @@ private:
void testEnd() Q_DECL_OVERRIDE {}
void testListStart() Q_DECL_OVERRIDE {}
void testListEnd() Q_DECL_OVERRIDE {}
- void blockStart(int lineNumber) Q_DECL_OVERRIDE
- {
+ void blockStart(int lineNumber) Q_DECL_OVERRIDE {
Q_UNUSED(lineNumber)
}
- void blockEnd(int lineNumber) Q_DECL_OVERRIDE
- {
+ void blockEnd(int lineNumber) Q_DECL_OVERRIDE {
Q_UNUSED(lineNumber)
}
void hashComment(const QString &) Q_DECL_OVERRIDE {}
@@ -705,12 +703,10 @@ private:
void error(const KSieve::Error &e) Q_DECL_OVERRIDE;
void finished() Q_DECL_OVERRIDE;
- void taggedArgument(const QString &tag) Q_DECL_OVERRIDE
- {
+ void taggedArgument(const QString &tag) Q_DECL_OVERRIDE {
Q_UNUSED(tag)
}
- void numberArgument(unsigned long number, char) Q_DECL_OVERRIDE
- {
+ void numberArgument(unsigned long number, char) Q_DECL_OVERRIDE {
Q_UNUSED(number)
}