Use new ctors for KXMessages and KSelectionOwner

Allows to pass the connection and rootWindow and doesn't depend on
QX11Info.
This commit is contained in:
Martin Gräßlin 2015-02-20 11:00:48 +01:00
parent 7369a2c3a5
commit 7c3197b1eb
3 changed files with 3 additions and 3 deletions

View file

@ -64,7 +64,7 @@ namespace KWin
extern int currentRefreshRate();
CompositorSelectionOwner::CompositorSelectionOwner(const char *selection) : KSelectionOwner(selection), owning(false)
CompositorSelectionOwner::CompositorSelectionOwner(const char *selection) : KSelectionOwner(selection, connection(), rootWindow()), owning(false)
{
connect (this, SIGNAL(lostOwnership()), SLOT(looseOwnership()));
}

View file

@ -72,7 +72,7 @@ static const int s_startupDefaultTimeout = 5;
StartupFeedbackEffect::StartupFeedbackEffect()
: m_bounceSizesRatio(1.0)
, m_startupInfo(new KStartupInfo(KStartupInfo::CleanOnCantDetect, this))
, m_selection(new KSelectionOwner("_KDE_STARTUP_FEEDBACK", -1, this))
, m_selection(new KSelectionOwner("_KDE_STARTUP_FEEDBACK", xcbConnection(), x11RootWindow(), this))
, m_active(false)
, m_frame(0)
, m_progress(0)

View file

@ -943,7 +943,7 @@ RuleBook::RuleBook(QObject *parent)
: QObject(parent)
, m_updateTimer(new QTimer(this))
, m_updatesDisabled(false)
, m_temporaryRulesMessages(new KXMessages("_KDE_NET_WM_TEMPORARY_RULES", NULL))
, m_temporaryRulesMessages(new KXMessages(connection(), rootWindow(), "_KDE_NET_WM_TEMPORARY_RULES", nullptr))
{
connect(m_temporaryRulesMessages.data(), SIGNAL(gotMessage(QString)), SLOT(temporaryRulesMessage(QString)));
connect(m_updateTimer, SIGNAL(timeout()), SLOT(save()));