yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Hardcode kwin name

Browse source 
We use KWIN_NAME, KWIN_INTERNAL_NAME_X11 and KWIN_INTERNAL_WAYLAND
properly only in a few places. In other, we use hardcoded names.

Let's not bother and hardcode kwin names everywhere rather than have one
foot in and one foot out, it's simpler.
This commit is contained in:
Vlad Zahorodnii 2022-11-01 19:46:03 +02:00
parent 1801421080
commit a235cd6d26
27 changed files with 38 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -383,11 +383,6 @@ option(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON)
cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KF5Activities_FOUND" OFF) cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KF5Activities_FOUND" OFF)
cmake_dependent_option(KWIN_BUILD_RUNNERS "Enable building of KWin with krunner support" ON "KF5Runner_FOUND" OFF) cmake_dependent_option(KWIN_BUILD_RUNNERS "Enable building of KWin with krunner support" ON "KF5Runner_FOUND" OFF)
# Binary name of KWin
set(KWIN_NAME "kwin")
set(KWIN_INTERNAL_NAME_X11 "kwin_x11")
set(KWIN_INTERNAL_NAME_WAYLAND "kwin_wayland")
set(HAVE_EPOXY_GLX ${epoxy_HAS_GLX}) set(HAVE_EPOXY_GLX ${epoxy_HAS_GLX})
# for kwin internal things # for kwin internal things

10
autotests/integration/globalshortcuts_test.cpp
View file

@ -138,7 +138,7 @@ void GlobalShortcutsTest::testNonLatinLayout()
const QKeySequence seq(qtModifier + qtKey); const QKeySequence seq(qtModifier + qtKey);
std::unique_ptr<QAction> action(new QAction(nullptr)); std::unique_ptr<QAction> action(new QAction(nullptr));
action->setProperty("componentName", QStringLiteral(KWIN_NAME)); action->setProperty("componentName", QStringLiteral("kwin"));
action->setObjectName("globalshortcuts-test-non-latin-layout"); action->setObjectName("globalshortcuts-test-non-latin-layout");
QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QSignalSpy triggeredSpy(action.get(), &QAction::triggered);
@ -162,7 +162,7 @@ void GlobalShortcutsTest::testConsumedShift()
// this test verifies that a shortcut with a consumed shift modifier triggers // this test verifies that a shortcut with a consumed shift modifier triggers
// create the action // create the action
std::unique_ptr<QAction> action(new QAction(nullptr)); std::unique_ptr<QAction> action(new QAction(nullptr));
action->setProperty("componentName", QStringLiteral(KWIN_NAME)); action->setProperty("componentName", QStringLiteral("kwin"));
action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift")); action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift"));
QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QSignalSpy triggeredSpy(action.get(), &QAction::triggered);
KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::Key_Percent}, KGlobalAccel::NoAutoloading); KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::Key_Percent}, KGlobalAccel::NoAutoloading);
@ -185,7 +185,7 @@ void GlobalShortcutsTest::testRepeatedTrigger()
// in addition pressing another key should stop triggering the shortcut // in addition pressing another key should stop triggering the shortcut
std::unique_ptr<QAction> action(new QAction(nullptr)); std::unique_ptr<QAction> action(new QAction(nullptr));
action->setProperty("componentName", QStringLiteral(KWIN_NAME)); action->setProperty("componentName", QStringLiteral("kwin"));
action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift")); action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift"));
QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QSignalSpy triggeredSpy(action.get(), &QAction::triggered);
KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::Key_Percent}, KGlobalAccel::NoAutoloading); KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::Key_Percent}, KGlobalAccel::NoAutoloading);
@ -244,7 +244,7 @@ void GlobalShortcutsTest::testMetaShiftW()
{ {
// BUG 370341 // BUG 370341
std::unique_ptr<QAction> action(new QAction(nullptr)); std::unique_ptr<QAction> action(new QAction(nullptr));
action->setProperty("componentName", QStringLiteral(KWIN_NAME)); action->setProperty("componentName", QStringLiteral("kwin"));
action->setObjectName(QStringLiteral("globalshortcuts-test-meta-shift-w")); action->setObjectName(QStringLiteral("globalshortcuts-test-meta-shift-w"));
QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QSignalSpy triggeredSpy(action.get(), &QAction::triggered);
KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::META | Qt::SHIFT | Qt::Key_W}, KGlobalAccel::NoAutoloading); KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::META | Qt::SHIFT | Qt::Key_W}, KGlobalAccel::NoAutoloading);
@ -268,7 +268,7 @@ void GlobalShortcutsTest::testComponseKey()
{ {
// BUG 390110 // BUG 390110
std::unique_ptr<QAction> action(new QAction(nullptr)); std::unique_ptr<QAction> action(new QAction(nullptr));
action->setProperty("componentName", QStringLiteral(KWIN_NAME)); action->setProperty("componentName", QStringLiteral("kwin"));
action->setObjectName(QStringLiteral("globalshortcuts-accent")); action->setObjectName(QStringLiteral("globalshortcuts-accent"));
QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QSignalSpy triggeredSpy(action.get(), &QAction::triggered);
KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::NoModifier}, KGlobalAccel::NoAutoloading); KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::NoModifier}, KGlobalAccel::NoAutoloading);

2
autotests/integration/lockscreen.cpp
View file

@ -679,7 +679,7 @@ void LockScreenTest::testKeyboardShortcut()
using namespace KWayland::Client; using namespace KWayland::Client;
std::unique_ptr<QAction> action(new QAction(nullptr)); std::unique_ptr<QAction> action(new QAction(nullptr));
QSignalSpy actionSpy(action.get(), &QAction::triggered); QSignalSpy actionSpy(action.get(), &QAction::triggered);
action->setProperty("componentName", QStringLiteral(KWIN_NAME)); action->setProperty("componentName", QStringLiteral("kwin"));
action->setObjectName("LockScreenTest::testKeyboardShortcut"); action->setObjectName("LockScreenTest::testKeyboardShortcut");
KGlobalAccel::self()->setDefaultShortcut(action.get(), QList<QKeySequence>{Qt::CTRL | Qt::META | Qt::ALT | Qt::Key_Space}); KGlobalAccel::self()->setDefaultShortcut(action.get(), QList<QKeySequence>{Qt::CTRL | Qt::META | Qt::ALT | Qt::Key_Space});
KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::CTRL | Qt::META | Qt::ALT | Qt::Key_Space}, KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::CTRL | Qt::META | Qt::ALT | Qt::Key_Space},

2
autotests/integration/no_global_shortcuts_test.cpp
View file

@ -171,7 +171,7 @@ void NoGlobalShortcutsTest::testTrigger()
void NoGlobalShortcutsTest::testKGlobalAccel() void NoGlobalShortcutsTest::testKGlobalAccel()
{ {
std::unique_ptr<QAction> action(new QAction(nullptr)); std::unique_ptr<QAction> action(new QAction(nullptr));
action->setProperty("componentName", QStringLiteral(KWIN_NAME)); action->setProperty("componentName", QStringLiteral("kwin"));
action->setObjectName(QStringLiteral("globalshortcuts-test-meta-shift-w")); action->setObjectName(QStringLiteral("globalshortcuts-test-meta-shift-w"));
QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QSignalSpy triggeredSpy(action.get(), &QAction::triggered);
KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::META | Qt::SHIFT | Qt::Key_W}, KGlobalAccel::NoAutoloading); KGlobalAccel::self()->setShortcut(action.get(), QList<QKeySequence>{Qt::META | Qt::SHIFT | Qt::Key_W}, KGlobalAccel::NoAutoloading);

4
src/CMakeLists.txt
View file

@ -339,9 +339,9 @@ if (PipeWire_FOUND)
target_link_libraries(kwin_wayland KWinScreencastPlugin) target_link_libraries(kwin_wayland KWinScreencastPlugin)
endif() endif()
install(FILES kwin.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} RENAME ${KWIN_NAME}.kcfg) install(FILES kwin.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
if (KWIN_BUILD_NOTIFICATIONS) if (KWIN_BUILD_NOTIFICATIONS)
install(FILES kwin.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR} RENAME ${KWIN_NAME}.notifyrc) install(FILES kwin.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
endif() endif()
install( install(
FILES FILES

4
src/config-kwin.h.cmake
View file

@ -6,9 +6,7 @@
#cmakedefine01 KWIN_BUILD_SCREENLOCKER #cmakedefine01 KWIN_BUILD_SCREENLOCKER
#cmakedefine01 KWIN_BUILD_TABBOX #cmakedefine01 KWIN_BUILD_TABBOX
#cmakedefine01 KWIN_BUILD_ACTIVITIES #cmakedefine01 KWIN_BUILD_ACTIVITIES
#define KWIN_NAME "${KWIN_NAME}" #define KWIN_CONFIG "kwinrc"
#define KWIN_INTERNAL_NAME_X11 "${KWIN_INTERNAL_NAME_X11}"
#define KWIN_CONFIG "${KWIN_NAME}rc"
#define KWIN_VERSION_STRING "${PROJECT_VERSION}" #define KWIN_VERSION_STRING "${PROJECT_VERSION}"
#define XCB_VERSION_STRING "${XCB_VERSION}" #define XCB_VERSION_STRING "${XCB_VERSION}"
#define KWIN_KILLER_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kwin_killer_helper" #define KWIN_KILLER_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kwin_killer_helper"

2
src/effects.cpp
View file

@ -2332,7 +2332,7 @@ EffectFrameQuickScene::EffectFrameQuickScene(EffectFrameStyle style, bool static
break; break;
} }
const QString defaultPath = QStringLiteral(KWIN_NAME "/frames/plasma/frame_%1.qml").arg(name); const QString defaultPath = QStringLiteral("kwin/frames/plasma/frame_%1.qml").arg(name);
// TODO read from kwinApp()->config() "QmlPath" like Outline/OnScreenNotification // TODO read from kwinApp()->config() "QmlPath" like Outline/OnScreenNotification
// *if* someone really needs this to be configurable. // *if* someone really needs this to be configurable.
const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, defaultPath); const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, defaultPath);

2
src/effects/CMakeLists.txt
View file

@ -34,7 +34,7 @@ macro(KWIN4_ADD_EFFECT_MODULE name)
kcoreaddons_add_plugin(${name} STATIC SOURCES ${ARGN} INSTALL_NAMESPACE "kwin/effects/plugins") kcoreaddons_add_plugin(${name} STATIC SOURCES ${ARGN} INSTALL_NAMESPACE "kwin/effects/plugins")
set_property(TARGET ${name} PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET ${name} PROPERTY POSITION_INDEPENDENT_CODE ON)
kwin_strip_builtin_effect_metadata(${name} metadata.json) kwin_strip_builtin_effect_metadata(${name} metadata.json)
install(FILES metadata.json DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/builtin-effects/${name}/) install(FILES metadata.json DESTINATION ${KDE_INSTALL_DATADIR}/kwin/builtin-effects/${name}/)
endmacro() endmacro()
# Install the KWin/Effect service type # Install the KWin/Effect service type

2
src/input.cpp
View file

@ -1960,7 +1960,7 @@ public:
connect(input(), &InputRedirection::deviceRemoved, this, &TabletInputFilter::removeDevice); connect(input(), &InputRedirection::deviceRemoved, this, &TabletInputFilter::removeDevice);
auto tabletNextOutput = new QAction(this); auto tabletNextOutput = new QAction(this);
tabletNextOutput->setProperty("componentName", QStringLiteral(KWIN_NAME)); tabletNextOutput->setProperty("componentName", QStringLiteral("kwin"));
tabletNextOutput->setText(i18n("Move the tablet to the next output")); tabletNextOutput->setText(i18n("Move the tablet to the next output"));
tabletNextOutput->setObjectName(QStringLiteral("Move Tablet to Next Output")); tabletNextOutput->setObjectName(QStringLiteral("Move Tablet to Next Output"));
KGlobalAccel::setGlobalShortcut(tabletNextOutput, QList<QKeySequence>()); KGlobalAccel::setGlobalShortcut(tabletNextOutput, QList<QKeySequence>());

2
src/libkwineffects/CMakeLists.txt
View file

@ -40,7 +40,6 @@ set_target_properties(kwineffects PROPERTIES
VERSION ${KWINEFFECTS_VERSION} VERSION ${KWINEFFECTS_VERSION}
SOVERSION ${KWINEFFECTS_SOVERSION} SOVERSION ${KWINEFFECTS_SOVERSION}
) )
set_target_properties(kwineffects PROPERTIES OUTPUT_NAME ${KWIN_NAME}effects)
install(TARGETS kwineffects EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kwineffects EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
@ -60,7 +59,6 @@ target_link_libraries(kwinglutils PUBLIC XCB::XCB KF5::CoreAddons KF5::ConfigCor
set_target_properties(kwinglutils PROPERTIES set_target_properties(kwinglutils PROPERTIES
VERSION ${KWINEFFECTS_VERSION} VERSION ${KWINEFFECTS_VERSION}
SOVERSION ${KWINEFFECTS_SOVERSION} SOVERSION ${KWINEFFECTS_SOVERSION}
OUTPUT_NAME ${KWIN_NAME}glutils
) )
install(TARGETS kwinglutils EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kwinglutils EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

2
src/main.cpp
View file

@ -170,7 +170,7 @@ bool Application::wasCrash()
void Application::createAboutData() void Application::createAboutData()
{ {
KAboutData aboutData(QStringLiteral(KWIN_NAME), // The program name used internally KAboutData aboutData(QStringLiteral("kwin"), // The program name used internally
i18n("KWin"), // A displayable program name string i18n("KWin"), // A displayable program name string
QStringLiteral(KWIN_VERSION_STRING), // The program version string QStringLiteral(KWIN_VERSION_STRING), // The program version string
i18n("KDE window manager"), // Short description of what the app does i18n("KDE window manager"), // Short description of what the app does

4
src/main_x11.cpp
View file

@ -74,7 +74,7 @@ public:
addWM(QStringLiteral("metacity")); addWM(QStringLiteral("metacity"));
addWM(QStringLiteral("openbox")); addWM(QStringLiteral("openbox"));
addWM(QStringLiteral("fvwm2")); addWM(QStringLiteral("fvwm2"));
addWM(QStringLiteral(KWIN_INTERNAL_NAME_X11)); addWM(QStringLiteral("kwin_x11"));
QVBoxLayout *mainLayout = new QVBoxLayout(this); QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->addWidget(mainWidget); mainLayout->addWidget(mainWidget);
@ -283,7 +283,7 @@ void ApplicationX11::crashChecking()
if (crashes >= 4) { if (crashes >= 4) {
// Something has gone seriously wrong // Something has gone seriously wrong
AlternativeWMDialog dialog; AlternativeWMDialog dialog;
QString cmd = QStringLiteral(KWIN_INTERNAL_NAME_X11); QString cmd = QStringLiteral("kwin_x11");
if (dialog.exec() == QDialog::Accepted) { if (dialog.exec() == QDialog::Accepted) {
cmd = dialog.selectedWM(); cmd = dialog.selectedWM();
} else { } else {

2
src/onscreennotification.cpp
View file

@ -173,7 +173,7 @@ void OnScreenNotification::ensureQmlComponent()
} }
m_qmlComponent.reset(new QQmlComponent(m_qmlEngine)); m_qmlComponent.reset(new QQmlComponent(m_qmlEngine));
const QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation, const QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
m_config->group(QStringLiteral("OnScreenNotification")).readEntry("QmlPath", QStringLiteral(KWIN_NAME "/onscreennotification/plasma/main.qml"))); m_config->group(QStringLiteral("OnScreenNotification")).readEntry("QmlPath", QStringLiteral("kwin/onscreennotification/plasma/main.qml")));
if (fileName.isEmpty()) { if (fileName.isEmpty()) {
return; return;
} }

2
src/outline.cpp
View file

@ -169,7 +169,7 @@ void CompositedOutlineVisual::show()
if (!m_qmlComponent) { if (!m_qmlComponent) {
m_qmlComponent = std::make_unique<QQmlComponent>(Scripting::self()->qmlEngine()); m_qmlComponent = std::make_unique<QQmlComponent>(Scripting::self()->qmlEngine());
const QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation, const QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
kwinApp()->config()->group(QStringLiteral("Outline")).readEntry("QmlPath", QStringLiteral(KWIN_NAME "/outline/plasma/outline.qml"))); kwinApp()->config()->group(QStringLiteral("Outline")).readEntry("QmlPath", QStringLiteral("kwin/outline/plasma/outline.qml")));
if (fileName.isEmpty()) { if (fileName.isEmpty()) {
qCDebug(KWIN_CORE) << "Could not locate outline.qml"; qCDebug(KWIN_CORE) << "Could not locate outline.qml";
return; return;

2
src/plugins/kdecorations/aurorae/src/aurorae.cpp
View file

@ -105,7 +105,7 @@ void Helper::unref()
} }
static const QString s_defaultTheme = QStringLiteral("kwin4_decoration_qml_plastik"); static const QString s_defaultTheme = QStringLiteral("kwin4_decoration_qml_plastik");
static const QString s_qmlPackageFolder = QStringLiteral(KWIN_NAME "/decorations/"); static const QString s_qmlPackageFolder = QStringLiteral("kwin/decorations/");
/* /*
* KDecoration2::BorderSize doesn't map to the indices used for the Aurorae SVG Button Sizes. * KDecoration2::BorderSize doesn't map to the indices used for the Aurorae SVG Button Sizes.
* BorderSize defines None and NoSideBorder as index 0 and 1. These do not make sense for Button * BorderSize defines None and NoSideBorder as index 0 and 1. These do not make sense for Button

2
src/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_subdirectory(code) add_subdirectory(code)
install(DIRECTORY package/ install(DIRECTORY package/
DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/decorations/kwin4_decoration_qml_plastik) DESTINATION ${KDE_INSTALL_DATADIR}/kwin/decorations/kwin4_decoration_qml_plastik)
file(COPY package/ DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/decorations/kwin4_decoration_qml_plastik) file(COPY package/ DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/decorations/kwin4_decoration_qml_plastik)

2
src/plugins/nightcolor/CMakeLists.txt
View file

@ -27,6 +27,6 @@ endif()
target_link_libraries(KWinNightColorPlugin kwin) target_link_libraries(KWinNightColorPlugin kwin)
install(FILES nightcolorsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} RENAME ${KWIN_NAME}_colorcorrect.kcfg) install(FILES nightcolorsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(FILES org.kde.kwin.ColorCorrect.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) install(FILES org.kde.kwin.ColorCorrect.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
install(TARGETS KWinNightColorPlugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/) install(TARGETS KWinNightColorPlugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/)

4
src/plugins/nightcolor/nightcolormanager.cpp
View file

@ -87,13 +87,13 @@ NightColorManager::NightColorManager()
// legacy shortcut with localized key (to avoid breaking existing config) // legacy shortcut with localized key (to avoid breaking existing config)
if (i18n("Toggle Night Color") != QStringLiteral("Toggle Night Color")) { if (i18n("Toggle Night Color") != QStringLiteral("Toggle Night Color")) {
QAction toggleActionLegacy; QAction toggleActionLegacy;
toggleActionLegacy.setProperty("componentName", QStringLiteral(KWIN_NAME)); toggleActionLegacy.setProperty("componentName", QStringLiteral("kwin"));
toggleActionLegacy.setObjectName(i18n("Toggle Night Color")); toggleActionLegacy.setObjectName(i18n("Toggle Night Color"));
KGlobalAccel::self()->removeAllShortcuts(&toggleActionLegacy); KGlobalAccel::self()->removeAllShortcuts(&toggleActionLegacy);
} }
QAction *toggleAction = new QAction(this); QAction *toggleAction = new QAction(this);
toggleAction->setProperty("componentName", QStringLiteral(KWIN_NAME)); toggleAction->setProperty("componentName", QStringLiteral("kwin"));
toggleAction->setObjectName(QStringLiteral("Toggle Night Color")); toggleAction->setObjectName(QStringLiteral("Toggle Night Color"));
toggleAction->setText(i18n("Toggle Night Color")); toggleAction->setText(i18n("Toggle Night Color"));
KGlobalAccel::setGlobalShortcut(toggleAction, QList<QKeySequence>()); KGlobalAccel::setGlobalShortcut(toggleAction, QList<QKeySequence>());

6
src/qml/CMakeLists.txt
View file

@ -1,3 +1,3 @@
install(DIRECTORY outline/plasma DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/outline) install(DIRECTORY outline/plasma DESTINATION ${KDE_INSTALL_DATADIR}/kwin/outline)
install(DIRECTORY onscreennotification/plasma DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/onscreennotification) install(DIRECTORY onscreennotification/plasma DESTINATION ${KDE_INSTALL_DATADIR}/kwin/onscreennotification)
install(DIRECTORY frames/plasma DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/frames) install(DIRECTORY frames/plasma DESTINATION ${KDE_INSTALL_DATADIR}/kwin/frames)

2
src/rules.cpp
View file

@ -970,7 +970,7 @@ void RuleBook::load()
{ {
deleteAll(); deleteAll();
if (!m_config) { if (!m_config) {
m_config = KSharedConfig::openConfig(QStringLiteral(KWIN_NAME "rulesrc"), KConfig::NoGlobals); m_config = KSharedConfig::openConfig(QStringLiteral("kwinrulesrc"), KConfig::NoGlobals);
} else { } else {
m_config->reparseConfiguration(); m_config->reparseConfiguration();
} }

2
src/scripting/genericscriptedconfig.cpp
View file

@ -64,7 +64,7 @@ void GenericScriptedConfig::createUi()
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
const QString packageRoot = QStandardPaths::locate(QStandardPaths::GenericDataLocation, const QString packageRoot = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
QLatin1String(KWIN_NAME) + QLatin1Char('/') + typeName() + QLatin1Char('/') + m_packageName, QLatin1String("kwin/") + typeName() + QLatin1Char('/') + m_packageName,
QStandardPaths::LocateDirectory); QStandardPaths::LocateDirectory);
if (packageRoot.isEmpty()) { if (packageRoot.isEmpty()) {
layout->addWidget(new QLabel(i18nc("Error message", "Could not locate package metadata"))); layout->addWidget(new QLabel(i18nc("Error message", "Could not locate package metadata")));

6
src/scripting/scriptedeffect.cpp
View file

@ -162,7 +162,7 @@ ScriptedEffect *ScriptedEffect::create(const KPluginMetaData &effect)
return nullptr; return nullptr;
} }
const QString scriptFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, const QString scriptFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
QLatin1String(KWIN_NAME "/effects/") + name + QLatin1String("/contents/") + scriptName); QLatin1String("kwin/effects/") + name + QLatin1String("/contents/") + scriptName);
if (scriptFile.isNull()) { if (scriptFile.isNull()) {
qCDebug(KWIN_SCRIPTING) << "Could not locate the effect script"; qCDebug(KWIN_SCRIPTING) << "Could not locate the effect script";
return nullptr; return nullptr;
@ -225,7 +225,7 @@ bool ScriptedEffect::init(const QString &effectName, const QString &pathToScript
m_scriptFile = pathToScript; m_scriptFile = pathToScript;
// does the effect contain an KConfigXT file? // does the effect contain an KConfigXT file?
const QString kconfigXTFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String(KWIN_NAME "/effects/") + m_effectName + QLatin1String("/contents/config/main.xml")); const QString kconfigXTFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("kwin/effects/") + m_effectName + QLatin1String("/contents/config/main.xml"));
if (!kconfigXTFile.isNull()) { if (!kconfigXTFile.isNull()) {
KConfigGroup cg = QCoreApplication::instance()->property("config").value<KSharedConfigPtr>()->group(QStringLiteral("Effect-%1").arg(m_effectName)); KConfigGroup cg = QCoreApplication::instance()->property("config").value<KSharedConfigPtr>()->group(QStringLiteral("Effect-%1").arg(m_effectName));
QFile xmlFile(kconfigXTFile); QFile xmlFile(kconfigXTFile);
@ -802,7 +802,7 @@ uint ScriptedEffect::addFragmentShader(ShaderTrait traits, const QString &fragme
m_engine->throwError(QStringLiteral("Failed to make OpenGL context current")); m_engine->throwError(QStringLiteral("Failed to make OpenGL context current"));
return 0; return 0;
} }
const QString shaderDir{QLatin1String(KWIN_NAME "/effects/") + m_effectName + QLatin1String("/contents/shaders/")}; const QString shaderDir{QLatin1String("kwin/effects/") + m_effectName + QLatin1String("/contents/shaders/")};
const QString fragment = fragmentShaderFile.isEmpty() ? QString{} : QStandardPaths::locate(QStandardPaths::GenericDataLocation, shaderDir + fragmentShaderFile); const QString fragment = fragmentShaderFile.isEmpty() ? QString{} : QStandardPaths::locate(QStandardPaths::GenericDataLocation, shaderDir + fragmentShaderFile);
auto shader = ShaderManager::instance()->generateShaderFromFile(static_cast<KWin::ShaderTraits>(int(traits)), {}, fragment); auto shader = ShaderManager::instance()->generateShaderFromFile(static_cast<KWin::ShaderTraits>(int(traits)), {}, fragment);

2
src/scripting/scripting.cpp
View file

@ -748,7 +748,7 @@ LoadScriptList KWin::Scripting::queryScriptsToLoad()
s_started = true; s_started = true;
} }
QMap<QString, QString> pluginStates = KConfigGroup(_config, "Plugins").entryMap(); QMap<QString, QString> pluginStates = KConfigGroup(_config, "Plugins").entryMap();
const QString scriptFolder = QStringLiteral(KWIN_NAME "/scripts/"); const QString scriptFolder = QStringLiteral("kwin/scripts/");
const auto offers = KPackage::PackageLoader::self()->listPackages(QStringLiteral("KWin/Script"), scriptFolder); const auto offers = KPackage::PackageLoader::self()->listPackages(QStringLiteral("KWin/Script"), scriptFolder);
LoadScriptList scriptsToLoad; LoadScriptList scriptsToLoad;

2
src/tabbox/tabbox.cpp
View file

@ -509,7 +509,7 @@ template<typename Slot>
void TabBox::key(const KLazyLocalizedString &actionName, Slot slot, const QKeySequence &shortcut) void TabBox::key(const KLazyLocalizedString &actionName, Slot slot, const QKeySequence &shortcut)
{ {
QAction *a = new QAction(this); QAction *a = new QAction(this);
a->setProperty("componentName", QStringLiteral(KWIN_NAME)); a->setProperty("componentName", QStringLiteral("kwin"));
a->setObjectName(QString::fromUtf8(actionName.untranslatedText())); a->setObjectName(QString::fromUtf8(actionName.untranslatedText()));
a->setText(actionName.toString()); a->setText(actionName.toString());
KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << shortcut); KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << shortcut);

2
src/tabbox/tabboxhandler.cpp
View file

@ -244,7 +244,7 @@ QObject *TabBoxHandlerPrivate::createSwitcherItem(bool desktopMode)
.arg(config.layoutName(), .arg(config.layoutName(),
desktopMode ? QStringLiteral("desktopswitcher/DesktopSwitcher.qml") : QStringLiteral("windowswitcher/WindowSwitcher.qml"))); desktopMode ? QStringLiteral("desktopswitcher/DesktopSwitcher.qml") : QStringLiteral("windowswitcher/WindowSwitcher.qml")));
if (file.isNull()) { if (file.isNull()) {
const QString folderName = QLatin1String(KWIN_NAME) + (desktopMode ? QLatin1String("/desktoptabbox/") : QLatin1String("/tabbox/")); const QString folderName = desktopMode ? QLatin1String("kwin/desktoptabbox/") : QLatin1String("kwin/tabbox/");
auto findSwitcher = [this, desktopMode, folderName] { auto findSwitcher = [this, desktopMode, folderName] {
const QString type = desktopMode ? QStringLiteral("KWin/DesktopSwitcher") : QStringLiteral("KWin/WindowSwitcher"); const QString type = desktopMode ? QStringLiteral("KWin/DesktopSwitcher") : QStringLiteral("KWin/WindowSwitcher");
auto offers = KPackage::PackageLoader::self()->findPackages(type, folderName, auto offers = KPackage::PackageLoader::self()->findPackages(type, folderName,

4
src/useractions.cpp
View file

@ -963,7 +963,7 @@ template<typename T, typename Slot>
void Workspace::initShortcut(const QString &actionName, const QString &description, const QKeySequence &shortcut, T *receiver, Slot slot) void Workspace::initShortcut(const QString &actionName, const QString &description, const QKeySequence &shortcut, T *receiver, Slot slot)
{ {
QAction *a = new QAction(this); QAction *a = new QAction(this);
a->setProperty("componentName", QStringLiteral(KWIN_NAME)); a->setProperty("componentName", QStringLiteral("kwin"));
a->setObjectName(actionName); a->setObjectName(actionName);
a->setText(description); a->setText(description);
KGlobalAccel::self()->setDefaultShortcut(a, QList<QKeySequence>() << shortcut); KGlobalAccel::self()->setDefaultShortcut(a, QList<QKeySequence>() << shortcut);
@ -1178,7 +1178,7 @@ void Workspace::windowShortcutUpdated(Window *window)
if (!window->shortcut().isEmpty()) { if (!window->shortcut().isEmpty()) {
if (action == nullptr) { // new shortcut if (action == nullptr) { // new shortcut
action = new QAction(this); action = new QAction(this);
action->setProperty("componentName", QStringLiteral(KWIN_NAME)); action->setProperty("componentName", QStringLiteral("kwin"));
action->setObjectName(key); action->setObjectName(key);
action->setText(i18n("Activate Window (%1)", window->caption())); action->setText(i18n("Activate Window (%1)", window->caption()));
connect(action, &QAction::triggered, window, std::bind(&Workspace::activateWindow, this, window, true)); connect(action, &QAction::triggered, window, std::bind(&Workspace::activateWindow, this, window, true));

4
src/virtualdesktops.cpp
View file

@ -905,7 +905,7 @@ void VirtualDesktopManager::initSwitchToShortcuts()
QAction *VirtualDesktopManager::addAction(const QString &name, const KLocalizedString &label, uint value, const QKeySequence &key, void (VirtualDesktopManager::*slot)()) QAction *VirtualDesktopManager::addAction(const QString &name, const KLocalizedString &label, uint value, const QKeySequence &key, void (VirtualDesktopManager::*slot)())
{ {
QAction *a = new QAction(this); QAction *a = new QAction(this);
a->setProperty("componentName", QStringLiteral(KWIN_NAME)); a->setProperty("componentName", QStringLiteral("kwin"));
a->setObjectName(name.arg(value)); a->setObjectName(name.arg(value));
a->setText(label.subs(value).toString()); a->setText(label.subs(value).toString());
a->setData(value); a->setData(value);
@ -917,7 +917,7 @@ QAction *VirtualDesktopManager::addAction(const QString &name, const KLocalizedS
QAction *VirtualDesktopManager::addAction(const QString &name, const QString &label, void (VirtualDesktopManager::*slot)()) QAction *VirtualDesktopManager::addAction(const QString &name, const QString &label, void (VirtualDesktopManager::*slot)())
{ {
QAction *a = new QAction(this); QAction *a = new QAction(this);
a->setProperty("componentName", QStringLiteral(KWIN_NAME)); a->setProperty("componentName", QStringLiteral("kwin"));
a->setObjectName(name); a->setObjectName(name);
a->setText(label); a->setText(label);
KGlobalAccel::setGlobalShortcut(a, QKeySequence()); KGlobalAccel::setGlobalShortcut(a, QKeySequence());