Rename Platform::screensQueried() to Platform::outputsQueried()
It makes the vocabulary consistent. We use the word "output" more than "screen."
This commit is contained in:
parent
dbef4fa3f0
commit
e0945886ed
11 changed files with 15 additions and 15 deletions
|
@ -142,13 +142,13 @@ void WaylandTestApplication::performStartup()
|
|||
if (!platform()->outputs().isEmpty()) {
|
||||
continueStartupWithScreens();
|
||||
} else {
|
||||
connect(platform(), &Platform::screensQueried, this, &WaylandTestApplication::continueStartupWithScreens);
|
||||
connect(platform(), &Platform::outputsQueried, this, &WaylandTestApplication::continueStartupWithScreens);
|
||||
}
|
||||
}
|
||||
|
||||
void WaylandTestApplication::continueStartupWithScreens()
|
||||
{
|
||||
disconnect(kwinApp()->platform(), &Platform::screensQueried, this, &WaylandTestApplication::continueStartupWithScreens);
|
||||
disconnect(kwinApp()->platform(), &Platform::outputsQueried, this, &WaylandTestApplication::continueStartupWithScreens);
|
||||
WaylandCompositor::create();
|
||||
connect(Compositor::self(), &Compositor::sceneCreated, this, &WaylandTestApplication::continueStartupWithScene);
|
||||
}
|
||||
|
|
|
@ -327,7 +327,7 @@ void DrmBackend::updateOutputs()
|
|||
}
|
||||
}
|
||||
|
||||
Q_EMIT screensQueried();
|
||||
Q_EMIT outputsQueried();
|
||||
|
||||
for (auto it = m_gpus.begin(); it != m_gpus.end();) {
|
||||
DrmGpu *gpu = it->get();
|
||||
|
@ -391,7 +391,7 @@ QString DrmBackend::supportInformation() const
|
|||
Output *DrmBackend::createVirtualOutput(const QString &name, const QSize &size, double scale)
|
||||
{
|
||||
auto output = primaryGpu()->createVirtualOutput(name, size * scale, scale);
|
||||
Q_EMIT screensQueried();
|
||||
Q_EMIT outputsQueried();
|
||||
return output;
|
||||
}
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ void Connection::doSetup()
|
|||
deactivate();
|
||||
}
|
||||
});
|
||||
connect(kwinApp()->platform(), &Platform::screensQueried, this, &Connection::updateScreens);
|
||||
connect(kwinApp()->platform(), &Platform::outputsQueried, this, &Connection::updateScreens);
|
||||
handleEvent();
|
||||
}
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ bool VirtualBackend::initialize()
|
|||
}
|
||||
setReady(true);
|
||||
|
||||
Q_EMIT screensQueried();
|
||||
Q_EMIT outputsQueried();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -118,7 +118,7 @@ void VirtualBackend::setVirtualOutputs(int count, QVector<QRect> geometries, QVe
|
|||
delete output;
|
||||
}
|
||||
|
||||
Q_EMIT screensQueried();
|
||||
Q_EMIT outputsQueried();
|
||||
}
|
||||
|
||||
void VirtualBackend::removeOutput(Output *output)
|
||||
|
|
|
@ -948,7 +948,7 @@ void WaylandBackend::addConfiguredOutput(WaylandOutput *output)
|
|||
// (i.e, received their first configure and it is now safe to commit
|
||||
// buffers to them)
|
||||
setReady(true);
|
||||
Q_EMIT screensQueried();
|
||||
Q_EMIT outputsQueried();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@ void WaylandOutput::resize(const QSize &pixelSize)
|
|||
next.currentMode = mode;
|
||||
setState(next);
|
||||
|
||||
Q_EMIT m_backend->screensQueried();
|
||||
Q_EMIT m_backend->outputsQueried();
|
||||
}
|
||||
|
||||
void WaylandOutput::setDpmsMode(DpmsMode mode)
|
||||
|
|
|
@ -623,7 +623,7 @@ void X11StandalonePlatform::doUpdateOutputs()
|
|||
return xa->xineramaNumber() < xb->xineramaNumber();
|
||||
});
|
||||
|
||||
Q_EMIT screensQueried();
|
||||
Q_EMIT outputsQueried();
|
||||
}
|
||||
|
||||
X11Output *X11StandalonePlatform::findX11Output(const QString &name) const
|
||||
|
|
|
@ -225,7 +225,7 @@ bool X11WindowedBackend::initialize()
|
|||
m_touchDevice = new X11WindowedInputDevice(this);
|
||||
m_touchDevice->setTouch(true);
|
||||
}
|
||||
Q_EMIT screensQueried();
|
||||
Q_EMIT outputsQueried();
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
|
@ -500,7 +500,7 @@ void X11WindowedBackend::handleClientMessage(xcb_client_message_event_t *event)
|
|||
removedOutput->updateEnabled(false);
|
||||
Q_EMIT outputRemoved(removedOutput);
|
||||
delete removedOutput;
|
||||
Q_EMIT screensQueried();
|
||||
Q_EMIT outputsQueried();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -329,7 +329,7 @@ public Q_SLOTS:
|
|||
virtual void sceneInitialized(){};
|
||||
|
||||
Q_SIGNALS:
|
||||
void screensQueried();
|
||||
void outputsQueried();
|
||||
void readyChanged(bool);
|
||||
/**
|
||||
* This signal is emitted when an output has been connected. The @a output is not ready
|
||||
|
|
|
@ -24,7 +24,7 @@ namespace KWin
|
|||
Screens::Screens()
|
||||
: m_maxScale(1.0)
|
||||
{
|
||||
connect(kwinApp()->platform(), &Platform::screensQueried, this, &Screens::changed);
|
||||
connect(kwinApp()->platform(), &Platform::outputsQueried, this, &Screens::changed);
|
||||
}
|
||||
|
||||
void Screens::init()
|
||||
|
|
|
@ -213,7 +213,7 @@ void Workspace::init()
|
|||
|
||||
if (waylandServer()) {
|
||||
updateOutputConfiguration();
|
||||
connect(kwinApp()->platform(), &Platform::screensQueried, this, &Workspace::updateOutputConfiguration);
|
||||
connect(kwinApp()->platform(), &Platform::outputsQueried, this, &Workspace::updateOutputConfiguration);
|
||||
}
|
||||
|
||||
Platform *platform = kwinApp()->platform();
|
||||
|
|
Loading…
Reference in a new issue