kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-09 17:18:11 +03:00
Code Issues Projects Releases Wiki Activity

update code to new astyle conditions

Browse Source
This commit is contained in:
Michail Vourlakos 2018-07-03 22:15:45 +03:00
parent c698940d66
commit 6efeaa7d51
48 changed files with 131 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/abstractwindowinterface.h
View File

@ -43,11 +43,13 @@ namespace Latte {
class XWindowInterface;
class WaylandInterface;
class AbstractWindowInterface : public QObject {
class AbstractWindowInterface : public QObject
{
Q_OBJECT
public:
enum class Slide {
enum class Slide
{
None,
Top,
Left,

3
app/alternativeshelper.h
View File

@ -24,7 +24,8 @@
#include <QQuickItem>
class AlternativesHelper : public QObject {
class AlternativesHelper : public QObject
{
Q_OBJECT
Q_PROPERTY(QStringList appletProvides READ appletProvides CONSTANT)
Q_PROPERTY(QString currentPlugin READ currentPlugin CONSTANT)

2
app/dock/dockconfigview.cpp
View File

@ -336,7 +336,7 @@ void DockConfigView::focusOutEvent(QFocusEvent *ev)
const auto *focusWindow = qGuiApp->focusWindow();
if (focusWindow && (focusWindow->flags().testFlag(Qt::Popup)
|| focusWindow->flags().testFlag(Qt::ToolTip)) )
|| focusWindow->flags().testFlag(Qt::ToolTip)))
return;
if (!m_blockFocusLost && (!m_secConfigView || (m_secConfigView && !m_secConfigView->isActive()))) {

6
app/dock/dockconfigview.h
View File

@ -51,7 +51,8 @@ namespace Latte {
class DockCorona;
class DockView;
class DockConfigView : public PlasmaQuick::ConfigView {
class DockConfigView : public PlasmaQuick::ConfigView
{
Q_OBJECT
//! used when the secondary config window can not be shown
Q_PROPERTY(bool showInlineProperties READ showInlineProperties WRITE setShowInlineProperties NOTIFY showInlinePropertiesChanged)
@ -59,7 +60,8 @@ class DockConfigView : public PlasmaQuick::ConfigView {
Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged)
public:
enum ConfigViewType {
enum ConfigViewType
{
PrimaryConfig = 0,
SecondaryConfig
};

3
app/dock/dockmenumanager.h
View File

@ -39,7 +39,8 @@ class DockView;
namespace Latte {
class DockMenuManager : public QObject {
class DockMenuManager : public QObject
{
Q_OBJECT
public:

2
app/dock/docksecconfigview.cpp
View File

@ -255,7 +255,7 @@ void DockSecConfigView::focusOutEvent(QFocusEvent *ev)
const auto *focusWindow = qGuiApp->focusWindow();
if (focusWindow && (focusWindow->flags().testFlag(Qt::Popup)
|| focusWindow->flags().testFlag(Qt::ToolTip)) )
|| focusWindow->flags().testFlag(Qt::ToolTip)))
return;
const auto parent = qobject_cast<DockConfigView *>(m_parent);

3
app/dock/docksecconfigview.h
View File

@ -48,7 +48,8 @@ namespace Latte {
class DockCorona;
class DockView;
class DockSecConfigView : public QQuickView {
class DockSecConfigView : public QQuickView
{
Q_OBJECT
Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged)

2
app/dock/dockview.cpp
View File

@ -361,7 +361,7 @@ void DockView::setupWaylandIntegration()
if (DockCorona *c = qobject_cast<DockCorona *>(corona())) {
using namespace KWayland::Client;
PlasmaShell *interface{c->waylandDockCoronaInterface()};
PlasmaShell *interface {c->waylandDockCoronaInterface()};
if (!interface)
return;

3
app/dock/dockview.h
View File

@ -57,7 +57,8 @@ class Layout;
namespace Latte {
class DockView : public PlasmaQuick::ContainmentView {
class DockView : public PlasmaQuick::ContainmentView
{
Q_OBJECT
Q_PROPERTY(bool alternativesIsShown READ alternativesIsShown NOTIFY alternativesIsShownChanged)
Q_PROPERTY(bool behaveAsPlasmaPanel READ behaveAsPlasmaPanel WRITE setBehaveAsPlasmaPanel NOTIFY behaveAsPlasmaPanelChanged)

9
app/dock/panelshadows.cpp
View File

@ -40,7 +40,8 @@
#include <qdebug.h>
class PanelShadows::Private {
class PanelShadows::Private
{
public:
Private(PanelShadows *shadows)
: q(shadows)
@ -98,7 +99,8 @@ public:
bool m_isX11;
#endif
struct Wayland {
struct Wayland
{
KWayland::Client::ShadowManager *manager = nullptr;
KWayland::Client::ShmPool *shmPool = nullptr;
@ -110,7 +112,8 @@ public:
QHash<const QWindow *, Plasma::FrameSvg::EnabledBorders> m_windows;
};
class PanelShadowsSingleton {
class PanelShadowsSingleton
{
public:
PanelShadowsSingleton() {
}

3
app/dock/panelshadows_p.h
View File

@ -25,7 +25,8 @@
#include "plasma/svg.h"
class PanelShadows : public Plasma::Svg {
class PanelShadows : public Plasma::Svg
{
Q_OBJECT
public:

3
app/dock/screenedgeghostwindow.h
View File

@ -53,7 +53,8 @@ namespace Latte {
//! KDE BUGS: https://bugs.kde.org/show_bug.cgi?id=382219
//! https://bugs.kde.org/show_bug.cgi?id=392464
class ScreenEdgeGhostWindow : public QQuickView {
class ScreenEdgeGhostWindow : public QQuickView
{
Q_OBJECT
public:

3
app/dock/visibilitymanager.h
View File

@ -33,7 +33,8 @@ namespace Latte {
class VisibilityManagerPrivate;
class VisibilityManager : public QObject {
class VisibilityManager : public QObject
{
Q_OBJECT
Q_PROPERTY(Latte::Dock::Visibility mode READ mode WRITE setMode NOTIFY modeChanged)

3
app/dock/visibilitymanager_p.h
View File

@ -26,7 +26,8 @@ class ScreenEdgeGhostWindow;
/*!
* \brief The Latte::VisibilityManagerPrivate is a class d-pointer
*/
class VisibilityManagerPrivate : public QObject {
class VisibilityManagerPrivate : public QObject
{
Q_GADGET
public:

4
app/dockcorona.cpp
View File

@ -449,8 +449,8 @@ QRegion DockCorona::availableScreenRegionWithCriteria(int id, QString forLayout)
case Latte::Dock::Center:
case Latte::Dock::Justify:
realGeometry = QRect(qMax(view->geometry().x(), view->geometry().center().x() - realWidth / 2) , view->y(),
realWidth , realThickness);
realGeometry = QRect(qMax(view->geometry().x(), view->geometry().center().x() - realWidth / 2), view->y(),
realWidth, realThickness);
break;
case Latte::Dock::Right:

3
app/dockcorona.h
View File

@ -67,7 +67,8 @@ class LaunchersSignals;
namespace Latte {
class DockCorona : public Plasma::Corona {
class DockCorona : public Plasma::Corona
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.LatteDock")

3
app/globalshortcuts.h
View File

@ -34,7 +34,8 @@ class DockView;
namespace Latte {
class GlobalShortcuts : public QObject {
class GlobalShortcuts : public QObject
{
Q_OBJECT
public:

6
app/importer.h
View File

@ -31,11 +31,13 @@ namespace Latte {
//! This class is responsible to import/export configurations
//! and of course to import old configuration to new architecture
class Importer : public QObject {
class Importer : public QObject
{
Q_OBJECT
public:
enum LatteFileVersion {
enum LatteFileVersion
{
UnknownFileType = -1,
LayoutVersion1 = 0,
ConfigVersion1 = 1,

3
app/infoview.h
View File

@ -35,7 +35,8 @@ class PlasmaShellSurface;
namespace Latte {
class InfoView : public QQuickView {
class InfoView : public QQuickView
{
Q_OBJECT
Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged)

3
app/launcherssignals.h
View File

@ -42,7 +42,8 @@ namespace Latte {
//! crashes that occur by setting the launcherList of the tasksModel so
//! often. The plasma devs of libtaskmanager have designed the launchers
//! model to be initialized only once during startup
class LaunchersSignals : public QObject {
class LaunchersSignals : public QObject
{
Q_OBJECT
public:

3
app/layout.h
View File

@ -45,7 +45,8 @@ namespace Latte {
//! This class is responsible to hold the settings for a specific layout.
//! It also updates always the relevant layout configuration concerning
//! its general settings (no the containments)
class Layout : public QObject {
class Layout : public QObject
{
Q_OBJECT
Q_PROPERTY(bool showInMenu READ showInMenu WRITE setShowInMenu NOTIFY showInMenuChanged)
Q_PROPERTY(QString background READ background NOTIFY backgroundChanged)

3
app/layoutmanager.h
View File

@ -51,7 +51,8 @@ namespace Latte {
//! This class is responsible to manipulate all layouts.
//! add,remove,rename, update configurations etc.
class LayoutManager : public QObject {
class LayoutManager : public QObject
{
Q_OBJECT
Q_PROPERTY(QString currentLayoutName READ currentLayoutName NOTIFY currentLayoutNameChanged)

3
app/layoutsDelegates/activitycmbboxdelegate.h
View File

@ -31,7 +31,8 @@ class LayoutManager;
class SettingsDialog;
}
class ActivityCmbBoxDelegate : public QItemDelegate {
class ActivityCmbBoxDelegate : public QItemDelegate
{
Q_OBJECT
public:
ActivityCmbBoxDelegate(QObject *parent);

3
app/layoutsDelegates/checkboxdelegate.h
View File

@ -19,7 +19,8 @@
#include <QStyledItemDelegate>
class CheckBoxDelegate : public QStyledItemDelegate {
class CheckBoxDelegate : public QStyledItemDelegate
{
public:
CheckBoxDelegate(QObject *parent = 0);

3
app/layoutsDelegates/colorcmbboxdelegate.h
View File

@ -26,7 +26,8 @@ class QModelIndex;
class QWidget;
class QVariant;
class ColorCmbBoxDelegate : public QItemDelegate {
class ColorCmbBoxDelegate : public QItemDelegate
{
Q_OBJECT
public:
ColorCmbBoxDelegate(QObject *parent = 0, QString iconsPath = QString(), QStringList colors = QStringList());

3
app/layoutsDelegates/colorcmbboxitemdelegate.h
View File

@ -22,7 +22,8 @@
#include <QAbstractItemDelegate>
class ColorCmbBoxItemDelegate : public QAbstractItemDelegate {
class ColorCmbBoxItemDelegate : public QAbstractItemDelegate
{
Q_OBJECT
public:
ColorCmbBoxItemDelegate(QObject *parent = 0, QString iconsPath = QString());

4
app/layoutsDelegates/layoutnamedelegate.cpp
View File

@ -47,8 +47,8 @@ void LayoutNameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
QFontMetrics fm(option.font);
int textWidth = fm.width(nameText);
int thick = option.rect.height();
int startWidth = (qApp->layoutDirection() == Qt::RightToLeft) ? thick : qBound(0, option.rect.width() - textWidth - thick , thick);
int endWidth = (qApp->layoutDirection() == Qt::RightToLeft) ? qBound(0, option.rect.width() - textWidth - thick , thick) : thick;
int startWidth = (qApp->layoutDirection() == Qt::RightToLeft) ? thick : qBound(0, option.rect.width() - textWidth - thick, thick);
int endWidth = (qApp->layoutDirection() == Qt::RightToLeft) ? qBound(0, option.rect.width() - textWidth - thick, thick) : thick;
QRect destinationS(option.rect.x(), option.rect.y(), startWidth, thick);
QRect destinationE(option.rect.x() + option.rect.width() - thick, option.rect.y(), endWidth, thick);

3
app/layoutsDelegates/layoutnamedelegate.h
View File

@ -19,7 +19,8 @@
#include <QStyledItemDelegate>
class LayoutNameDelegate : public QStyledItemDelegate {
class LayoutNameDelegate : public QStyledItemDelegate
{
public:
LayoutNameDelegate(QObject *parent = 0);

5
app/packageplugins/shell/dockpackage.h
View File

@ -26,12 +26,13 @@
#include <KPackage/PackageStructure>
namespace Latte {
class DockPackage : public KPackage::PackageStructure {
class DockPackage : public KPackage::PackageStructure
{
Q_OBJECT
public:
explicit DockPackage(QObject *parent = 0, const QVariantList &args = QVariantList());
~DockPackage() override;
void initPackage(KPackage::Package *package) override;
void pathChanged(KPackage::Package *package) override;

3
app/plasmaquick/configview.h
View File

@ -43,7 +43,8 @@ class ConfigViewPrivate;
class ConfigModel;
class ConfigView : public QQuickView {
class ConfigView : public QQuickView
{
Q_OBJECT
Q_PROPERTY(PlasmaQuick::ConfigModel *configModel READ configModel CONSTANT)
Q_PROPERTY(QString appletGlobalShortcut READ appletGlobalShortcut WRITE setAppletGlobalShortcut NOTIFY appletGlobalShortcutChanged)

3
app/plasmaquick/containmentview.h
View File

@ -39,7 +39,8 @@ namespace PlasmaQuick {
class ContainmentViewPrivate;
class ContainmentView : public KQuickAddons::QuickViewSharedEngine {
class ContainmentView : public KQuickAddons::QuickViewSharedEngine
{
Q_OBJECT
Q_PROPERTY(Plasma::Types::Location location READ location WRITE setLocation NOTIFY locationChanged)
Q_PROPERTY(Plasma::Types::FormFactor formFactor READ formFactor NOTIFY formFactorChanged)

3
app/plasmaquick/view.h
View File

@ -39,7 +39,8 @@ namespace PlasmaQuick {
class ViewPrivate;
class View : public QQuickView {
class View : public QQuickView
{
Q_OBJECT
Q_PROPERTY(Plasma::Types::Location location READ location WRITE setLocation NOTIFY locationChanged)
Q_PROPERTY(Plasma::Types::FormFactor formFactor READ formFactor NOTIFY formFactorChanged)

3
app/screenpool.h
View File

@ -32,7 +32,8 @@
namespace Latte {
class ScreenPool : public QObject, public QAbstractNativeEventFilter {
class ScreenPool : public QObject, public QAbstractNativeEventFilter
{
Q_OBJECT
public:

2
app/settingsdialog.cpp
View File

@ -566,7 +566,7 @@ void SettingsDialog::on_exportButton_clicked()
m_corona->layoutManager()->syncActiveLayoutsToOriginalFiles();
QFileDialog *fileDialog = new QFileDialog(this, i18nc("export layout/configuration", "Export Layout/Configuration")
, QDir::homePath() , QStringLiteral("layout.latte"));
, QDir::homePath(), QStringLiteral("layout.latte"));
fileDialog->setFileMode(QFileDialog::AnyFile);
fileDialog->setAcceptMode(QFileDialog::AcceptSave);

3
app/settingsdialog.h
View File

@ -46,7 +46,8 @@ class Layout;
namespace Latte {
class SettingsDialog : public QDialog {
class SettingsDialog : public QDialog
{
Q_OBJECT
public:
SettingsDialog(QWidget *parent, DockCorona *corona);

3
app/sortedactivitiesmodel.cpp
View File

@ -44,7 +44,8 @@
namespace {
class BackgroundCache: public QObject {
class BackgroundCache: public QObject
{
public:
BackgroundCache()
: initialized(false)

3
app/sortedactivitiesmodel.h
View File

@ -32,7 +32,8 @@
typedef QHash<Plasma::Types::Location, float> EdgesHash;
class SortedActivitiesModel : public QSortFilterProxyModel {
class SortedActivitiesModel : public QSortFilterProxyModel
{
Q_OBJECT
Q_PROPERTY(bool inhibitUpdates READ inhibitUpdates WRITE setInhibitUpdates NOTIFY inhibitUpdatesChanged)

3
app/universalsettings.h
View File

@ -37,7 +37,8 @@ class LayoutManager;
//! This class holds all the settings that are universally available
//! independent of layouts
class UniversalSettings : public QObject {
class UniversalSettings : public QObject
{
Q_OBJECT
Q_PROPERTY(bool autostart READ autostart WRITE setAutostart NOTIFY autostartChanged)
Q_PROPERTY(bool showInfoWindow READ showInfoWindow WRITE setShowInfoWindow NOTIFY showInfoWindowChanged)

5
app/waylandinterface.cpp
View File

@ -41,7 +41,8 @@ using namespace KWayland::Client;
namespace Latte {
class Private::GhostWindow : public QRasterWindow {
class Private::GhostWindow : public QRasterWindow
{
Q_OBJECT
public:
@ -131,7 +132,7 @@ void WaylandInterface::setDockExtraFlags(QWindow &view)
Q_UNUSED(view)
}
void WaylandInterface::setDockStruts(QWindow &view, const QRect &rect , Plasma::Types::Location location)
void WaylandInterface::setDockStruts(QWindow &view, const QRect &rect, Plasma::Types::Location location)
{
if (!m_ghostWindows.contains(view.winId()))
m_ghostWindows[view.winId()] = new Private::GhostWindow(this);

3
app/waylandinterface.h
View File

@ -48,7 +48,8 @@ namespace Private {
class GhostWindow;
}
class WaylandInterface : public AbstractWindowInterface {
class WaylandInterface : public AbstractWindowInterface
{
Q_OBJECT
public:

3
app/windowinfowrap.h
View File

@ -29,7 +29,8 @@ namespace Latte {
using WindowId = QVariant;
class WindowInfoWrap {
class WindowInfoWrap
{
public:
WindowInfoWrap() noexcept

6
app/xwindowinterface.cpp
View File

@ -294,9 +294,9 @@ bool XWindowInterface::isOnCurrentActivity(WindowId wid) const
WindowInfoWrap XWindowInterface::requestInfo(WindowId wid) const
{
const KWindowInfo winfo{wid.value<WId>(), NET::WMFrameExtents
| NET::WMWindowType
| NET::WMGeometry
| NET::WMState};
| NET::WMWindowType
| NET::WMGeometry
| NET::WMState};
WindowInfoWrap winfoWrap;

3
app/xwindowinterface.h
View File

@ -31,7 +31,8 @@
namespace Latte {
class XWindowInterface : public AbstractWindowInterface {
class XWindowInterface : public AbstractWindowInterface
{
Q_OBJECT
public:

3
containmentactions/contextmenu/menu.h
View File

@ -27,7 +27,8 @@
class QAction;
class QMenu;
class Menu : public Plasma::ContainmentActions {
class Menu : public Plasma::ContainmentActions
{
Q_OBJECT
public:

42
liblattedock/dock.h
View File

@ -27,14 +27,16 @@
namespace Latte {
class Dock {
class Dock
{
Q_GADGET
public:
Dock() = delete;
~Dock() {}
enum Visibility {
enum Visibility
{
None = -1,
AlwaysVisible = 0,
AutoHide,
@ -45,7 +47,8 @@ public:
};
Q_ENUM(Visibility)
enum Alignment {
enum Alignment
{
Center = 0,
Left,
Right,
@ -55,13 +58,15 @@ public:
};
Q_ENUM(Alignment)
enum SessionType {
enum SessionType
{
DefaultSession = 0,
AlternativeSession
};
Q_ENUM(SessionType)
enum Modifier {
enum Modifier
{
Shift = 0,
Ctrl,
Alt,
@ -69,14 +74,16 @@ public:
};
Q_ENUM(Modifier)
enum ClickAction {
enum ClickAction
{
LeftClick = 0,
MiddleClick,
RightClick
};
Q_ENUM(ClickAction)
enum TaskAction {
enum TaskAction
{
NoneAction = 0,
Close,
NewInstance,
@ -86,46 +93,53 @@ public:
};
Q_ENUM(TaskAction)
enum ActiveAppletIndicator {
enum ActiveAppletIndicator
{
NoneIndicator = 0,
InternalsIndicator = 1,
AllIndicator = 2
};
Q_ENUM(ActiveAppletIndicator)
enum ActiveIndicatorType {
enum ActiveIndicatorType
{
LineIndicator = 0,
DotIndicator = 1
};
Q_ENUM(ActiveIndicatorType)
enum LaunchersGroup {
enum LaunchersGroup
{
UniqueLaunchers = 0,
LayoutLaunchers = 1,
GlobalLaunchers = 2
};
Q_ENUM(LaunchersGroup)
enum GlowGroup {
enum GlowGroup
{
GlowOnlyOnActive = 0,
GlowAll = 1
};
Q_ENUM(GlowGroup)
enum LayoutsMemoryUsage {
enum LayoutsMemoryUsage
{
SingleLayout = 0, /* a single Layout is loaded in each time */
MultipleLayouts /* multiple layouts are loaded on runtime,based on Activities and one central layout for the rest unassigned Activities */
};
Q_ENUM(LayoutsMemoryUsage)
enum MouseSensitivity {
enum MouseSensitivity
{
LowSensitivity = 0,
MediumSensitivity,
HighSensitivity
};
Q_ENUM(MouseSensitivity)
enum LatteConfigPage {
enum LatteConfigPage
{
LayoutPage = 0,
PreferencesPage
};

3
liblattedock/iconitem.h
View File

@ -34,7 +34,8 @@
// this file is based on PlasmaCore::IconItem class, thanks to KDE
namespace Latte {
class IconItem : public QQuickItem {
class IconItem : public QQuickItem
{
Q_OBJECT
/**

3
liblattedock/lattedockplugin.h
View File

@ -23,7 +23,8 @@
#include <QQmlExtensionPlugin>
class LatteDockPlugin : public QQmlExtensionPlugin {
class LatteDockPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

3
liblattedock/quickwindowsystem.h
View File

@ -31,7 +31,8 @@ namespace Latte {
* @brief The QuickWindowSystem class,
* is a tiny class that provide basic information of WindowSystem
*/
class QuickWindowSystem final : public QObject {
class QuickWindowSystem final : public QObject
{
Q_OBJECT
Q_PROPERTY(bool compositingActive READ compositingActive NOTIFY compositingChanged FINAL)