[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [akregator] /: GIT_SILENT: coding style (silent)
From: Montel Laurent <null () kde ! org>
Date: 2017-10-31 21:32:18
Message-ID: E1e9e8w-0006rX-E6 () code ! kde ! org
[Download RAW message or body]
Git commit a69df1246048ce90ede89a1332eb3fc9f7e58504 by Montel Laurent.
Committed on 31/10/2017 at 21:32.
Pushed by mlaurent into branch 'master'.
GIT_SILENT: coding style
M +1 -1 plugins/mk4storage/feedstoragemk4impl.cpp
M +2 -2 src/akregator_part.cpp
M +3 -1 src/command/createfeedcommand.cpp
M +3 -1 src/command/createfoldercommand.cpp
M +6 -2 src/command/deletesubscriptioncommand.cpp
M +3 -1 src/command/editsubscriptioncommand.cpp
M +6 -2 src/command/expireitemscommand.cpp
M +3 -1 src/command/importfeedlistcommand.cpp
M +3 -1 src/command/loadfeedlistcommand.cpp
M +2 -2 src/selectioncontroller.cpp
M +6 -3 src/subscription/subscriptionlistmodel.cpp
M +1 -1 src/subscription/subscriptionlistmodel.h
M +1 -1 src/subscription/subscriptionlistview.cpp
https://commits.kde.org/akregator/a69df1246048ce90ede89a1332eb3fc9f7e58504
diff --git a/plugins/mk4storage/feedstoragemk4impl.cpp \
b/plugins/mk4storage/feedstoragemk4impl.cpp index 39ecf57d..82127ede 100644
--- a/plugins/mk4storage/feedstoragemk4impl.cpp
+++ b/plugins/mk4storage/feedstoragemk4impl.cpp
@@ -151,7 +151,7 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const QString &url, \
StorageMK4Impl *main) ':'),
\
QLatin1Char( '_'))
- + QLatin1String(".xml");
+ + QLatin1String(".xml");
d->convert = !QFile::exists(filePath + QLatin1String(".mk4")) && \
QFile::exists(d->oldArchivePath);
d->storage = new c4_Storage(QString(filePath + \
QLatin1String(".mk4")).toLocal8Bit(), true);
diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
index 4d5f8be3..94a4e00b 100644
--- a/src/akregator_part.cpp
+++ b/src/akregator_part.cpp
@@ -155,8 +155,8 @@ static QDomDocument createDefaultFeedList()
}
namespace Akregator {
-
-K_PLUGIN_FACTORY(AkregatorFactory, registerPlugin<Part>();)
+K_PLUGIN_FACTORY(AkregatorFactory, registerPlugin<Part>();
+ )
static Part *mySelf = nullptr;
BrowserExtension::BrowserExtension(Part *p, const char *name)
diff --git a/src/command/createfeedcommand.cpp b/src/command/createfeedcommand.cpp
index 9c0c20b4..b10969cd 100644
--- a/src/command/createfeedcommand.cpp
+++ b/src/command/createfeedcommand.cpp
@@ -176,7 +176,9 @@ void CreateFeedCommand::setAutoExecute(bool autoexec)
void CreateFeedCommand::doStart()
{
- QTimer::singleShot(0, this, [this]() { d->doCreate(); });
+ QTimer::singleShot(0, this, [this]() {
+ d->doCreate();
+ });
}
void CreateFeedCommand::doAbort()
diff --git a/src/command/createfoldercommand.cpp \
b/src/command/createfoldercommand.cpp index a8e28b3e..ef388b53 100644
--- a/src/command/createfoldercommand.cpp
+++ b/src/command/createfoldercommand.cpp
@@ -114,7 +114,9 @@ void CreateFolderCommand::setRootFolder(Folder *rootFolder)
void CreateFolderCommand::doStart()
{
- QTimer::singleShot(0, this, [this]() { d->doCreate(); });
+ QTimer::singleShot(0, this, [this]() {
+ d->doCreate();
+ });
}
void CreateFolderCommand::doAbort()
diff --git a/src/command/deletesubscriptioncommand.cpp \
b/src/command/deletesubscriptioncommand.cpp index 1970021e..1545f74a 100644
--- a/src/command/deletesubscriptioncommand.cpp
+++ b/src/command/deletesubscriptioncommand.cpp
@@ -165,7 +165,9 @@ QWeakPointer<FeedList> DeleteSubscriptionCommand::feedList() \
const
void DeleteSubscriptionCommand::doStart()
{
- QTimer::singleShot(0, this, [this]() { d->startDelete(); });
+ QTimer::singleShot(0, this, [this]() {
+ d->startDelete();
+ });
}
void DeleteSubscriptionCommand::Private::jobFinished()
@@ -188,7 +190,9 @@ void DeleteSubscriptionCommand::Private::startDelete()
return;
}
- QObject::connect(job, &DeleteSubscriptionJob::finished, q, [this]() { \
jobFinished(); }); + QObject::connect(job, &DeleteSubscriptionJob::finished, q, \
[this]() { + jobFinished();
+ });
job->start();
}
diff --git a/src/command/editsubscriptioncommand.cpp \
b/src/command/editsubscriptioncommand.cpp index de009e56..64944a82 100644
--- a/src/command/editsubscriptioncommand.cpp
+++ b/src/command/editsubscriptioncommand.cpp
@@ -137,7 +137,9 @@ void \
EditSubscriptionCommand::setSubscriptionListView(SubscriptionListView *view
void EditSubscriptionCommand::doStart()
{
- QTimer::singleShot(0, this, [this]() { d->startEdit(); });
+ QTimer::singleShot(0, this, [this]() {
+ d->startEdit();
+ });
}
void EditSubscriptionCommand::Private::startEdit()
diff --git a/src/command/expireitemscommand.cpp b/src/command/expireitemscommand.cpp
index 845d1f9b..4560953e 100644
--- a/src/command/expireitemscommand.cpp
+++ b/src/command/expireitemscommand.cpp
@@ -63,7 +63,9 @@ void ExpireItemsCommand::Private::addDeleteJobForFeed(Feed *feed)
{
Q_ASSERT(feed);
ArticleDeleteJob *job = new ArticleDeleteJob(q);
- connect(job, &ArticleDeleteJob::finished, q, [this](KJob *job) { \
jobFinished(job); }); + connect(job, &ArticleDeleteJob::finished, q, [this](KJob \
*job) { + jobFinished(job);
+ });
m_jobs.insert(job);
feed->deleteExpiredArticles(job);
job->start();
@@ -139,7 +141,9 @@ void ExpireItemsCommand::doAbort()
void ExpireItemsCommand::doStart()
{
- QTimer::singleShot(0, this, [this]() { d->createDeleteJobs(); });
+ QTimer::singleShot(0, this, [this]() {
+ d->createDeleteJobs();
+ });
}
#include "moc_expireitemscommand.cpp"
diff --git a/src/command/importfeedlistcommand.cpp \
b/src/command/importfeedlistcommand.cpp index 986fae3e..9d283ce8 100644
--- a/src/command/importfeedlistcommand.cpp
+++ b/src/command/importfeedlistcommand.cpp
@@ -152,7 +152,9 @@ void ImportFeedListCommand::doAbort()
void ImportFeedListCommand::doStart()
{
- QTimer::singleShot(0, this, [this]() { d->doImport(); });
+ QTimer::singleShot(0, this, [this]() {
+ d->doImport();
+ });
}
#include "moc_importfeedlistcommand.cpp"
diff --git a/src/command/loadfeedlistcommand.cpp \
b/src/command/loadfeedlistcommand.cpp index cdf90b76..004c9b96 100644
--- a/src/command/loadfeedlistcommand.cpp
+++ b/src/command/loadfeedlistcommand.cpp
@@ -132,7 +132,9 @@ void LoadFeedListCommand::setStorage(Backend::Storage *s)
void LoadFeedListCommand::doStart()
{
- QTimer::singleShot(KRandom::random() % 400, this, [this]() { d->doLoad(); });
+ QTimer::singleShot(KRandom::random() % 400, this, [this]() {
+ d->doLoad();
+ });
}
void LoadFeedListCommand::doAbort()
diff --git a/src/selectioncontroller.cpp b/src/selectioncontroller.cpp
index 5090d74f..d9df9f77 100644
--- a/src/selectioncontroller.cpp
+++ b/src/selectioncontroller.cpp
@@ -185,7 +185,7 @@ void Akregator::SelectionController::setFeedList(const \
QSharedPointer<FeedList> }
m_feedList = list;
- SubscriptionListModel *m = \
qobject_cast<SubscriptionListModel*>(m_subscriptionModel->sourceModel()); + \
SubscriptionListModel *m = qobject_cast<SubscriptionListModel \
*>(m_subscriptionModel->sourceModel()); std::unique_ptr<SubscriptionListModel> \
oldModel(m);
m_subscriptionModel->setSourceModel(new SubscriptionListModel(m_feedList, \
this));
@@ -264,7 +264,7 @@ void \
Akregator::SelectionController::subscriptionDataChanged(const QModelIndex & }
//need access to setExpanded
- QTreeView *tv = qobject_cast<QTreeView*>(m_feedSelector);
+ QTreeView *tv = qobject_cast<QTreeView *>(m_feedSelector);
if (!tv) {
qCCritical(AKREGATOR_LOG) << "Unable to cast m_feedSelector to QTreeView";
return;
diff --git a/src/subscription/subscriptionlistmodel.cpp \
b/src/subscription/subscriptionlistmodel.cpp index f433c9d3..d0ee9009 100644
--- a/src/subscription/subscriptionlistmodel.cpp
+++ b/src/subscription/subscriptionlistmodel.cpp
@@ -116,12 +116,14 @@ bool Akregator::FilterUnreadProxyModel::filterAcceptsRow(int \
source_row, const Q
QModelIndex idx = sourceModel()->index(source_row, 0, source_parent);
- if (m_selectedHierarchy.contains(idx))
+ if (m_selectedHierarchy.contains(idx)) {
return true;
+ }
QVariant v = idx.data(SubscriptionListModel::HasUnreadRole);
- if (v.isNull())
+ if (v.isNull()) {
return true;
+ }
return v.toBool();
}
@@ -158,8 +160,9 @@ void Akregator::FilterUnreadProxyModel::selectionChanged(const \
QItemSelection &s }
}
- if (doInvalidate && doFilter())
+ if (doInvalidate && doFilter()) {
invalidateFilter();
+ }
}
void Akregator::FilterUnreadProxyModel::clearCache()
diff --git a/src/subscription/subscriptionlistmodel.h \
b/src/subscription/subscriptionlistmodel.h index 3dbb557b..2a02a488 100644
--- a/src/subscription/subscriptionlistmodel.h
+++ b/src/subscription/subscriptionlistmodel.h
@@ -45,7 +45,7 @@ class FilterUnreadProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
- explicit FilterUnreadProxyModel(QObject* parent = nullptr);
+ explicit FilterUnreadProxyModel(QObject *parent = nullptr);
bool doFilter() const;
diff --git a/src/subscription/subscriptionlistview.cpp \
b/src/subscription/subscriptionlistview.cpp index 312aecc7..e91bbcbb 100644
--- a/src/subscription/subscriptionlistview.cpp
+++ b/src/subscription/subscriptionlistview.cpp
@@ -396,7 +396,7 @@ void SubscriptionListView::slotSetHideReadFeeds(bool setting)
return;
}
- FilterUnreadProxyModel *filter = qobject_cast<FilterUnreadProxyModel*>(m);
+ FilterUnreadProxyModel *filter = qobject_cast<FilterUnreadProxyModel *>(m);
if (!filter) {
qCCritical(AKREGATOR_LOG) << "Unable to cast model to \
FilterUnreadProxyModel*"; return;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic