Changeset View
Changeset View
Standalone View
Standalone View
main.cpp
Show First 20 Lines • Show All 99 Lines • ▼ Show 20 Line(s) | |||||
100 | } | 100 | } | ||
101 | 101 | | |||
102 | Application::Application(Application::OperationMode mode, int &argc, char **argv) | 102 | Application::Application(Application::OperationMode mode, int &argc, char **argv) | ||
103 | : QApplication(argc, argv) | 103 | : QApplication(argc, argv) | ||
104 | , m_eventFilter(new XcbEventFilter()) | 104 | , m_eventFilter(new XcbEventFilter()) | ||
105 | , m_configLock(false) | 105 | , m_configLock(false) | ||
106 | , m_config() | 106 | , m_config() | ||
107 | , m_kxkbConfig() | 107 | , m_kxkbConfig() | ||
108 | , m_inputConfig() | ||||
108 | , m_operationMode(mode) | 109 | , m_operationMode(mode) | ||
109 | { | 110 | { | ||
110 | qRegisterMetaType<Options::WindowOperation>("Options::WindowOperation"); | 111 | qRegisterMetaType<Options::WindowOperation>("Options::WindowOperation"); | ||
111 | qRegisterMetaType<KWin::EffectWindow*>(); | 112 | qRegisterMetaType<KWin::EffectWindow*>(); | ||
112 | qRegisterMetaType<KWayland::Server::SurfaceInterface *>("KWayland::Server::SurfaceInterface *"); | 113 | qRegisterMetaType<KWayland::Server::SurfaceInterface *>("KWayland::Server::SurfaceInterface *"); | ||
113 | qRegisterMetaType<KSharedConfigPtr>(); | 114 | qRegisterMetaType<KSharedConfigPtr>(); | ||
114 | } | 115 | } | ||
115 | 116 | | |||
Show All 27 Lines | 138 | { | |||
143 | if (!m_config->isImmutable() && m_configLock) { | 144 | if (!m_config->isImmutable() && m_configLock) { | ||
144 | // TODO: This shouldn't be necessary | 145 | // TODO: This shouldn't be necessary | ||
145 | //config->setReadOnly( true ); | 146 | //config->setReadOnly( true ); | ||
146 | m_config->reparseConfiguration(); | 147 | m_config->reparseConfiguration(); | ||
147 | } | 148 | } | ||
148 | if (!m_kxkbConfig) { | 149 | if (!m_kxkbConfig) { | ||
149 | m_kxkbConfig = KSharedConfig::openConfig(QStringLiteral("kxkbrc"), KConfig::NoGlobals); | 150 | m_kxkbConfig = KSharedConfig::openConfig(QStringLiteral("kxkbrc"), KConfig::NoGlobals); | ||
150 | } | 151 | } | ||
152 | if (!m_inputConfig) { | ||||
153 | m_inputConfig = KSharedConfig::openConfig(QStringLiteral("kcminputrc"), KConfig::NoGlobals); | ||||
154 | } | ||||
151 | 155 | | |||
152 | performStartup(); | 156 | performStartup(); | ||
153 | } | 157 | } | ||
154 | 158 | | |||
155 | Application::~Application() | 159 | Application::~Application() | ||
156 | { | 160 | { | ||
157 | delete options; | 161 | delete options; | ||
158 | destroyAtoms(); | 162 | destroyAtoms(); | ||
▲ Show 20 Lines • Show All 301 Lines • Show Last 20 Lines |