Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 6c9272c4 authored by Victor Wåhlström's avatar Victor Wåhlström

Get rid of "name" parameter when creating the KoID in...

Get rid of "name" parameter when creating the KoID in KisPaintOpPreset::paintOp(). It doesn't appear to be needed, and is not consistent between instances of the same ID.

Removed second "name" parameter for KoID constructor calls when that parameter was an empty string.

Ref T6560
parent 11668dad
...@@ -107,7 +107,7 @@ void KisPaintOpPreset::setPaintOp(const KoID & paintOp) ...@@ -107,7 +107,7 @@ void KisPaintOpPreset::setPaintOp(const KoID & paintOp)
KoID KisPaintOpPreset::paintOp() const KoID KisPaintOpPreset::paintOp() const
{ {
Q_ASSERT(m_d->settings); Q_ASSERT(m_d->settings);
return KoID(m_d->settings->getString("paintop"), name()); return KoID(m_d->settings->getString("paintop"));
} }
void KisPaintOpPreset::setOptionsWidget(KisPaintOpConfigWidget* widget) void KisPaintOpPreset::setOptionsWidget(KisPaintOpConfigWidget* widget)
......
...@@ -181,7 +181,7 @@ KisPaintOpSettingsSP KisPaintOpSettings::clone() const ...@@ -181,7 +181,7 @@ KisPaintOpSettingsSP KisPaintOpSettings::clone() const
if (paintopID.isEmpty()) if (paintopID.isEmpty())
return 0; return 0;
KisPaintOpSettingsSP settings = KisPaintOpRegistry::instance()->settings(KoID(paintopID, "")); KisPaintOpSettingsSP settings = KisPaintOpRegistry::instance()->settings(KoID(paintopID));
QMapIterator<QString, QVariant> i(getProperties()); QMapIterator<QString, QVariant> i(getProperties());
while (i.hasNext()) { while (i.hasNext()) {
i.next(); i.next();
......
...@@ -56,7 +56,7 @@ void KisKeyframingTest::cleanupTestCase() ...@@ -56,7 +56,7 @@ void KisKeyframingTest::cleanupTestCase()
void KisKeyframingTest::testScalarChannel() void KisKeyframingTest::testScalarChannel()
{ {
KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), -17, 31, 0); KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID(""), -17, 31, 0);
KisKeyframeSP key; KisKeyframeSP key;
bool ok; bool ok;
...@@ -111,7 +111,7 @@ void KisKeyframingTest::testScalarChannel() ...@@ -111,7 +111,7 @@ void KisKeyframingTest::testScalarChannel()
void KisKeyframingTest::testScalarChannelUndoRedo() void KisKeyframingTest::testScalarChannelUndoRedo()
{ {
KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), -17, 31, 0); KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID(""), -17, 31, 0);
KisKeyframeSP key; KisKeyframeSP key;
QCOMPARE(channel->hasScalarValue(), true); QCOMPARE(channel->hasScalarValue(), true);
...@@ -150,7 +150,7 @@ void KisKeyframingTest::testScalarChannelUndoRedo() ...@@ -150,7 +150,7 @@ void KisKeyframingTest::testScalarChannelUndoRedo()
void KisKeyframingTest::testScalarInterpolation() void KisKeyframingTest::testScalarInterpolation()
{ {
KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), 0, 30, 0); KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID(""), 0, 30, 0);
KisKeyframeSP key1 = channel->addKeyframe(0); KisKeyframeSP key1 = channel->addKeyframe(0);
channel->setScalarValue(key1, 15); channel->setScalarValue(key1, 15);
...@@ -268,7 +268,7 @@ void KisKeyframingTest::testRasterChannel() ...@@ -268,7 +268,7 @@ void KisKeyframingTest::testRasterChannel()
void KisKeyframingTest::testChannelSignals() void KisKeyframingTest::testChannelSignals()
{ {
KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), -17, 31, 0); KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID(""), -17, 31, 0);
KisKeyframeSP key; KisKeyframeSP key;
KisKeyframeSP resKey; KisKeyframeSP resKey;
...@@ -444,7 +444,7 @@ void KisKeyframingTest::testDeleteFirstRasterChannel() ...@@ -444,7 +444,7 @@ void KisKeyframingTest::testDeleteFirstRasterChannel()
void KisKeyframingTest::testAffectedFrames() void KisKeyframingTest::testAffectedFrames()
{ {
KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), -17, 31, 0); KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID(""), -17, 31, 0);
KisTimeRange range; KisTimeRange range;
channel->addKeyframe(10); channel->addKeyframe(10);
......
...@@ -462,7 +462,7 @@ ColorSettingsTab::ColorSettingsTab(QWidget *parent, const char *name) ...@@ -462,7 +462,7 @@ ColorSettingsTab::ColorSettingsTab(QWidget *parent, const char *name)
m_monitorProfileWidgets << cmb; m_monitorProfileWidgets << cmb;
} }
refillMonitorProfiles(KoID("RGBA", "")); refillMonitorProfiles(KoID("RGBA"));
for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) { for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) { if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
...@@ -534,7 +534,7 @@ void ColorSettingsTab::installProfile() ...@@ -534,7 +534,7 @@ void ColorSettingsTab::installProfile()
} }
KisConfig cfg(true); KisConfig cfg(true);
refillMonitorProfiles(KoID("RGBA", "")); refillMonitorProfiles(KoID("RGBA"));
for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) { for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) { if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
...@@ -565,7 +565,7 @@ void ColorSettingsTab::toggleAllowMonitorProfileSelection(bool useSystemProfile) ...@@ -565,7 +565,7 @@ void ColorSettingsTab::toggleAllowMonitorProfileSelection(bool useSystemProfile)
} }
} }
else { else {
refillMonitorProfiles(KoID("RGBA", "")); refillMonitorProfiles(KoID("RGBA"));
for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) { for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) { if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
...@@ -579,7 +579,7 @@ void ColorSettingsTab::setDefault() ...@@ -579,7 +579,7 @@ void ColorSettingsTab::setDefault()
{ {
m_page->cmbWorkingColorSpace->setCurrent("RGBA"); m_page->cmbWorkingColorSpace->setCurrent("RGBA");
refillMonitorProfiles(KoID("RGBA", "")); refillMonitorProfiles(KoID("RGBA"));
KisConfig cfg(true); KisConfig cfg(true);
KisImageConfig cfgImage(true); KisImageConfig cfgImage(true);
......
Markdown is supported
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