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/D28092master
parent
518c85e91e
commit
39154ad2d6
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -66,12 +66,12 @@
|
|||
</entry>
|
||||
|
||||
<entry name="placement" type="Enum">
|
||||
<label>Inital placement</label>
|
||||
<label>Initial placement</label>
|
||||
<choices name="Placement::Policy"/>
|
||||
<default code="true">Placement::Smart</default>
|
||||
</entry>
|
||||
<entry name="placementrule" type="Int">
|
||||
<label>Inital placement rule type</label>
|
||||
<label>Initial placement rule type</label>
|
||||
<default code="true">Rules::UnusedForceRule</default>
|
||||
</entry>
|
||||
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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<AbstractClient *> m_clients;
|
||||
QHash<KWayland::Server::ClientConnection*, quint16> m_clientIds;
|
||||
InitalizationFlags m_initFlags;
|
||||
InitializationFlags m_initFlags;
|
||||
QVector<KWayland::Server::PlasmaShellSurfaceInterface*> m_plasmaShellSurfaces;
|
||||
KWIN_SINGLETON(WaylandServer)
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue