Clean krita/image includes and definitions

Authored by abrahams on Sep 25 2015, 1:41 AM.



Same as earlier, different directories.

Test Plan

Built tests this time!

Diff Detail

R8 Calligra
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.
abrahams updated this revision to Diff 922.Sep 25 2015, 1:41 AM
abrahams retitled this revision from to Clean krita/image includes and definitions.
abrahams updated this object.
abrahams edited the test plan for this revision. (Show Details)
abrahams added a reviewer: rempt.
rempt requested changes to this revision.Sep 25 2015, 8:21 AM
rempt edited edge metadata.

This gives one new warning:

[ 20%] Building CXX object krita/image/CMakeFiles/kritaimage.dir/kis_circle_mask_generator.cpp.o
/home/boud/kf5/src/calligra/krita/image/kis_circle_mask_generator.cpp: In destructor ‘virtual KisCircleMaskGenerator::~KisCircleMaskGenerator()’:
/home/boud/kf5/src/calligra/krita/image/kis_circle_mask_generator.cpp:67:15: warning: possible problem detected in invocation of delete operator: [enabled by default]
     delete d->applicator;
/home/boud/kf5/src/calligra/krita/image/kis_circle_mask_generator.cpp:67:15: warning: invalid use of incomplete type ‘class KisBrushMaskApplicatorBase’ [enabled by default]
In file included from /home/boud/kf5/src/calligra/krita/image/kis_mask_generator.h:21:0,
                 from /home/boud/kf5/src/calligra/krita/image/kis_circle_mask_generator.h:24,
                 from /home/boud/kf5/src/calligra/krita/image/kis_circle_mask_generator.cpp:36:
/home/boud/kf5/src/calligra/krita/image/kis_base_mask_generator.h:31:7: warning: forward declaration of ‘class KisBrushMaskApplicatorBase’ [enabled by default]
 class KisBrushMaskApplicatorBase;
/home/boud/kf5/src/calligra/krita/image/kis_circle_mask_generator.cpp:67:15: note: neither the destructor nor the class-specific operator delete will be called, even if they are declared when the class is defined
     delete d->applicator;

Apart from that, please push.

This revision now requires changes to proceed.Sep 25 2015, 8:21 AM
abrahams updated this revision to Diff 923.Sep 25 2015, 6:56 PM
abrahams edited edge metadata.

Fix kis_circle_mask_generator

rempt accepted this revision.Sep 25 2015, 7:14 PM
rempt edited edge metadata.
This revision is now accepted and ready to land.Sep 25 2015, 7:14 PM
This revision was automatically updated to reflect the committed changes.