Commit d839586c authored by Michael Abrahams's avatar Michael Abrahams

Clean krita/image includes and definitions

Summary: Same as earlier, different directories.

Test Plan: Built tests this time!

Reviewers: rempt

Reviewed By: rempt

Differential Revision: https://phabricator.kde.org/D378
parent 84c1769d
......@@ -20,7 +20,6 @@
#define KISLOCKEDPROPERTIES_H
#include "kis_properties_configuration.h"
#include "kis_paintop_settings.h"
/**
* This class maintains a list of all the PaintOp Options that are supposed to be
......
......@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_locked_properties_proxy.h"
#include "kis_locked_properties.h"
#include "kis_locked_properties_server.h"
#include "kis_paintop_settings.h"
#include "kis_paintop_preset.h"
KisLockedPropertiesProxy ::KisLockedPropertiesProxy()
: m_lockedProperties(0)
......
......@@ -19,11 +19,8 @@
#ifndef KIS_LOCKED_PROPERTIES_PROXY_H
#define KIS_LOCKED_PROPERTIES_PROXY_H
#include "kis_locked_properties.h"
#include "kis_properties_configuration.h"
#include "kis_locked_properties_server.h"
#include "kis_paintop_preset.h"
#include "kis_paintop_settings.h"
/**
* This class acts as a proxy for all transfers between KisLockedPropertiesServer
......@@ -38,6 +35,7 @@
* suffix are destroyed.
*/
class KisLockedPropertiesServer;
class KisLockedProperties;
class KisLockedPropertiesProxy: public KisPropertiesConfiguration
{
......
......@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_locked_properties_server.h"
#include "kis_locked_properties.h"
#include <QGlobalStatic>
......
......@@ -20,11 +20,11 @@
#ifndef KIS_LOCKED_PROPERTIES_SERVER_H
#define KIS_LOCKED_PROPERTIES_SERVER_H
#include "kis_locked_properties.h"
#include "kis_locked_properties_proxy.h"
#include "kis_properties_configuration.h"
class KisLockedPropertiesProxy;
class KisLockedProperties;
/**
* The KisLockedPropertiesServer class
......
......@@ -22,7 +22,6 @@
#include <QScopedPointer>
#include "kis_paintop.h"
#include "kis_distance_information.h"
#include "kis_algebra_2d.h"
......
......@@ -30,13 +30,11 @@
#include "kis_painter.h"
#include "kis_layer.h"
#include "kis_types.h"
#include "kis_image.h"
#include "kis_paint_device.h"
#include "kis_global.h"
#include "kis_datamanager.h"
#include "kis_paintop_settings.h"
#include "kis_paintop_preset.h"
#include "kis_paint_information.h"
#include "kis_vec.h"
......
......@@ -26,7 +26,6 @@
#include "kis_distance_information.h"
#include "kis_shared.h"
#include "kis_types.h"
#include "kis_paintop_settings.h"
#include <kritaimage_export.h>
......
......@@ -29,7 +29,6 @@
#include <KoInputDevice.h>
#include "kis_types.h"
#include "kis_paintop_settings.h"
#include "kis_paintop_registry.h"
#include "kis_painter.h"
......
......@@ -29,10 +29,8 @@
#include <KoCompositeOp.h>
#include <KoID.h>
#include "kis_types.h"
#include "kis_paint_device.h"
#include "kis_paintop.h"
#include "kis_painter.h"
#include "kis_debug.h"
#include "kis_layer.h"
......
......@@ -32,8 +32,6 @@
#include "generator/kis_generator.h"
class KisNode;
class KisChangeFilterCmd : public KUndo2Command
{
......
......@@ -21,6 +21,7 @@
#include <KoCompositeOp.h>
#include "kis_node.h"
#include "commands/kis_node_commands.h"
#include "kis_paint_device.h"
KisNodeCompositeOpCommand::KisNodeCompositeOpCommand(KisNodeSP node, const QString& oldCompositeOp,
......
......@@ -25,7 +25,6 @@
#include <KoColorSpace.h>
#include <KoCompositeOpRegistry.h>
#include "kis_fill_interval_map.h"
#include "kis_paint_device.h"
#include "kis_pixel_selection.h"
#include "kis_random_accessor_ng.h"
#include "kis_fill_sanity_checks.h"
......
......@@ -19,6 +19,7 @@
#ifndef __KIS_ANTIALIASING_FADE_MAKER_H
#define __KIS_ANTIALIASING_FADE_MAKER_H
#include "kis_global.h"
template <class BaseFade>
class KisAntialiasingFadeMaker1D
......
......@@ -25,7 +25,6 @@
#include <KoChannelInfo.h>
#include <KoCompositeOpRegistry.h>
#include "kis_paint_device.h"
#include "kis_node_visitor.h"
#include "kis_painter.h"
#include "kis_layer.h"
......
......@@ -21,7 +21,6 @@
#include "kritaimage_export.h"
#include "kis_types.h"
#include "kis_paint_device.h"
class QRect;
class KisBaseRectsWalker;
......
......@@ -20,6 +20,7 @@
#include "kis_brush_mask_applicator_factories.h" // vc.h must come first
#include "kis_mask_generator.h"
#include "kis_brush_mask_applicator_base.h"
#include <cmath>
......
......@@ -20,7 +20,7 @@
#ifndef _KIS_MASK_GENERATOR_H_
#define _KIS_MASK_GENERATOR_H_
#include "kis_brush_mask_applicator_base.h" // vc.h must come first
#include <KoVcMultiArchBuildSupport.h> //MSVC requires that Vc come first
#include <KoID.h>
#include <klocalizedstring.h>
......@@ -28,6 +28,7 @@
class QDomElement;
class QDomDocument;
class KisBrushMaskApplicatorBase;
const KoID DefaultId("default", ki18n("Default")); ///< generate Krita default mask generator
const KoID SoftId("soft", ki18n("Soft")); ///< generate brush mask from former softbrush paintop, where softness is based on curve
......
......@@ -23,7 +23,6 @@
#include <KoProperties.h>
#include <KoColorSpace.h>
#include <KoCompositeOpRegistry.h>
#include "kis_paint_device.h"
struct Q_DECL_HIDDEN KisBaseNode::Private
{
......
......@@ -24,7 +24,6 @@
#include "filter/kis_filter_configuration.h"
#include "kis_paint_device.h"
#include "kis_selection.h"
#include "kis_types.h"
class KisBaseProcessorConfigurationFactory : public KisSerializableConfigurationFactory
......
......@@ -22,7 +22,6 @@
#include <QStack>
#include "kis_layer.h"
#include "kis_mask.h"
#include "kis_abstract_projection_plane.h"
#include "kis_projection_leaf.h"
......
......@@ -21,7 +21,7 @@
#include "kis_circle_mask_generator.h"
#include "kis_circle_mask_generator_p.h"
#include "kis_brush_mask_applicators.h"
#include "kis_brush_mask_applicator_base.h"
#define a(_s) #_s
#define b(_s) a(_s)
......
......@@ -21,8 +21,7 @@
#include "KoVcMultiArchBuildSupport.h"
#include "kis_brush_mask_applicator_base.h"
class KisBrushMaskApplicatorBase;
template<class MaskGenerator, Vc::Implementation _impl>
struct KisBrushMaskScalarApplicator;
......
......@@ -21,6 +21,7 @@
#define __KIS_BRUSH_MASK_APPLICATORS_H
#include "kis_brush_mask_applicator_base.h"
#include "kis_global.h"
// 3x3 supersampling
#define SUPERSAMPLING 3
......
......@@ -20,15 +20,15 @@
#include "KoColorSpace.h"
#include "kis_global.h"
#include "kis_types.h"
#include "kis_node_visitor.h"
#include "kis_paint_layer.h"
#include "kis_paint_device.h"
#include "kis_adjustment_layer.h"
#include "generator/kis_generator_layer.h"
#include "kis_group_layer.h"
#include "kis_external_layer_iface.h"
class KisExternalLayer;
// #include "kis_external_layer_iface.h"
/**
* The Change Profile visitor walks over all layers and if the current
......
......@@ -37,6 +37,7 @@
#include "kis_circle_mask_generator_p.h"
#include "kis_base_mask_generator.h"
#include "kis_brush_mask_applicator_factories.h"
#include "kis_brush_mask_applicator_base.h"
KisCircleMaskGenerator::KisCircleMaskGenerator(qreal diameter, qreal ratio, qreal fh, qreal fv, int spikes, bool antialiasEdges)
......
......@@ -22,6 +22,7 @@
#include <QUuid>
#include <QString>
#include "kritaimage_export.h"
#include "kis_node.h"
class KRITAIMAGE_EXPORT KisCloneInfo
......
......@@ -32,7 +32,6 @@
#include "kis_painter.h"
#include "kis_node_visitor.h"
#include "kis_processing_visitor.h"
#include "kis_clone_info.h"
#include "kis_paint_layer.h"
#include <QStack>
......
......@@ -21,7 +21,6 @@
#include <QObject>
#include "kis_types.h"
#include "kis_layer.h"
#include "kis_indirect_painting_support.h"
#include <kritaimage_export.h>
#include "kis_clone_info.h"
......
......@@ -23,7 +23,6 @@
#include <KoColorSpace.h>
#include <kritaimage_export.h>
#include "kis_global.h"
#include "kis_types.h"
#include "kis_node_visitor.h"
......
......@@ -18,8 +18,6 @@
#ifndef KIS_CONVOLUTION_PAINTER_H_
#define KIS_CONVOLUTION_PAINTER_H_
#include "kis_shared.h"
#include "kis_shared_ptr.h"
#include "kis_types.h"
#include "kis_painter.h"
#include "kis_image.h"
......
......@@ -22,7 +22,6 @@
#include <KoUpdater.h>
#include "kis_paint_device.h"
#include "kis_iterator_ng.h"
#include "kis_repeat_iterators_pixel.h"
#include "kis_painter.h"
......
......@@ -26,7 +26,6 @@
#include "kis_node.h"
#include "kis_paint_layer.h"
#include "kis_paint_device.h"
#include "kis_group_layer.h"
#include "kis_adjustment_layer.h"
#include "kis_external_layer_iface.h"
......
......@@ -19,8 +19,7 @@
#ifndef __KIS_CROSS_DEVICE_COLOR_PICKER_H
#define __KIS_CROSS_DEVICE_COLOR_PICKER_H
#include "kis_paint_device.h"
#include "kis_fixed_paint_device.h"
#include "KoColorSpace.h"
#include "kis_random_sub_accessor.h"
......
......@@ -21,7 +21,6 @@
#include "kritaimage_export.h"
#include "kis_mask_generator.h"
#include <QList>
#include <QVector>
......
......@@ -21,6 +21,7 @@
#include "kis_global.h"
#include "kis_default_bounds.h"
#include "kis_paint_device.h"
#include "kis_image.h"
const QRect KisDefaultBounds::infiniteRect =
QRect(qint32_MIN/2, qint32_MIN/2, qint32_MAX, qint32_MAX);
......
......@@ -21,7 +21,6 @@
#include <QRect>
#include "kis_types.h"
#include "kis_image.h"
#include "kis_default_bounds_base.h"
class KisDefaultBounds;
......
......@@ -21,7 +21,6 @@
#include <QTransform>
#include <kis_debug.h>
#include "kis_debug.h"
namespace KisDomUtils {
......
......@@ -19,7 +19,6 @@
#ifndef _KIS_EFFECT_MASK_
#define _KIS_EFFECT_MASK_
#include "kis_types.h"
#include "kis_mask.h"
/**
* An effect mask is a single channel mask that applies a particular
......
......@@ -47,11 +47,9 @@
#include "kis_image.h"
#include "kis_layer.h"
#include "kis_paint_device.h"
#include "kis_painter.h"
#include "KoPattern.h"
#include "KoColorSpace.h"
#include "kis_transaction.h"
#include "kis_types.h"
#include "kis_pixel_selection.h"
......@@ -60,8 +58,6 @@
#include "kis_random_accessor_ng.h"
#include "KoColor.h"
#include "kis_selection.h"
#include "kis_selection_filters.h"
......
......@@ -23,7 +23,6 @@
#include <klocalizedstring.h>
#include "kis_types.h"
#include "KoGenericRegistry.h"
#include "KoID.h"
#include "kritaimage_export.h"
......
......@@ -21,10 +21,8 @@
#include "kis_fixed_point_maths.h"
#include "kis_filter_weights_buffer.h"
#include "kis_iterator_ng.h"
#include "kis_random_accessor_ng.h"
#include "kis_paint_device.h"
#include <KoColorSpace.h>
#include <KoMixColorsOp.h>
......
......@@ -21,6 +21,7 @@
#include "kis_fixed_point_maths.h"
#include "kis_filter_strategy.h"
#include "kis_debug.h"
#ifdef SANITY_CHECKS_ENABLED
static bool checkForAsymmetricZeros = false;
......
......@@ -20,7 +20,6 @@
#include <kritaimage_export.h>
#include <KoColorSpace.h>
#include "kis_global.h"
#include "kis_shared.h"
#include <kis_shared_ptr.h>
......
......@@ -22,7 +22,6 @@
#include "kritaimage_export.h"
#include "kis_mask_generator.h"
/**
......
......@@ -22,7 +22,6 @@
#include "kritaimage_export.h"
#include "kis_mask_generator.h"
/**
......
......@@ -20,6 +20,7 @@
#include "kis_convolution_kernel.h"
#include <kis_convolution_painter.h>
#include <QRect>
qreal KisGaussianKernel::sigmaFromRadius(qreal radius)
......
......@@ -24,9 +24,9 @@
#include <KoAbstractGradient.h>
#include <KoUpdater.h>
#include "kis_global.h"
#include "kis_paint_device.h"
#include "KoPattern.h"
#include "kis_types.h"
#include "kis_selection.h"
#include "kis_iterator_ng.h"
......
......@@ -22,7 +22,6 @@
#include <KoColor.h>
#include "kis_global.h"
#include "kis_types.h"
#include "kis_painter.h"
......
......@@ -27,7 +27,6 @@
#include <KoColor.h>
#include "kis_types.h"
#include "kis_node_visitor.h"
#include "kis_processing_visitor.h"
#include "kis_debug.h"
......
......@@ -21,7 +21,6 @@
#include <QVector>
#include "kis_types.h"
#include "kis_image.h"
#include "kis_paint_layer.h"
#include "kis_paint_device.h"
......
......@@ -36,7 +36,6 @@
#include "KoColorSpaceRegistry.h"
#include "KoColor.h"
#include "KoColorConversionTransformation.h"
#include "KoColorProfile.h"
#include <KoCompositeOpRegistry.h>
......@@ -52,13 +51,11 @@
#include "kis_layer.h"
#include "kis_meta_data_merge_strategy_registry.h"
#include "kis_name_server.h"
#include "kis_paint_device.h"
#include "kis_paint_layer.h"
#include "kis_painter.h"
#include "kis_perspective_grid.h"
#include "kis_selection.h"
#include "kis_transaction.h"
#include "kis_types.h"
#include "kis_meta_data_merge_strategy.h"
#include "kis_memory_statistics_server.h"
......
......@@ -33,7 +33,6 @@
#include "kis_shared.h"
#include "kis_node_graph_listener.h"
#include "kis_node_facade.h"
#include "kis_default_bounds.h"
#include "kis_image_interfaces.h"
#include <kritaimage_export.h>
......@@ -53,6 +52,7 @@ class KoColorProfile;
class KisPerspectiveGrid;
class KisLayerComposition;
class KisSpontaneousJob;
class KUndo2MagicString;
namespace KisMetaData
{
......
......@@ -19,7 +19,6 @@
#ifndef __KIS_IMAGE_BARRIER_LOCKER_H
#define __KIS_IMAGE_BARRIER_LOCKER_H
#include "kis_image.h"
class KisImageBarrierLocker {
......
......@@ -21,9 +21,9 @@
#include <QObject>
#include <QVector>
#include <QRectF>
#include "kritaimage_export.h"
#include "kis_types.h"
#include "kis_group_layer.h"
class KoColorSpace;
......
......@@ -22,13 +22,13 @@
#include "kritaimage_export.h"
#include "kis_types.h"
#include "kis_node.h"
class QBitArray;
class KisUndoAdapter;
class KisPostExecutionUndoAdapter;
class KisPainter;
class KUndo2MagicString;
class KoCompositeOp;
/**
* For classes that support indirect painting.
......
......@@ -20,6 +20,7 @@
#define __KIS_LEGACY_UNDO_ADAPTER_H
#include "kis_undo_adapter.h"
#include "kis_types.h"
/**
......
......@@ -3,7 +3,6 @@
#include "kis_paintop_preset.h"
#include "kis_paintop_settings.h"
#include "kis_properties_configuration.h"
......
......@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.b
*/
#ifndef _KIS_MASK_
#define _KIS_MASK_
......@@ -23,8 +23,8 @@
#include <QRect>
#include "kis_types.h"
#include "kis_node.h"
#include "kis_global.h"
#include "kis_node.h"
#include "kis_indirect_painting_support.h"
#include <kritaimage_export.h>
......
......@@ -28,8 +28,8 @@
#include <KoColorSpace.h>
#include "kis_types.h"
#include "kis_paint_device.h"
#include <new>
#include "kis_paint_device.h"
#ifdef _MSC_VER
#pragma warning(disable: 4290) // disable "C++ exception specification ignored" warning
......
......@@ -19,7 +19,6 @@
#ifndef __KIS_MERGE_WALKER_H
#define __KIS_MERGE_WALKER_H
#include "kis_node.h"
#include "kis_types.h"
#include "kis_base_rects_walker.h"
......
......@@ -41,6 +41,7 @@ typedef KisSafeReadList<KisNodeSP> KisSafeReadNodeList;
#include "kis_abstract_projection_plane.h"
#include "kis_projection_leaf.h"
#include "kis_undo_adapter.h"
/**
......