Commit cee2658d authored by Michael Abrahams's avatar Michael Abrahams

Clean includes and forward declarations in krita/ui

Summary: Done with Google cppclean

Reviewers: rempt

Reviewed By: rempt

Differential Revision: https://phabricator.kde.org/D374
parent bc292468
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "kis_bcontrast_benchmark.h" #include "kis_bcontrast_benchmark.h"
#include "kis_benchmark_values.h" #include "kis_benchmark_values.h"
#include "kis_paint_device.h"
#include <KoColorSpace.h> #include <KoColorSpace.h>
#include <KoColorSpaceRegistry.h> #include <KoColorSpaceRegistry.h>
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <QtTest> #include <QtTest>
#include <kis_paint_device.h> #include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor; class KoColor;
class KisBContrastBenchmark : public QObject class KisBContrastBenchmark : public QObject
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "kis_blur_benchmark.h" #include "kis_blur_benchmark.h"
#include "kis_benchmark_values.h" #include "kis_benchmark_values.h"
#include "kis_paint_device.h"
#include <KoColorSpace.h> #include <KoColorSpace.h>
#include <KoColorSpaceRegistry.h> #include <KoColorSpaceRegistry.h>
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <KoColor.h> #include <KoColor.h>
#include <kis_paint_device.h> #include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor; class KoColor;
class KisBlurBenchmark : public QObject class KisBlurBenchmark : public QObject
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <QTest> #include <QTest>
#include "testutil.h" #include "testutil.h"
#include "kis_selection.h"
#include "kis_transaction.h" #include "kis_transaction.h"
#include <KoCompositeOpRegistry.h> #include <KoCompositeOpRegistry.h>
#include "kis_datamanager.h" #include "kis_datamanager.h"
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <kundo2command.h> #include <kundo2command.h>
#include "kis_benchmark_values.h" #include "kis_benchmark_values.h"
#include "kis_paint_device.h"
#include "kis_random_accessor_ng.h" #include "kis_random_accessor_ng.h"
#include <KoColorSpace.h> #include <KoColorSpace.h>
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <QtTest> #include <QtTest>
#include <kis_paint_device.h> #include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor; class KoColor;
class KisFloodFillBenchmark : public QObject class KisFloodFillBenchmark : public QObject
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "kis_benchmark_values.h" #include "kis_benchmark_values.h"
#include "kis_paint_device.h"
#include "kis_random_accessor_ng.h" #include "kis_random_accessor_ng.h"
#include <KoColorSpace.h> #include <KoColorSpace.h>
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <QtTest> #include <QtTest>
#include <kis_paint_device.h> #include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor; class KoColor;
class KisGradientBenchmark : public QObject class KisGradientBenchmark : public QObject
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <QtTest> #include <QtTest>
class KisPaintDevice; class KisPaintDevice;
class KoColorSpace;
class KoColor; class KoColor;
class KoColorSpace;
class KisHLineIteratorBenchmark : public QObject class KisHLineIteratorBenchmark : public QObject
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <KoColor.h> #include <KoColor.h>
#include <kis_paint_device.h> #include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor; class KoColor;
class KisLevelFilterBenchmark : public QObject class KisLevelFilterBenchmark : public QObject
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <kis_types.h> #include <kis_types.h>
class KoColorSpace;
class KisPainterBenchmark : public QObject class KisPainterBenchmark : public QObject
{ {
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <QtTest> #include <QtTest>
class KisPaintDevice; class KisPaintDevice;
class KoColorSpace;
class KoColor; class KoColor;
class KoColorSpace;
class KisRandomIteratorBenchmark : public QObject class KisRandomIteratorBenchmark : public QObject
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <kis_image.h> #include <kis_image.h>
#include <kis_layer.h> #include <kis_layer.h>
class KoColorSpace;
const QString PRESET_FILE_NAME = "hairy-benchmark1.kpp"; const QString PRESET_FILE_NAME = "hairy-benchmark1.kpp";
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <QtTest> #include <QtTest>
class KisPaintDevice; class KisPaintDevice;
class KoColorSpace;
class KoColor; class KoColor;
class KoColorSpace;
class KisVLineIteratorBenchmark : public QObject class KisVLineIteratorBenchmark : public QObject
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <QDomDocument> #include <QDomDocument>
#include "abr_struct_parser.h" #include "abr_struct_parser.h"
#include "kis_abr_translator.h"
AbrStructParser::AbrStructParser() AbrStructParser::AbrStructParser()
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kis_abr_brush.h" #include "kis_abr_brush.h"
#include "kis_brush.h" #include "kis_abr_brush_collection.h"
#include <QDomElement> #include <QDomElement>
#include <QFile> #include <QFile>
......
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
#include "kis_types.h" #include "kis_types.h"
#include "kis_shared.h" #include "kis_shared.h"
#include "kis_paint_information.h" #include "kis_paint_information.h"
#include "kis_abr_brush_collection.h"
#include "kritabrush_export.h" #include "kritabrush_export.h"
class KisQImagemask; class KisQImagemask;
class KisAbrBrushCollection;
typedef KisSharedPtr<KisQImagemask> KisQImagemaskSP; typedef KisSharedPtr<KisQImagemask> KisQImagemaskSP;
class QString; class QString;
......
...@@ -32,7 +32,6 @@ class KisQImagemask; ...@@ -32,7 +32,6 @@ class KisQImagemask;
typedef KisSharedPtr<KisQImagemask> KisQImagemaskSP; typedef KisSharedPtr<KisQImagemask> KisQImagemaskSP;
class QString; class QString;
class QPoint;
class KoColor; class KoColor;
class KoColorSpace; class KoColorSpace;
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <kis_debug.h> #include <kis_debug.h>
#include "kis_brush_server.h" #include "kis_brush_server.h"
#include "kis_brush_factory.h"
#include "kis_auto_brush_factory.h" #include "kis_auto_brush_factory.h"
#include "kis_text_brush_factory.h" #include "kis_text_brush_factory.h"
#include "kis_predefined_brush_factory.h" #include "kis_predefined_brush_factory.h"
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "kritabrush_export.h" #include "kritabrush_export.h"
#include "kis_brush.h" #include "kis_brush.h"
class KoResource;
class KoResourceLoaderThread; class KoResourceLoaderThread;
typedef KoResourceServer<KisBrush, SharedPointerStoragePolicy<KisBrushSP> > KisBrushResourceServer; typedef KoResourceServer<KisBrush, SharedPointerStoragePolicy<KisBrushSP> > KisBrushResourceServer;
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include "kis_gbr_brush.h" #include "kis_gbr_brush.h"
#include "kis_brush.h"
#include <QDomElement> #include <QDomElement>
#include <QFile> #include <QFile>
#include <QImage> #include <QImage>
......
...@@ -38,9 +38,8 @@ ...@@ -38,9 +38,8 @@
#include "kis_global.h" #include "kis_global.h"
#include "kis_paint_device.h" #include "kis_paint_device.h"
#include "kis_brush.h"
#include "kis_layer.h" #include "kis_layer.h"
#include "kis_boundary.h"
/** /**
* The parasite info that gets loaded from the terribly documented gimp pipe brush parasite. * The parasite info that gets loaded from the terribly documented gimp pipe brush parasite.
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "kis_brush.h" #include "kis_brush.h"
#include "kritabrush_export.h" #include "kritabrush_export.h"
#include "kis_gbr_brush.h"
class KisTextBrushesPipe; class KisTextBrushesPipe;
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "kritaglobal_export.h" #include "kritaglobal_export.h"
class QIcon;
class QAbstractButton; class QAbstractButton;
class QComboBox; class QComboBox;
class QAction; class QAction;
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <QUuid> #include <QUuid>
#include "KoPattern.h" #include "KoPattern.h"
#include "kis_debug.h"
namespace KisAslWriterUtils { namespace KisAslWriterUtils {
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "kritapsd_export.h" #include "kritapsd_export.h"
class QDomDocument; class QDomDocument;
class QIODevice;
class KisAslObjectCatcher; class KisAslObjectCatcher;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <kis_types.h> #include <kis_types.h>
#include "kis_action.h"
#include "KisViewManager.h" #include "KisViewManager.h"
#include "kis_mainwindow_observer.h" #include "kis_mainwindow_observer.h"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <KoColorSpace.h> #include <KoColorSpace.h>
#include <KoChannelInfo.h> #include <KoChannelInfo.h>
#include <KoColor.h>
#include <kis_debug.h> #include <kis_debug.h>
#include <kis_types.h> #include <kis_types.h>
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "kis_paintop_registry.h" #include "kis_paintop_registry.h"
#include "kis_brush_based_paintop_settings.h" #include "kis_brush_based_paintop_settings.h"
#include "kis_brush_server.h" #include "kis_brush_server.h"
#include "kis_duplicateop_settings_widget.h"
K_PLUGIN_FACTORY_WITH_JSON(DefaultPaintOpsPluginFactory, "kritadefaultpaintops.json", registerPlugin<DefaultPaintOpsPlugin>();) K_PLUGIN_FACTORY_WITH_JSON(DefaultPaintOpsPluginFactory, "kritadefaultpaintops.json", registerPlugin<DefaultPaintOpsPlugin>();)
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include <kis_types.h> #include <kis_types.h>
#include <QPointF> #include <QPointF>
#include "kis_duplicateop_settings_widget.h"
class QDomElement; class QDomElement;
class KisDuplicateOpSettings : public KisBrushBasedPaintOpSettings class KisDuplicateOpSettings : public KisBrushBasedPaintOpSettings
{ {
......
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#include "kis_global.h" #include "kis_global.h"
#include "kis_paint_device.h" #include "kis_paint_device.h"
#include "kis_painter.h" #include "kis_painter.h"
#include "kis_types.h"
#include "kis_paintop.h"
#include "kis_selection.h" #include "kis_selection.h"
#include "kis_random_accessor_ng.h" #include "kis_random_accessor_ng.h"
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include "dyna_brush.h" #include "dyna_brush.h"
#include "kis_dyna_paintop_settings.h"
class KisPainter; class KisPainter;
class KisDynaPaintOpSettings;
class KisDynaPaintOp : public KisPaintOp class KisDynaPaintOp : public KisPaintOp
{ {
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <QDomDocument> #include <QDomDocument>
#include "kis_filterop_settings_widget.h"
#include <kis_filter_option.h> #include <kis_filter_option.h>
#include <filter/kis_filter.h> #include <filter/kis_filter.h>
......
...@@ -26,7 +26,6 @@ inline double drand48() ...@@ -26,7 +26,6 @@ inline double drand48()
#endif #endif
#include "hairy_brush.h" #include "hairy_brush.h"
#include "trajectory.h"
#include <KoColor.h> #include <KoColor.h>
#include <KoColorSpace.h> #include <KoColorSpace.h>
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <kis_brush_based_paintop_settings.h> #include <kis_brush_based_paintop_settings.h>
#include <kis_types.h> #include <kis_types.h>
class QPainter;
class KisHairyPaintOpSettings : public KisBrushBasedPaintOpSettings class KisHairyPaintOpSettings : public KisBrushBasedPaintOpSettings
{ {
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kis_brush_based_paintop.h" #include "kis_brush_based_paintop.h"
#include "kis_brush.h"
#include "kis_properties_configuration.h" #include "kis_properties_configuration.h"
#include "kis_brush_option.h" #include "kis_brush_option.h"
#include <kis_pressure_spacing_option.h> #include <kis_pressure_spacing_option.h>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
class KisPropertiesConfiguration; class KisPropertiesConfiguration;
class KisPressureSpacingOption; class KisPressureSpacingOption;
class KisDabCache;
/// Internal /// Internal
class TextBrushInitializationWorkaround class TextBrushInitializationWorkaround
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <kis_painter.h> #include <kis_painter.h>
#include <kis_types.h> #include <kis_types.h>
#include <kis_paintop.h> #include <kis_paintop.h>
#include <kis_node.h>
#include <kis_pressure_rotation_option.h> #include <kis_pressure_rotation_option.h>
#include <kis_pressure_opacity_option.h> #include <kis_pressure_opacity_option.h>
......
...@@ -30,13 +30,11 @@ ...@@ -30,13 +30,11 @@
#include "kis_sprayop_option.h" #include "kis_sprayop_option.h"
#include "random_gauss.h"
#include <QImage> #include <QImage>
#include <kis_brush.h> #include <kis_brush.h>
class KisPaintInformation; class KisPaintInformation;
class KisBrush; class RandomGauss;
class SprayBrush class SprayBrush
{ {
......
...@@ -36,7 +36,6 @@ const QString TANGENT_MIX_VAL = "Tangent/mixValue"; ...@@ -36,7 +36,6 @@ const QString TANGENT_MIX_VAL = "Tangent/mixValue";
//const QString TANGENT_DIR_MAX = "Tangent/directionMaximum"; //const QString TANGENT_DIR_MAX = "Tangent/directionMaximum";
class KisPropertiesConfiguration; class KisPropertiesConfiguration;
class KisPainter;
class KisTangentTiltOptionWidget; class KisTangentTiltOptionWidget;
class KisTangentTiltOption: public KisPaintOpOption//not really// class KisTangentTiltOption: public KisPaintOpOption//not really//
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <QAction> #include <QAction>
#include <QLabel>
#include <kactioncollection.h> #include <kactioncollection.h>
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
#include "kis_cursor.h" #include "kis_cursor.h"
#include "kis_config.h" #include "kis_config.h"
#include "kis_slider_spin_box.h" #include "kis_slider_spin_box.h"
#include "kundo2magicstring.h"
#define MAXIMUM_SMOOTHNESS_DISTANCE 1000.0 // 0..1000.0 == weight in gui #define MAXIMUM_SMOOTHNESS_DISTANCE 1000.0 // 0..1000.0 == weight in gui
#define MAXIMUM_MAGNETISM 1000 #define MAXIMUM_MAGNETISM 1000
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <QFormLayout> #include <QFormLayout>
#include <QStackedWidget> #include <QStackedWidget>
#include <kis_slider_spin_box.h> #include <kis_slider_spin_box.h>
#include <QLabel>
#include "kis_canvas2.h" #include "kis_canvas2.h"
#include "kis_cursor.h" #include "kis_cursor.h"
......
...@@ -22,11 +22,13 @@ ...@@ -22,11 +22,13 @@
#include <QCheckBox> #include <QCheckBox>
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
#include <QLabel>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>
#include "KoPointerEvent.h" #include "KoPointerEvent.h"
#include "kundo2magicstring.h"
#include "kis_cursor.h" #include "kis_cursor.h"
#include <kis_slider_spin_box.h> #include <kis_slider_spin_box.h>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <kis_config.h> #include <kis_config.h>
#include <kis_cursor.h> #include <kis_cursor.h>
#include <KisViewManager.h> #include <KisViewManager.h>
#include "kis_canvas_decoration.h"
KisToolGrid::KisToolGrid(KoCanvasBase * canvas) KisToolGrid::KisToolGrid(KoCanvasBase * canvas)
......