Changeset View
Changeset View
Standalone View
Standalone View
kcm/kcm.cpp
Show First 20 Lines • Show All 195 Lines • ▼ Show 20 Line(s) | 195 | { | |||
---|---|---|---|---|---|
196 | if (!m_config) { | 196 | if (!m_config) { | ||
197 | return nullptr; | 197 | return nullptr; | ||
198 | } | 198 | } | ||
199 | return m_config->outputModel(); | 199 | return m_config->outputModel(); | ||
200 | } | 200 | } | ||
201 | 201 | | |||
202 | void KCMKScreen::identifyOutputs() | 202 | void KCMKScreen::identifyOutputs() | ||
203 | { | 203 | { | ||
204 | if (!m_config || !m_config->config() || m_outputIdentifier) { | 204 | if (!m_config || !m_config->initialConfig() || m_outputIdentifier) { | ||
205 | return; | 205 | return; | ||
206 | } | 206 | } | ||
207 | m_outputIdentifier.reset(new OutputIdentifier(m_config->config(), this)); | 207 | m_outputIdentifier.reset(new OutputIdentifier(m_config->initialConfig(), this)); | ||
208 | connect(m_outputIdentifier.get(), &OutputIdentifier::identifiersFinished, | 208 | connect(m_outputIdentifier.get(), &OutputIdentifier::identifiersFinished, | ||
209 | this, [this]() { | 209 | this, [this]() { | ||
210 | m_outputIdentifier.reset(); | 210 | m_outputIdentifier.reset(); | ||
211 | }); | 211 | }); | ||
212 | 212 | | |||
213 | } | 213 | } | ||
214 | 214 | | |||
215 | QSize KCMKScreen::normalizeScreen() const | 215 | QSize KCMKScreen::normalizeScreen() const | ||
▲ Show 20 Lines • Show All 233 Lines • Show Last 20 Lines |