Skip to content

Commit 870e410

Browse files
committed
refactor(plasmoid): use internal enum
Simplifies the code.
1 parent 50fbf43 commit 870e410

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

plasma-integration/plasmoid/kdisplay_applet.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323
#include "kdisplay_applet.h"
2424

25-
#include "../osd/osdaction.h"
26-
2725
#include <QMetaEnum>
2826
#include <QQmlEngine> // for qmlRegisterType
2927

@@ -71,22 +69,17 @@ int KDisplayApplet::connectedOutputCount() const
7169
return m_connectedOutputCount;
7270
}
7371

74-
void KDisplayApplet::applyLayoutPreset(Action action)
72+
void KDisplayApplet::applyLayoutPreset(KDisplay::OsdAction::Action action)
7573
{
7674
auto const actionEnum = QMetaEnum::fromType<KDisplay::OsdAction::Action>();
7775
Q_ASSERT(actionEnum.isValid());
7876

79-
const QString presetName = QString::fromLatin1(actionEnum.valueToKey(action));
80-
if (presetName.isEmpty()) {
81-
return;
82-
}
83-
8477
QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kded6"),
8578
QStringLiteral("/modules/kdisplay"),
8679
QStringLiteral("org.kwinft.kdisplay"),
8780
QStringLiteral("applyLayoutPreset"));
8881

89-
msg.setArguments({presetName});
82+
msg.setArguments({QString::fromLatin1(actionEnum.valueToKey(action))});
9083

9184
QDBusConnection::sessionBus().call(msg, QDBus::NoBlock);
9285
}

plasma-integration/plasmoid/kdisplay_applet.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
*/
2323
#pragma once
2424

25-
#include <Plasma/Applet>
25+
#include "../osd/osdaction.h"
2626

27+
#include <Plasma/Applet>
2728
#include <disman/types.h>
2829

2930
class KDisplayApplet : public Plasma::Applet
@@ -40,14 +41,11 @@ class KDisplayApplet : public Plasma::Applet
4041
explicit KDisplayApplet(QObject* parent, const KPluginMetaData& data, const QVariantList& args);
4142
~KDisplayApplet() override;
4243

43-
enum Action { SwitchToExternal, SwitchToInternal, Clone, ExtendLeft, ExtendRight };
44-
Q_ENUM(Action)
45-
4644
void init() override;
4745

4846
int connectedOutputCount() const;
4947

50-
Q_INVOKABLE void applyLayoutPreset(Action action);
48+
Q_INVOKABLE void applyLayoutPreset(KDisplay::OsdAction::Action action);
5149

5250
Q_SIGNALS:
5351
void connectedOutputCountChanged();

0 commit comments

Comments
 (0)