Commit 62db1dee authored by Volker Krause's avatar Volker Krause
Browse files

Deduce pair types automatically

Needed for Qt6 to compile.
parent 371407a3
Pipeline #167405 passed with stage
in 3 minutes and 10 seconds
......@@ -72,7 +72,7 @@ QList< QPair< QString, QWidget* > > BrightnessControlConfig::buildUi()
hlay->addWidget(m_text);
tempWidget->setLayout(hlay);
QList< QPair< QString, QWidget* > > retlist;
retlist.append(qMakePair< QString, QWidget* >(i18nc("Brightness level, label for the slider", "Level"), tempWidget));
retlist.append(qMakePair(i18nc("Brightness level, label for the slider", "Level"), tempWidget));
connect(m_slider, &QAbstractSlider::valueChanged, this, &BrightnessControlConfig::setChanged);
......
......@@ -71,7 +71,7 @@ QList< QPair< QString, QWidget* > > DimDisplayConfig::buildUi()
hlay->addStretch();
QList< QPair< QString, QWidget* > > retlist;
retlist.append(qMakePair< QString, QWidget* >(i18n("After"), tempWidget));
retlist.append(qMakePair(i18n("After"), tempWidget));
connect(m_spinBox, SIGNAL(valueChanged(int)), this, SLOT(setChanged()));
......
......@@ -74,7 +74,7 @@ QList< QPair< QString, QWidget* > > KeyboardBrightnessControlConfig::buildUi()
tempWidget->setLayout(hlay);
QList< QPair< QString, QWidget* > > retlist;
retlist.append(qMakePair< QString, QWidget* >(i18nc("@label:slider Brightness level", "Level"), tempWidget));
retlist.append(qMakePair(i18nc("@label:slider Brightness level", "Level"), tempWidget));
connect(m_slider, &QAbstractSlider::valueChanged, this, &KeyboardBrightnessControlConfig::setChanged);
......
......@@ -68,7 +68,7 @@ QList< QPair< QString, QWidget* > > RunScriptConfig::buildUi()
QList< QPair< QString, QWidget* > > retlist;
m_urlRequester = new KUrlRequester();
m_urlRequester->setMode(KFile::File | KFile::LocalOnly | KFile::ExistingOnly);
retlist.append(qMakePair< QString, QWidget* >(i18n("Script"), m_urlRequester));
retlist.append(qMakePair(i18n("Script"), m_urlRequester));
QWidget *tempWidget = new QWidget;
QHBoxLayout *hlay = new QHBoxLayout;
......@@ -92,7 +92,7 @@ QList< QPair< QString, QWidget* > > RunScriptConfig::buildUi()
tempWidget->setLayout(hlay);
retlist.append(qMakePair< QString, QWidget* >(i18n("Run script"), tempWidget));
retlist.append(qMakePair(i18n("Run script"), tempWidget));
connect(m_urlRequester, &KUrlRequester::textChanged, this, &RunScriptConfig::setChanged);
connect(m_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setChanged()));
......
......@@ -105,7 +105,7 @@ QList< QPair< QString, QWidget* > > SuspendSessionConfig::buildUi()
tempWidget->setLayout(hlay);
QList< QPair< QString, QWidget* > > retlist;
retlist.append(qMakePair< QString, QWidget* >(i18n("Automatically"), tempWidget));
retlist.append(qMakePair(i18n("Automatically"), tempWidget));
connect(m_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setChanged()));
connect(m_idleTime, SIGNAL(valueChanged(int)), this, SLOT(setChanged()));
......
......@@ -649,7 +649,7 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
return;
}
m_cookieToAppName.insert(cookie, qMakePair<QString, QString>(appName, reason));
m_cookieToAppName.insert(cookie, qMakePair(appName, reason));
addInhibitionTypeHelper(cookie, static_cast< PolicyAgent::RequiredPolicies >(types));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment