Clean includes and forward declarations in krita/ui
ClosedPublic

Authored by abrahams on Sep 24 2015, 3:20 AM.

Diff Detail

Repository
R8 Calligra
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
abrahams updated this revision to Diff 916.Sep 24 2015, 3:20 AM
abrahams retitled this revision from to Clean includes and forward declarations in krita/ui.
abrahams updated this object.
abrahams edited the test plan for this revision. (Show Details)
abrahams added a reviewer: rempt.
rempt edited edge metadata.Sep 24 2015, 7:00 AM

Hm, I'm all for it, but it doesn't entirely work:

[ 65%] Building CXX object krita/benchmarks/CMakeFiles/KisPainterBenchmark.dir/KisPainterBenchmark_automoc.cpp.o
In file included from /home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp:19:0:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.h:33:11: error: ‘KoColorSpace’ does not name a type
     const KoColorSpace * m_colorSpace;
           ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp: In member function ‘void KisHLineIteratorBenchmark::initTestCase()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp:34:5: error: ‘m_colorSpace’ was not declared in this scope
     m_colorSpace = KoColorSpaceRegistry::instance()->rgb8();
     ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp: In member function ‘void KisHLineIteratorBenchmark::benchmarkWriteBytes()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp:63:56: error: ‘m_colorSpace’ was not declared in this scope
                 memcpy(it->rawData(), m_color->data(), m_colorSpace->pixelSize());
                                                        ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp: In member function ‘void KisHLineIteratorBenchmark::benchmarkReadBytes()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp:77:56: error: ‘m_colorSpace’ was not declared in this scope
                 memcpy(m_color->data(), it->rawData(), m_colorSpace->pixelSize());
                                                        ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp: In member function ‘void KisHLineIteratorBenchmark::benchmarkConstReadBytes()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp:92:60: error: ‘m_colorSpace’ was not declared in this scope
                 memcpy(m_color->data(), cit->oldRawData(), m_colorSpace->pixelSize());
                                                            ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp: In member function ‘void KisHLineIteratorBenchmark::benchmarkReadWriteBytes()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp:100:15: error: ‘m_colorSpace’ was not declared in this scope
     KoColor c(m_colorSpace);
               ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp: In member function ‘void KisHLineIteratorBenchmark::benchmarkReadWriteBytes2()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp:123:15: error: ‘m_colorSpace’ was not declared in this scope
     KoColor c(m_colorSpace);
               ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp: In member function ‘void KisHLineIteratorBenchmark::benchmarkTwoIteratorsNoMemCpy()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_hline_iterator_benchmark.cpp:174:15: error: ‘m_colorSpace’ was not declared in this scope
     KoColor c(m_colorSpace);
               ^
Linking CXX executable KisGradientBenchmark
krita/benchmarks/CMakeFiles/KisHLineIteratorBenchmark.dir/build.make:54: recipe for target 'krita/benchmarks/CMakeFiles/KisHLineIteratorBenchmark.dir/kis_hline_iterator_benchmark.cpp.o' failed
gmake[2]: *** [krita/benchmarks/CMakeFiles/KisHLineIteratorBenchmark.dir/kis_hline_iterator_benchmark.cpp.o] Error 1
CMakeFiles/Makefile2:26216: recipe for target 'krita/benchmarks/CMakeFiles/KisHLineIteratorBenchmark.dir/all' failed
gmake[1]: *** [krita/benchmarks/CMakeFiles/KisHLineIteratorBenchmark.dir/all] Error 2
gmake[1]: *** Waiting for unfinished jobs....
[ 65%] Building CXX object krita/benchmarks/CMakeFiles/KisLevelFilterBenchmark.dir/KisLevelFilterBenchmark_automoc.cpp.o
Linking CXX executable KisBlurBenchmark
In file included from /home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:19:0:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.h:33:11: error: ‘KoColorSpace’ does not name a type
     const KoColorSpace * m_colorSpace;
           ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::initTestCase()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:34:5: error: ‘m_colorSpace’ was not declared in this scope
     m_colorSpace = KoColorSpaceRegistry::instance()->rgb8();
     ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::benchmarkWriteBytes()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:64:56: error: ‘m_colorSpace’ was not declared in this scope
                 memcpy(it->rawData(), m_color->data(), m_colorSpace->pixelSize());
                                                        ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::benchmarkReadBytes()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:79:56: error: ‘m_colorSpace’ was not declared in this scope
                 memcpy(it->rawData(), m_color->data(), m_colorSpace->pixelSize());
                                                        ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::benchmarkConstReadBytes()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:94:59: error: ‘m_colorSpace’ was not declared in this scope
                 memcpy(m_color->data(), it->oldRawData(), m_colorSpace->pixelSize());
                                                           ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::benchmarkReadWriteBytes()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:101:15: error: ‘m_colorSpace’ was not declared in this scope
     KoColor c(m_colorSpace);
               ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::benchmarkTotalRandom()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:133:56: error: ‘m_colorSpace’ was not declared in this scope
                 memcpy(it->rawData(), m_color->data(), m_colorSpace->pixelSize());
                                                        ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::benchmarkTotalRandomConst()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:150:59: error: ‘m_colorSpace’ was not declared in this scope
                 memcpy(m_color->data(), it->oldRawData(), m_colorSpace->pixelSize());
                                                           ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::benchmarkTileByTileWrite()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:208:64: error: ‘m_colorSpace’ was not declared in this scope
                         memcpy(it->rawData(), m_color->data(), m_colorSpace->pixelSize());
                                                                ^
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp: In member function ‘void KisRandomIteratorBenchmark::benchmarkTwoIteratorsNoMemCpy()’:
/home/boud/kf5/src/calligra/krita/benchmarks/kis_random_iterator_benchmark.cpp:219:15: error: ‘m_colorSpace’ was not declared in this scope
     KoColor c(m_colorSpace);
               ^
[ 65%] Building CXX object krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/KisRandomIteratorBenchmark_automoc.cpp.o
[ 65%] Built target KisGradientBenchmark
[ 65%] Built target KisBlurBenchmark
krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/build.make:54: recipe for target 'krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/kis_random_iterator_benchmark.cpp.o' failed
gmake[2]: *** [krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/kis_random_iterator_benchmark.cpp.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....
Linking CXX executable KisFloodfillBenchmark
[ 65%] Built target KisFloodfillBenchmark
Linking CXX executable KisPainterBenchmark
In file included from /home/boud/kf5/build/calligra/krita/benchmarks/moc_kis_random_iterator_benchmark.cpp:9:0,
                 from /home/boud/kf5/build/calligra/krita/benchmarks/KisRandomIteratorBenchmark_automoc.cpp:2:
/home/boud/kf5/build/calligra/krita/benchmarks/../../../../src/calligra/krita/benchmarks/kis_random_iterator_benchmark.h:33:11: error: ‘KoColorSpace’ does not name a type
     const KoColorSpace * m_colorSpace;
           ^
[ 65%] Built target KisPainterBenchmark
Linking CXX executable KisLevelFilterBenchmark
krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/build.make:77: recipe for target 'krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/KisRandomIteratorBenchmark_automoc.cpp.o' failed
gmake[2]: *** [krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/KisRandomIteratorBenchmark_automoc.cpp.o] Error 1
CMakeFiles/Makefile2:26692: recipe for target 'krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/all' failed
gmake[1]: *** [krita/benchmarks/CMakeFiles/KisRandomIteratorBenchmark.dir/all] Error 2
[ 65%] Built target KisLevelFilterBenchmark
Makefile:127: recipe for target 'all' failed
gmake: *** [all] Error 2
makeobj[0]: Leaving directory `/home/boud/kf5/build/calligra'
boud@linux:~/kf5/src/calligra>
abrahams updated this revision to Diff 918.Sep 24 2015, 2:24 PM
abrahams edited edge metadata.

Fix benchmarks

Sorry about that, I forgot to turn on BUILD_TESTING.

rempt accepted this revision.Sep 24 2015, 2:43 PM
rempt edited edge metadata.

Okay -- then please go ahead now :-)

This revision is now accepted and ready to land.Sep 24 2015, 2:43 PM
This revision was automatically updated to reflect the committed changes.