Commit 9540689d authored by Boudewijn Rempt's avatar Boudewijn Rempt

Krazy fixes

svn path=/trunk/koffice/; revision=778052
parent ce52c49f
......@@ -18,7 +18,6 @@
*/
#include "extensions_plugin.h"
#include <kis_debug.h>
#include <kgenericfactory.h>
......
......@@ -18,7 +18,6 @@
*/
#include "kis_hsv_adjustment.h"
#include <config-openexr.h>
#ifdef HAVE_OPENEXR
#include <half.h>
......
......@@ -19,11 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "gray_u16_plugin.h"
#include <kgenericfactory.h>
#include <KoColorSpaceRegistry.h>
#include <KoBasicHistogramProducers.h>
#include "gray_u16_plugin.h"
#include "kis_gray_u16_colorspace.h"
typedef KGenericFactory<GRAYU16Plugin> GRAYU16PluginFactory;
......
......@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_gray_u16_colorspace.h"
#include <QDomElement>
#include <kis_debug.h>
......@@ -23,9 +25,6 @@
#include <KoIntegerMaths.h>
#include <KoColorSpaceRegistry.h>
#include "kis_gray_u16_colorspace.h"
#include "compositeops/KoCompositeOpOver.h"
#include "compositeops/KoCompositeOpErase.h"
......
......@@ -17,6 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "gray_plugin.h"
#include <stdlib.h>
#include <vector>
......@@ -30,7 +32,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoBasicHistogramProducers.h>
#include "gray_plugin.h"
#include "kis_gray_colorspace.h"
typedef KGenericFactory<GrayPlugin> GrayPluginFactory;
......
......@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_gray_colorspace.h"
#include <QDomElement>
#include <kis_debug.h>
......@@ -24,7 +26,7 @@
#include <KoIntegerMaths.h>
#include <KoColorSpaceRegistry.h>
#include "kis_gray_colorspace.h"
#include "compositeops/KoCompositeOpOver.h"
#include "compositeops/KoCompositeOpErase.h"
......
......@@ -16,11 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_strategy_colorspace_grayscale_tester.h"
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include "kis_factory.h"
#include "kis_strategy_colorspace_grayscale_tester.h"
#include "kis_gray_colorspace.h"
using namespace KUnitTest;
......
......@@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
#include "kis_lms_f32_colorspace.h"
#include <limits.h>
#include <lcms.h>
......@@ -28,7 +30,7 @@
#include <kis_debug.h>
#include <klocale.h>
#include "kis_lms_f32_colorspace.h"
#include "kis_color_conversions.h"
namespace {
......
......@@ -21,12 +21,14 @@
* Boston, MA 02110-1301, USA.
*/
#include "lms_f32_plugin.h"
#include <kcomponentdata.h>
#include <kgenericfactory.h>
#include <KoColorSpaceRegistry.h>
#include <kis_basic_histogram_producers.h>
#include "lms_f32_plugin.h"
#include "kis_lms_f32_colorspace.h"
typedef KGenericFactory<LMSF32Plugin> LMSF32PluginFactory;
......
......@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_rgb_f16_hdr_colorspace.h"
#include <lcms.h>
#include <kis_debug.h>
......@@ -23,8 +25,6 @@
#include <KoColorSpaceRegistry.h>
#include "kis_rgb_f16_hdr_colorspace.h"
KisRgbF16HDRColorSpace::KisRgbF16HDRColorSpace( KoColorProfile *p)
: KisRgbFloatHDRColorSpace<RgbF16Traits>(colorSpaceId(), i18n("RGB (16-bit float/channel) for High Dynamic Range imaging"), p)
{
......
......@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_rgb_f32_hdr_colorspace.h"
#include <lcms.h>
#include <kis_debug.h>
......@@ -23,8 +25,6 @@
#include "KoColorSpaceRegistry.h"
#include "kis_rgb_f32_hdr_colorspace.h"
KisRgbF32HDRColorSpace::KisRgbF32HDRColorSpace( KoColorProfile *p)
: KisRgbFloatHDRColorSpace<RgbF32Traits>(colorSpaceId(), i18n("RGB (32-bit float/channel) for High Dynamic Range imaging"), p)
{
......
......@@ -17,3 +17,5 @@
*/
#include "kis_rgb_float_hdr_colorspace.h"
......@@ -18,8 +18,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "rgb_float_hdr.h"
#include "config-openexr.h"
#include <klocale.h>
......
#include "kis_rgb_float_hdr_colorspace_test.h"
#include "kis_rgb_float_hdr_colorspace_test.h"
#include <cmath>
#include <qtest_kde.h>
......
......@@ -17,3 +17,5 @@
* Boston, MA 02110-1301, USA.
*/
#include "kis_xyz_f16_hdr_colorspace.h"
......@@ -18,7 +18,6 @@
*/
#include "kis_xyz_f32_hdr_colorspace.h"
#include <KoColorConversionTransformationFactory.h>
#include <KoScaleColorConversionTransformation.h>
#include "kis_xyz_to_lab_color_conversion_transformation.h"
......
......@@ -18,7 +18,6 @@
*/
#include "xyz_float_hdr.h"
#include "config-openexr.h"
#include <klocale.h>
......
......@@ -18,7 +18,6 @@
*/
#include "kis_xyz_u16_colorspace.h"
#include <QDomElement>
#include <kis_debug.h>
......
......@@ -17,10 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "xyz_u16_plugin.h"
#include <kgenericfactory.h>
#include <KoColorSpaceRegistry.h>
#include <KoBasicHistogramProducers.h>
#include "xyz_u16_plugin.h"
#include "kis_xyz_u16_colorspace.h"
typedef KGenericFactory<XYZU16Plugin> XYZU16PluginFactory;
......
......@@ -16,7 +16,6 @@
*/
#include "kis_ycbcr_u16_colorspace.h"
#include <QImage>
#include <QColor>
......
......@@ -16,7 +16,6 @@
*/
#include "kis_ycbcr_u8_colorspace.h"
#include <QImage>
#include <QColor>
......
......@@ -14,8 +14,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "ycbcr_plugin.h"
#include <stdlib.h>
#include <vector>
......
......@@ -17,6 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "ui/kis_factory2.h"
......
......@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*/
#include <kcmdlineargs.h>
#include <KoApplication.h>
#include <krita_export.h>
......
......@@ -19,7 +19,6 @@
*/
#include "blur.h"
#include <kgenericfactory.h>
#include "kis_blur_filter.h"
......
......@@ -19,7 +19,6 @@
*/
#include "kis_blur_filter.h"
#include <kcombobox.h>
#include <knuminput.h>
......
......@@ -19,7 +19,6 @@
*/
#include "kis_wdg_blur.h"
#include <QLayout>
#include <QToolButton>
#include <QIcon>
......
......@@ -26,6 +26,8 @@
*
*/
#include "bumpmap.h"
#include <stdlib.h>
#include <QButtonGroup>
......@@ -63,10 +65,6 @@
#include <kis_selection.h>
#include <kis_paint_device.h>
#include <kis_filter_processing_information.h>
#include "bumpmap.h"
#define MOD(x, y) \
((x) < 0 ? ((y) - 1 - ((y) - 1 - (x)) % (y)) : (x) % (y))
......
......@@ -18,10 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_cimg_plugin.h"
#include <kgenericfactory.h>
#include <kis_filter.h>
#include "kis_cimg_plugin.h"
#include "kis_cimg_filter.h"
#include "kis_filter_registry.h"
......
......@@ -19,6 +19,8 @@
*
* Ported from the CImg Gimp plugin by Victor Stinner and David Tschumperlé.
*/
#include "kis_cimgconfig_widget.h"
#include <QLayout>
#include <QCheckBox>
#include <QPushButton>
......@@ -26,7 +28,7 @@
#include <knuminput.h>
#include "kis_cimgconfig_widget.h"
#include "kis_cimg_filter.h"
KisCImgconfigWidget::KisCImgconfigWidget(QWidget * parent, Qt::WFlags f)
......
......@@ -19,7 +19,6 @@
*/
#include "colors.h"
#include <kgenericfactory.h>
#include "kis_minmax_filters.h"
......
......@@ -19,7 +19,6 @@
*/
#include "kis_color_to_alpha.h"
#include <qcheckbox.h>
#include <qspinbox.h>
......
......@@ -19,7 +19,6 @@
*/
#include "kis_minmax_filters.h"
#include <KoProgressUpdater.h>
#include <kis_iterators_pixel.h>
......
......@@ -19,7 +19,6 @@
*/
#include "kis_wdg_color_to_alpha.h"
#include <qcheckbox.h>
#include <qlayout.h>
#include <qspinbox.h>
......
......@@ -17,8 +17,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "colorsfilters.h"
#include <math.h>
#include <stdlib.h>
......
......@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_brightness_contrast_filter.h"
#include <math.h>
#include <klocale.h>
......@@ -39,7 +41,7 @@
#include "KoCompositeOp.h"
#include "kis_filter_config_widget.h"
#include "kis_brightness_contrast_filter.h"
#include "kis_bookmarked_configuration_manager.h"
#include "kis_paint_device.h"
#include "kis_iterators_pixel.h"
......
......@@ -19,6 +19,7 @@
#include "kis_hsv_adjustment_filter.h"
#include <KoProgressUpdater.h>
#include <kis_filter_configuration.h>
......
......@@ -17,6 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_perchannel_filter.h"
#include <QLayout>
#include <QPixmap>
#include <QPainter>
......@@ -35,7 +37,7 @@
#include "kis_bookmarked_configuration_manager.h"
#include "kis_filter_configuration.h"
#include "kis_filter_config_widget.h"
#include "kis_perchannel_filter.h"
#include <kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
......
......@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "convolutionfilters.h"
#include <stdlib.h>
#include <klocale.h>
......@@ -25,7 +27,7 @@
#include <kgenericfactory.h>
#include <kis_convolution_painter.h>
#include "convolutionfilters.h"
#include <kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
......@@ -56,11 +58,7 @@ KisKernelSP createKernel( qint32 i0, qint32 i1, qint32 i2,
kernel->data[8] = i8;
return kernel;
}
typedef KGenericFactory<KritaConvolutionFilters> KritaConvolutionFiltersFactory;
}typedef KGenericFactory<KritaConvolutionFilters> KritaConvolutionFiltersFactory;
K_EXPORT_COMPONENT_FACTORY( kritaconvolutionfilters, KritaConvolutionFiltersFactory( "krita" ) )
KritaConvolutionFilters::KritaConvolutionFilters(QObject *parent, const QStringList &)
......
......@@ -19,7 +19,6 @@
*/
#include "kis_convolution_filter.h"
#include <klocale.h>
#include <kis_debug.h>
......
......@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_cubism_filter.h"
#include <stdlib.h>
#include <time.h>
#include <vector>
......@@ -54,7 +56,7 @@
#include <KoCompositeOp.h>
#include "kis_multi_integer_filter_widget.h"
#include "kis_cubism_filter.h"
#include "kis_polygon.h"
......
......@@ -18,8 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/