Commit 3d54e0e4 authored by Laurent Montel's avatar Laurent Montel 😁

Astyle kdelibs

parent 9db9eb3b
......@@ -42,8 +42,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
{
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE {
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
m_collectionFilter->setSourceModel(model);
......@@ -51,13 +50,11 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
{
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE {
return m_collectionFilter->mapToSource(idx);
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
{
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
return new MixedTreeModel(changeRecorder(), this);
}
......
......@@ -41,8 +41,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
{
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE {
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
m_collectionFilter->setSourceModel(model);
......@@ -50,8 +49,7 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
{
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE {
return m_collectionFilter->mapToSource(idx);
}
......
......@@ -44,8 +44,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
{
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE {
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
m_collectionFilter->setSourceModel(model);
......@@ -53,13 +52,11 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
{
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE {
return m_collectionFilter->mapToSource(idx);
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
{
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
return new MixedTreeModel(changeRecorder(), this);
}
......
......@@ -44,8 +44,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
{
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE {
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
m_collectionFilter->setSourceModel(model);
......@@ -53,13 +52,11 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
{
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE {
return m_collectionFilter->mapToSource(idx);
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
{
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
return new MixedTreeModel(changeRecorder(), this);
}
......
......@@ -48,8 +48,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
{
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE {
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
m_collectionFilter->setSourceModel(model);
......@@ -57,13 +56,11 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
{
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE {
return m_collectionFilter->mapToSource(idx);
}
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
{
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
return new CategorisedEntityModel(changeRecorder(), this);
}
......
......@@ -48,8 +48,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
{
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE {
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
m_collectionFilter->setSourceModel(model);
......@@ -64,13 +63,11 @@ public:
tree->setModel(m_checkableProxy);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
{
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE {
return m_collectionFilter->mapToSource(idx);
}
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
{
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
MixedTreeModel *model = new MixedTreeModel(changeRecorder(), this);
return model;
}
......
......@@ -50,8 +50,7 @@ public:
}
Akonadi::EntityTreeModel *getModel(Akonadi::ChangeRecorder *changeRecorder, QObject *parent) Q_DECL_OVERRIDE
{
Akonadi::EntityTreeModel *getModel(Akonadi::ChangeRecorder *changeRecorder, QObject *parent) Q_DECL_OVERRIDE {
return new CategorisedEntityModel(changeRecorder, parent);
}
......@@ -65,8 +64,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
{
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE {
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
m_collectionFilter->setSourceModel(model);
......@@ -74,13 +72,11 @@ public:
tree->setModel(m_collectionFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
{
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE {
return m_collectionFilter->mapToSource(idx);
}
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE
{
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
return m_model;
}
......
......@@ -61,8 +61,7 @@ public:
{
}
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE
{
/* reimp */ void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model) Q_DECL_OVERRIDE {
m_collectionFilter = new Akonadi::EntityMimeTypeFilterModel(this);
m_collectionFilter->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
m_collectionFilter->setSourceModel(model);
......@@ -74,8 +73,7 @@ public:
tree->setModel(m_unreadFilter);
}
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE
{
/* reimp */ QModelIndex mapToSource(const QModelIndex &idx) Q_DECL_OVERRIDE {
return m_collectionFilter->mapToSource(m_unreadFilter->mapToSource(idx));
}
......
......@@ -19,7 +19,6 @@
#include "../externalscriptplugin/viewerpluginexternalscriptparseargument.h"
#include <QTest>
ViewerPluginExternalScriptParseArgumentTest::ViewerPluginExternalScriptParseArgumentTest(QObject *parent)
: QObject(parent)
{
......@@ -132,5 +131,4 @@ void ViewerPluginExternalScriptParseArgumentTest::initializeMessage(const KMime:
msg->parse();
}
QTEST_MAIN(ViewerPluginExternalScriptParseArgumentTest)
......@@ -34,10 +34,10 @@ QStringList ViewerPluginExternalScriptParseArgument::parse(const QStringList &sc
}
QStringList newArguments;
Q_FOREACH(const QString &arg, scriptArguments) {
Q_FOREACH (const QString &arg, scriptArguments) {
if (arg == QString::fromLatin1("%s")) {
const KMime::Headers::Subject *const subject = mMessage ? mMessage->subject(false) : Q_NULLPTR;
newArguments << QStringLiteral("\"%1\"").arg(subject ? subject->asUnicodeString() : QString());
newArguments << QStringLiteral("\"%1\"").arg(subject ? subject->asUnicodeString() : QString());
} else if (arg == QString::fromLatin1("%from")) {
const KMime::Headers::From *const from = mMessage ? mMessage->from(false) : Q_NULLPTR;
newArguments << QStringLiteral("\"%1\"").arg(from ? from->asUnicodeString() : QString());
......
......@@ -108,7 +108,7 @@ void AdBlockBlockableItemsWidget::customContextMenuRequested(const QPoint &)
menu.addAction(QIcon::fromTheme(QStringLiteral("document-open")), i18n("Open"), this, SLOT(slotOpenItem()));
if (!item->text(FilterValue).isEmpty()) {
menu.addSeparator();
menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")),i18n("Remove filter"), this, SLOT(slotRemoveFilter()));
menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Remove filter"), this, SLOT(slotRemoveFilter()));
}
menu.exec(QCursor::pos());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment