← Back to branch summary

~ubuntu-branches/ubuntu/wily/kscreen/wily

« back to all changes in this revision

Viewing changes to kcm/src/controlpanel.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-15 01:30:43 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20150115013043-l2q6wmndvl19yduk
Tags: 4:5.1.95-0ubuntu1
* New upstream snapshot
* New upstream beta release

Show diffs side-by-side

added added

removed removed

Lines of Context:
kcm/src/controlpanel.cpp
46
46
{
47
47
}
48
48
 
49
 
void ControlPanel::setConfig(KScreen::Config *config)
 
49
void ControlPanel::setConfig(const KScreen::ConfigPtr &config)
50
50
{
51
51
    qDeleteAll(mOutputConfigs);
52
52
    mOutputConfigs.clear();
57
57
        mUnifiedOutputCfg = 0;
58
58
    }
59
59
 
60
 
    Q_FOREACH (KScreen::Output *output, mConfig->outputs()) {
 
60
    Q_FOREACH (const KScreen::OutputPtr &output, mConfig->outputs()) {
61
61
        OutputConfig *outputCfg = new OutputConfig(output, widget());
62
62
        outputCfg->hide();
63
 
        connect(outputCfg, SIGNAL(changed()),
64
 
                this, SIGNAL(changed()));
 
63
        connect(outputCfg, &OutputConfig::changed,
 
64
                this, &ControlPanel::changed);
65
65
 
66
66
        mLayout->addWidget(outputCfg);
67
67
        mOutputConfigs << outputCfg;
68
68
    }
69
69
}
70
70
 
71
 
void ControlPanel::activateOutput(KScreen::Output *output)
 
71
void ControlPanel::activateOutput(const KScreen::OutputPtr &output)
72
72
{
73
73
    // Ignore activateOutput when in unified mode
74
74
    if (mUnifiedOutputCfg) {
80
80
    }
81
81
}
82
82
 
83
 
void ControlPanel::setUnifiedOutput(KScreen::Output *output)
 
83
void ControlPanel::setUnifiedOutput(const KScreen::OutputPtr &output)
84
84
{
85
85
    Q_FOREACH (OutputConfig *config, mOutputConfigs) {
86
86
        if (!config->output()->isConnected()) {
90
90
        config->setVisible(output == 0);
91
91
    }
92
92
 
93
 
    if (output == 0) {
 
93
    if (output.isNull()) {
94
94
        mUnifiedOutputCfg->deleteLater();
95
95
        mUnifiedOutputCfg = 0;
96
96
    } else {
98
98
        mUnifiedOutputCfg->setOutput(output);
99
99
        mUnifiedOutputCfg->setVisible(true);
100
100
        mLayout->insertWidget(mLayout->count() - 2, mUnifiedOutputCfg);
101
 
        connect(mUnifiedOutputCfg, SIGNAL(changed()),
102
 
                this, SIGNAL(changed()));
 
101
        connect(mUnifiedOutputCfg, &UnifiedOutputConfig::changed,
 
102
                this, &ControlPanel::changed);
103
103
    }
104
104
}
105
 
 
106
 
#include "controlpanel.moc"