[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/akamakin/T8628-multithreading-optimization] libs: Get rid of "name" parameter when creating t
From:       Andrey Kamakin <null () kde ! org>
Date:       2018-07-19 11:20:34
Message-ID: E1fg6z4-0005ss-7T () code ! kde ! org
[Download RAW message or body]

Git commit 5c5fa3f4758ec139df3912d76ecab36eada48962 by Andrey Kamakin, on behalf of \
Victor Wåhlström. Committed on 19/07/2018 at 11:14.
Pushed by akamakin into branch 'akamakin/T8628-multithreading-optimization'.

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

M  +1    -1    libs/image/brushengine/kis_paintop_preset.cpp
M  +1    -1    libs/image/brushengine/kis_paintop_settings.cpp
M  +5    -5    libs/image/tests/kis_keyframing_test.cpp
M  +4    -4    libs/ui/dialogs/kis_dlg_preferences.cc

https://commits.kde.org/krita/5c5fa3f4758ec139df3912d76ecab36eada48962

diff --git a/libs/image/brushengine/kis_paintop_preset.cpp \
b/libs/image/brushengine/kis_paintop_preset.cpp index a35f5733c8a..f8785ae7a6a 100644
--- a/libs/image/brushengine/kis_paintop_preset.cpp
+++ b/libs/image/brushengine/kis_paintop_preset.cpp
@@ -107,7 +107,7 @@ void KisPaintOpPreset::setPaintOp(const KoID & paintOp)
 KoID KisPaintOpPreset::paintOp() const
 {
     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)
diff --git a/libs/image/brushengine/kis_paintop_settings.cpp \
b/libs/image/brushengine/kis_paintop_settings.cpp index dd515f806f4..95405f2621a \
                100644
--- a/libs/image/brushengine/kis_paintop_settings.cpp
+++ b/libs/image/brushengine/kis_paintop_settings.cpp
@@ -181,7 +181,7 @@ KisPaintOpSettingsSP KisPaintOpSettings::clone() const
     if (paintopID.isEmpty())
         return 0;
 
-    KisPaintOpSettingsSP settings = \
KisPaintOpRegistry::instance()->settings(KoID(paintopID, "")); +    \
KisPaintOpSettingsSP settings = \
KisPaintOpRegistry::instance()->settings(KoID(paintopID));  QMapIterator<QString, \
QVariant> i(getProperties());  while (i.hasNext()) {
         i.next();
diff --git a/libs/image/tests/kis_keyframing_test.cpp \
b/libs/image/tests/kis_keyframing_test.cpp index 050f76cd984..0e1919c516a 100644
--- a/libs/image/tests/kis_keyframing_test.cpp
+++ b/libs/image/tests/kis_keyframing_test.cpp
@@ -56,7 +56,7 @@ void KisKeyframingTest::cleanupTestCase()
 
 void KisKeyframingTest::testScalarChannel()
 {
-    KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), \
-17, 31, 0); +    KisScalarKeyframeChannel *channel = new \
KisScalarKeyframeChannel(KoID(""), -17, 31, 0);  KisKeyframeSP key;
     bool ok;
 
@@ -111,7 +111,7 @@ void KisKeyframingTest::testScalarChannel()
 
 void KisKeyframingTest::testScalarChannelUndoRedo()
 {
-    KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), \
-17, 31, 0); +    KisScalarKeyframeChannel *channel = new \
KisScalarKeyframeChannel(KoID(""), -17, 31, 0);  KisKeyframeSP key;
 
     QCOMPARE(channel->hasScalarValue(), true);
@@ -150,7 +150,7 @@ void KisKeyframingTest::testScalarChannelUndoRedo()
 
 void KisKeyframingTest::testScalarInterpolation()
 {
-    KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), \
0, 30, 0); +    KisScalarKeyframeChannel *channel = new \
KisScalarKeyframeChannel(KoID(""), 0, 30, 0);  
     KisKeyframeSP key1 = channel->addKeyframe(0);
     channel->setScalarValue(key1, 15);
@@ -268,7 +268,7 @@ void KisKeyframingTest::testRasterChannel()
 
 void KisKeyframingTest::testChannelSignals()
 {
-    KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), \
-17, 31, 0); +    KisScalarKeyframeChannel *channel = new \
KisScalarKeyframeChannel(KoID(""), -17, 31, 0);  KisKeyframeSP key;
     KisKeyframeSP resKey;
 
@@ -444,7 +444,7 @@ void KisKeyframingTest::testDeleteFirstRasterChannel()
 
 void KisKeyframingTest::testAffectedFrames()
 {
-    KisScalarKeyframeChannel *channel = new KisScalarKeyframeChannel(KoID("", ""), \
-17, 31, 0); +    KisScalarKeyframeChannel *channel = new \
KisScalarKeyframeChannel(KoID(""), -17, 31, 0);  KisTimeRange range;
 
     channel->addKeyframe(10);
diff --git a/libs/ui/dialogs/kis_dlg_preferences.cc \
b/libs/ui/dialogs/kis_dlg_preferences.cc index 8c0346956b2..6298892310a 100644
--- a/libs/ui/dialogs/kis_dlg_preferences.cc
+++ b/libs/ui/dialogs/kis_dlg_preferences.cc
@@ -453,7 +453,7 @@ ColorSettingsTab::ColorSettingsTab(QWidget *parent, const char \
*name)  m_monitorProfileWidgets << cmb;
     }
 
-    refillMonitorProfiles(KoID("RGBA", ""));
+    refillMonitorProfiles(KoID("RGBA"));
 
     for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
         if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
@@ -525,7 +525,7 @@ void ColorSettingsTab::installProfile()
     }
 
     KisConfig cfg(true);
-    refillMonitorProfiles(KoID("RGBA", ""));
+    refillMonitorProfiles(KoID("RGBA"));
 
     for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
         if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
@@ -556,7 +556,7 @@ void ColorSettingsTab::toggleAllowMonitorProfileSelection(bool \
useSystemProfile)  }
     }
     else {
-        refillMonitorProfiles(KoID("RGBA", ""));
+        refillMonitorProfiles(KoID("RGBA"));
 
         for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
             if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
@@ -570,7 +570,7 @@ void ColorSettingsTab::setDefault()
 {
     m_page->cmbWorkingColorSpace->setCurrent("RGBA");
 
-    refillMonitorProfiles(KoID("RGBA", ""));
+    refillMonitorProfiles(KoID("RGBA"));
 
     KisConfig cfg(true);
     KisImageConfig cfgImage(true);


[prev in list] [next in list] [prev in thread] [next in thread]