Commit 12464d64 authored by Dmitry Kazakov's avatar Dmitry Kazakov
Browse files

Fixed compilation of unit-tests

parent 6ab2a6ae
......@@ -42,14 +42,14 @@
#include <kis_iterator_ng.h>
struct KisPixelSelection::Private {
KisSelectionWSP parentSelection;
KisSelectionSP parentSelection;
QPainterPath outlineCache;
bool outlineCacheValid;
QMutex outlineCacheMutex;
};
KisPixelSelection::KisPixelSelection(KisDefaultBoundsBaseSP defaultBounds, KisSelectionWSP parentSelection)
KisPixelSelection::KisPixelSelection(KisDefaultBoundsBaseSP defaultBounds, KisSelectionSP parentSelection)
: KisPaintDevice(0, KoColorSpaceRegistry::instance()->alpha8(), defaultBounds)
, m_d(new Private)
{
......
......@@ -41,7 +41,7 @@ public:
* Create a new KisPixelSelection. This selection will not have a
* parent paint device.
*/
KisPixelSelection(KisDefaultBoundsBaseSP defaultBounds = 0, KisSelectionWSP parentSelection = 0);
KisPixelSelection(KisDefaultBoundsBaseSP defaultBounds = 0, KisSelectionSP parentSelection = 0);
/**
* Copy the selection
......
......@@ -93,7 +93,7 @@ void KisAdjustmentLayerTest::testSelectionParent()
KisAdjustmentLayerSP adjLayer =
new KisAdjustmentLayer(image, "bla", f->defaultConfiguration(0), 0);
QCOMPARE(adjLayer->internalSelection()->parentNode(), KisNodeWSP(adjLayer));
QCOMPARE(adjLayer->internalSelection()->parentNode(), KisNodeSP(adjLayer));
}
{
......@@ -101,7 +101,7 @@ void KisAdjustmentLayerTest::testSelectionParent()
KisAdjustmentLayerSP adjLayer =
new KisAdjustmentLayer(image, "bla", f->defaultConfiguration(0), selection);
QCOMPARE(adjLayer->internalSelection()->parentNode(), KisNodeWSP(adjLayer));
QCOMPARE(adjLayer->internalSelection()->parentNode(), KisNodeSP(adjLayer));
}
{
......@@ -111,7 +111,7 @@ void KisAdjustmentLayerTest::testSelectionParent()
KisSelectionSP selection = new KisSelection();
adjLayer->setInternalSelection(selection);
QCOMPARE(adjLayer->internalSelection()->parentNode(), KisNodeWSP(adjLayer));
QCOMPARE(adjLayer->internalSelection()->parentNode(), KisNodeSP(adjLayer));
}
}
......
......@@ -115,14 +115,14 @@ void KisMaskTest::testSelectionParent()
KisMaskSP mask = new TestMask;
mask->initSelection(image->rootLayer());
KisSelectionSP selection = mask->selection();
QCOMPARE(selection->parentNode(), KisNodeWSP(mask));
QCOMPARE(selection->parentNode(), KisNodeSP(mask));
}
{
KisMaskSP mask = new TestMask;
mask->setSelection(new KisSelection());
KisSelectionSP selection = mask->selection();
QCOMPARE(selection->parentNode(), KisNodeWSP(mask));
QCOMPARE(selection->parentNode(), KisNodeSP(mask));
}
}
......
......@@ -283,12 +283,12 @@ void KisSelectionTest::testSetParentNodeAfterCreation()
KisSelectionSP selection = new KisSelection();
KisPixelSelectionSP pixelSelection = selection->getOrCreatePixelSelection();
QCOMPARE(selection->parentNode(), KisNodeWSP(0));
QCOMPARE(selection->parentNode(), KisNodeSP(0));
QCOMPARE(selection->pixelSelection()->parentNode(), KisNodeWSP(0));
selection->setParentNode(image->root());
QCOMPARE(selection->parentNode(), KisNodeWSP(image->root()));
QCOMPARE(selection->parentNode(), KisNodeSP(image->root()));
QCOMPARE(selection->pixelSelection()->parentNode(), KisNodeWSP(image->root()));
}
......@@ -302,7 +302,7 @@ void KisSelectionTest::testSetParentNodeBeforeCreation()
KisPixelSelectionSP pixelSelection = selection->getOrCreatePixelSelection();
QCOMPARE(selection->parentNode(), KisNodeWSP(image->root()));
QCOMPARE(selection->parentNode(), KisNodeSP(image->root()));
QCOMPARE(selection->pixelSelection()->parentNode(), KisNodeWSP(image->root()));
}
......
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