From 39154ad2d6b72b2e77d7d9f5a3f3ed074f19f527 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Tue, 17 Mar 2020 07:48:05 +0200 Subject: [PATCH] Fix minor typo: inital -> initial Summary: inital -> initial Test Plan: none Reviewers: #kwin, zzag Reviewed By: #kwin, zzag Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D28092 --- autotests/integration/no_global_shortcuts_test.cpp | 2 +- main_wayland.cpp | 8 ++++---- rulesettings.kcfg | 4 ++-- wayland_server.cpp | 8 ++++---- wayland_server.h | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/autotests/integration/no_global_shortcuts_test.cpp b/autotests/integration/no_global_shortcuts_test.cpp index 8515ce749..7524dc2d0 100644 --- a/autotests/integration/no_global_shortcuts_test.cpp +++ b/autotests/integration/no_global_shortcuts_test.cpp @@ -103,7 +103,7 @@ void NoGlobalShortcutsTest::initTestCase() QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated); QVERIFY(workspaceCreatedSpy.isValid()); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); - QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit(), KWin::WaylandServer::InitalizationFlag::NoGlobalShortcuts)); + QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit(), KWin::WaylandServer::InitializationFlag::NoGlobalShortcuts)); kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); qputenv("KWIN_XKB_DEFAULT_KEYMAP", "1"); diff --git a/main_wayland.cpp b/main_wayland.cpp index bef6438cc..ea08a6b60 100644 --- a/main_wayland.cpp +++ b/main_wayland.cpp @@ -637,14 +637,14 @@ int main(int argc, char * argv[]) // TODO: create backend without having the server running KWin::WaylandServer *server = KWin::WaylandServer::create(&a); - KWin::WaylandServer::InitalizationFlags flags; + KWin::WaylandServer::InitializationFlags flags; if (parser.isSet(screenLockerOption)) { - flags = KWin::WaylandServer::InitalizationFlag::LockScreen; + flags = KWin::WaylandServer::InitializationFlag::LockScreen; } else if (parser.isSet(noScreenLockerOption)) { - flags = KWin::WaylandServer::InitalizationFlag::NoLockScreenIntegration; + flags = KWin::WaylandServer::InitializationFlag::NoLockScreenIntegration; } if (parser.isSet(noGlobalShortcutsOption)) { - flags |= KWin::WaylandServer::InitalizationFlag::NoGlobalShortcuts; + flags |= KWin::WaylandServer::InitializationFlag::NoGlobalShortcuts; } if (!server->init(parser.value(waylandSocketOption).toUtf8(), flags)) { std::cerr << "FATAL ERROR: could not create Wayland server" << std::endl; diff --git a/rulesettings.kcfg b/rulesettings.kcfg index b80b1c87b..1eab15d4e 100644 --- a/rulesettings.kcfg +++ b/rulesettings.kcfg @@ -66,12 +66,12 @@ - + Placement::Smart - + Rules::UnusedForceRule diff --git a/wayland_server.cpp b/wayland_server.cpp index 0e284c511..0b03d5b1d 100644 --- a/wayland_server.cpp +++ b/wayland_server.cpp @@ -279,7 +279,7 @@ public: } }; -bool WaylandServer::init(const QByteArray &socketName, InitalizationFlags flags) +bool WaylandServer::init(const QByteArray &socketName, InitializationFlags flags) { m_initFlags = flags; m_display = new KWinDisplay(this); @@ -525,7 +525,7 @@ void WaylandServer::initScreenLocker() } ); - if (m_initFlags.testFlag(InitalizationFlag::LockScreen)) { + if (m_initFlags.testFlag(InitializationFlag::LockScreen)) { ScreenLocker::KSldApp::self()->lock(ScreenLocker::EstablishLock::Immediate); } emit initialized(); @@ -762,12 +762,12 @@ bool WaylandServer::isScreenLocked() const bool WaylandServer::hasScreenLockerIntegration() const { - return !m_initFlags.testFlag(InitalizationFlag::NoLockScreenIntegration); + return !m_initFlags.testFlag(InitializationFlag::NoLockScreenIntegration); } bool WaylandServer::hasGlobalShortcutSupport() const { - return !m_initFlags.testFlag(InitalizationFlag::NoGlobalShortcuts); + return !m_initFlags.testFlag(InitializationFlag::NoGlobalShortcuts); } void WaylandServer::simulateUserActivity() diff --git a/wayland_server.h b/wayland_server.h index ebb5c3e18..44dfada90 100644 --- a/wayland_server.h +++ b/wayland_server.h @@ -83,17 +83,17 @@ class KWIN_EXPORT WaylandServer : public QObject { Q_OBJECT public: - enum class InitalizationFlag { + enum class InitializationFlag { NoOptions = 0x0, LockScreen = 0x1, NoLockScreenIntegration = 0x2, NoGlobalShortcuts = 0x4 }; - Q_DECLARE_FLAGS(InitalizationFlags, InitalizationFlag) + Q_DECLARE_FLAGS(InitializationFlags, InitializationFlag) ~WaylandServer() override; - bool init(const QByteArray &socketName = QByteArray(), InitalizationFlags flags = InitalizationFlag::NoOptions); + bool init(const QByteArray &socketName = QByteArray(), InitializationFlags flags = InitializationFlag::NoOptions); void terminateClientConnections(); KWayland::Server::Display *display() { @@ -283,7 +283,7 @@ private: KWayland::Server::KeyStateInterface *m_keyState = nullptr; QList m_clients; QHash m_clientIds; - InitalizationFlags m_initFlags; + InitializationFlags m_initFlags; QVector m_plasmaShellSurfaces; KWIN_SINGLETON(WaylandServer) };