GIT_SILENT Re-run clang-format

wilder-5.22
Alexander Lohnau 5 years ago
parent fd9c790b8e
commit ee189e715d
No known key found for this signature in database
GPG Key ID: 6C45BA731AA2ED36
  1. 18
      applets/appmenu/plugin/appmenumodel.cpp
  2. 6
      applets/appmenu/plugin/appmenumodel.h
  3. 1
      applets/kicker/plugin/kickerplugin.cpp
  4. 22
      applets/kicker/plugin/runnermodel.cpp
  5. 2
      applets/notifications/fileinfo.cpp
  6. 1
      applets/notifications/fileinfo.h
  7. 2
      applets/notifications/texteditclickhandler.cpp
  8. 3
      applets/notifications/texteditclickhandler.h
  9. 1
      applets/systemmonitor/systemmonitor/systemmonitor.cpp
  10. 14
      applets/systemtray/container/systemtraycontainer.cpp
  11. 12
      applets/systemtray/sortedsystemtraymodel.cpp
  12. 3
      applets/systemtray/systemtraymodel.cpp

@ -175,15 +175,15 @@ int AppMenuModel::rowCount(const QModelIndex &parent) const
return 0;
}
return m_menu->actions().count()+(KWindowSystem::isPlatformWayland() ? 1 : 0);
return m_menu->actions().count() + (KWindowSystem::isPlatformWayland() ? 1 : 0);
}
void AppMenuModel::removeSearchActionsFromMenu()
{
for (const auto &action: m_currentSearchActions) {
for (const auto &action : m_currentSearchActions) {
m_searchAction->menu()->removeAction(action);
}
m_currentSearchActions = QList<QAction*>();
m_currentSearchActions = QList<QAction *>();
}
void AppMenuModel::insertSearchActionsIntoMenu(const QString &filter)
@ -193,7 +193,7 @@ void AppMenuModel::insertSearchActionsIntoMenu(const QString &filter)
return;
}
const auto actions = flatActionList();
for (const auto &action: actions) {
for (const auto &action : actions) {
if (action->text().contains(filter, Qt::CaseInsensitive)) {
m_searchAction->menu()->addAction(action);
m_currentSearchActions << action;
@ -233,14 +233,14 @@ QHash<int, QByteArray> AppMenuModel::roleNames() const
return roleNames;
}
QList<QAction*> AppMenuModel::flatActionList()
QList<QAction *> AppMenuModel::flatActionList()
{
QList<QAction*> ret;
QList<QAction *> ret;
if (!m_menuAvailable || !m_menu) {
return ret;
}
const auto actions = m_menu->findChildren<QAction*>();
for (auto &action: actions) {
const auto actions = m_menu->findChildren<QAction *>();
for (auto &action : actions) {
if (action->menu() == nullptr) {
ret << action;
}
@ -260,7 +260,7 @@ QVariant AppMenuModel::data(const QModelIndex &index, int role) const
if (role == MenuRole) {
return m_searchAction->text();
} else if (role == ActionRole) {
return QVariant::fromValue((void*)m_searchAction);
return QVariant::fromValue((void *)m_searchAction);
}
}
if (row >= actions.count()) {

@ -24,12 +24,10 @@
#include <KWindowSystem>
#include <QAbstractListModel>
#include <QAbstractListModel>
#include <QAction>
#include <QPointer>
#include <QRect>
#include <QStringList>
#include <QStringList>
#include <tasksmodel.h>
class QMenu;
@ -68,7 +66,7 @@ public:
QRect screenGeometry() const;
void setScreenGeometry(QRect geometry);
QList<QAction*> flatActionList();
QList<QAction *> flatActionList();
Q_SIGNALS:
void requestActivateIndex(int index);
@ -100,7 +98,7 @@ private:
QScopedPointer<QMenu> m_searchMenu;
QPointer<QMenu> m_menu;
QPointer<QAction> m_searchAction;
QList<QAction*> m_currentSearchActions;
QList<QAction *> m_currentSearchActions;
void removeSearchActionsFromMenu();
void insertSearchActionsIntoMenu(const QString &filter = QString());

@ -62,5 +62,4 @@ void KickerPlugin::registerTypes(const char *uri)
qmlRegisterType<TriangleMouseFilter>(uri, 0, 1, "TriangleMouseFilter");
qmlRegisterType<WheelInterceptor>(uri, 0, 1, "WheelInterceptor");
qmlRegisterType<WindowSystem>(uri, 0, 1, "WindowSystem");
}

@ -248,16 +248,18 @@ void RunnerModel::matchesChanged(const QList<Plasma::QueryMatch> &matches)
QList<Plasma::QueryMatch> matches;
// To preserve the old behavior when allowing all runners we use static sorting
const static QStringList runnerIds = {QStringLiteral("desktopsessions"),
QStringLiteral("services"),
QStringLiteral("places"),
QStringLiteral("PowerDevil"),
QStringLiteral("calculator"),
QStringLiteral("unitconverter"),
QStringLiteral("shell"),
QStringLiteral("bookmarks"),
QStringLiteral("recentdocuments"),
QStringLiteral("locations"),};
const static QStringList runnerIds = {
QStringLiteral("desktopsessions"),
QStringLiteral("services"),
QStringLiteral("places"),
QStringLiteral("PowerDevil"),
QStringLiteral("calculator"),
QStringLiteral("unitconverter"),
QStringLiteral("shell"),
QStringLiteral("bookmarks"),
QStringLiteral("recentdocuments"),
QStringLiteral("locations"),
};
if (m_runners.isEmpty()) {
const auto baloo = matchesForRunner.take(QStringLiteral("baloosearch"));
const auto appstream = matchesForRunner.take(QStringLiteral("krunner_appstream"));

@ -29,7 +29,6 @@ Application::Application() = default;
Application::Application(const KService::Ptr &service)
: m_service(service)
{
}
QString Application::name() const
@ -50,7 +49,6 @@ bool Application::isValid() const
FileInfo::FileInfo(QObject *parent)
: QObject(parent)
{
}
FileInfo::~FileInfo() = default;

@ -103,5 +103,4 @@ private:
QString m_iconName;
Application m_preferredApplication;
};

@ -61,7 +61,7 @@ bool TextEditClickHandler::eventFilter(QObject *watched, QEvent *event)
const auto *e = static_cast<QMouseEvent *>(event);
if (m_pressPos.x() > -1 && m_pressPos.y() > -1 //
&& (m_pressPos - e->pos()).manhattanLength() < qGuiApp->styleHints()->startDragDistance()) {
&& (m_pressPos - e->pos()).manhattanLength() < qGuiApp->styleHints()->startDragDistance()) {
Q_EMIT clicked();
}
}

@ -19,8 +19,8 @@
#pragma once
#include <QObject>
#include <QPointer>
#include <QPointF>
#include <QPointer>
class QQuickItem;
@ -53,5 +53,4 @@ Q_SIGNALS:
private:
QPointer<QQuickItem> m_target;
QPointF m_pressPos{-1, -1};
};

@ -86,7 +86,6 @@ KSysGuard::SensorFaceController *SystemMonitor::workaroundController(QQuickItem
return new KSysGuard::SensorFaceController(cg, qmlEngine(context));
}
void SystemMonitor::configChanged()
{
if (m_sensorFaceController) {

@ -116,13 +116,13 @@ void SystemTrayContainer::ensureSystrayExists()
// replace internal remove action with ours
m_innerContainment->actions()->addAction("remove", actions()->action("remove"));
//Sync the display hints
m_innerContainment->setContainmentDisplayHints(containmentDisplayHints() | Plasma::Types::ContainmentDrawsPlasmoidHeading | Plasma::Types::ContainmentForcesSquarePlasmoids);
connect(cont, &Plasma::Containment::containmentDisplayHintsChanged, this,
[this]() {
m_innerContainment->setContainmentDisplayHints(containmentDisplayHints() | Plasma::Types::ContainmentDrawsPlasmoidHeading | Plasma::Types::ContainmentForcesSquarePlasmoids);
}
);
// Sync the display hints
m_innerContainment->setContainmentDisplayHints(containmentDisplayHints() | Plasma::Types::ContainmentDrawsPlasmoidHeading
| Plasma::Types::ContainmentForcesSquarePlasmoids);
connect(cont, &Plasma::Containment::containmentDisplayHintsChanged, this, [this]() {
m_innerContainment->setContainmentDisplayHints(containmentDisplayHints() | Plasma::Types::ContainmentDrawsPlasmoidHeading
| Plasma::Types::ContainmentForcesSquarePlasmoids);
});
}
void SystemTrayContainer::constraintsEvent(Plasma::Types::Constraints constraints)

@ -23,11 +23,13 @@
#include <QList>
static const QList<QString> s_categoryOrder = {QStringLiteral("UnknownCategory"),
QStringLiteral("ApplicationStatus"),
QStringLiteral("Communications"),
QStringLiteral("SystemServices"),
QStringLiteral("Hardware"),};
static const QList<QString> s_categoryOrder = {
QStringLiteral("UnknownCategory"),
QStringLiteral("ApplicationStatus"),
QStringLiteral("Communications"),
QStringLiteral("SystemServices"),
QStringLiteral("Hardware"),
};
SortedSystemTrayModel::SortedSystemTrayModel(SortingType sorting, QObject *parent)
: QSortFilterProxyModel(parent)

@ -291,7 +291,8 @@ static QVariant extractIcon(const Plasma::DataEngine::Data &sniData, const QStri
}
}
static QString extractItemId(const Plasma::DataEngine::Data &sniData) {
static QString extractItemId(const Plasma::DataEngine::Data &sniData)
{
const QString itemId = sniData.value(QStringLiteral("Id")).toString();
// Bug 378910: workaround for Dropbox not following the SNI specification
if (itemId.startsWith(QLatin1String("dropbox-client-"))) {

Loading…
Cancel
Save