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 @@
#include "kis_bcontrast_benchmark.h"
#include "kis_benchmark_values.h"
#include "kis_paint_device.h"
#include <KoColorSpace.h>
#include <KoColorSpaceRegistry.h>
......
......@@ -25,8 +25,6 @@
#include <QtTest>
#include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor;
class KisBContrastBenchmark : public QObject
......
......@@ -21,7 +21,6 @@
#include "kis_blur_benchmark.h"
#include "kis_benchmark_values.h"
#include "kis_paint_device.h"
#include <KoColorSpace.h>
#include <KoColorSpaceRegistry.h>
......
......@@ -24,8 +24,6 @@
#include <KoColor.h>
#include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor;
class KisBlurBenchmark : public QObject
......
......@@ -22,7 +22,6 @@
#include <QTest>
#include "testutil.h"
#include "kis_selection.h"
#include "kis_transaction.h"
#include <KoCompositeOpRegistry.h>
#include "kis_datamanager.h"
......
......@@ -21,7 +21,6 @@
#include <kundo2command.h>
#include "kis_benchmark_values.h"
#include "kis_paint_device.h"
#include "kis_random_accessor_ng.h"
#include <KoColorSpace.h>
......
......@@ -25,8 +25,6 @@
#include <QtTest>
#include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor;
class KisFloodFillBenchmark : public QObject
......
......@@ -22,7 +22,6 @@
#include "kis_benchmark_values.h"
#include "kis_paint_device.h"
#include "kis_random_accessor_ng.h"
#include <KoColorSpace.h>
......
......@@ -25,8 +25,6 @@
#include <QtTest>
#include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor;
class KisGradientBenchmark : public QObject
......
......@@ -22,8 +22,8 @@
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
class KoColor;
class KoColorSpace;
class KisHLineIteratorBenchmark : public QObject
......
......@@ -24,8 +24,6 @@
#include <KoColor.h>
#include <kis_paint_device.h>
class KisPaintDevice;
class KoColorSpace;
class KoColor;
class KisLevelFilterBenchmark : public QObject
......
......@@ -26,7 +26,6 @@
#include <kis_types.h>
class KoColorSpace;
class KisPainterBenchmark : public QObject
{
......
......@@ -22,8 +22,8 @@
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
class KoColor;
class KoColorSpace;
class KisRandomIteratorBenchmark : public QObject
......
......@@ -27,7 +27,6 @@
#include <kis_image.h>
#include <kis_layer.h>
class KoColorSpace;
const QString PRESET_FILE_NAME = "hairy-benchmark1.kpp";
......
......@@ -22,8 +22,8 @@
#include <QtTest>
class KisPaintDevice;
class KoColorSpace;
class KoColor;
class KoColorSpace;
class KisVLineIteratorBenchmark : public QObject
......
......@@ -25,7 +25,6 @@
#include <QDomDocument>
#include "abr_struct_parser.h"
#include "kis_abr_translator.h"
AbrStructParser::AbrStructParser()
......
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_abr_brush.h"
#include "kis_brush.h"
#include "kis_abr_brush_collection.h"
#include <QDomElement>
#include <QFile>
......
......@@ -27,10 +27,10 @@
#include "kis_types.h"
#include "kis_shared.h"
#include "kis_paint_information.h"
#include "kis_abr_brush_collection.h"
#include "kritabrush_export.h"
class KisQImagemask;
class KisAbrBrushCollection;
typedef KisSharedPtr<KisQImagemask> KisQImagemaskSP;
class QString;
......
......@@ -32,7 +32,6 @@ class KisQImagemask;
typedef KisSharedPtr<KisQImagemask> KisQImagemaskSP;
class QString;
class QPoint;
class KoColor;
class KoColorSpace;
......
......@@ -27,7 +27,6 @@
#include <kis_debug.h>
#include "kis_brush_server.h"
#include "kis_brush_factory.h"
#include "kis_auto_brush_factory.h"
#include "kis_text_brush_factory.h"
#include "kis_predefined_brush_factory.h"
......
......@@ -28,7 +28,6 @@
#include "kritabrush_export.h"
#include "kis_brush.h"
class KoResource;
class KoResourceLoaderThread;
typedef KoResourceServer<KisBrush, SharedPointerStoragePolicy<KisBrushSP> > KisBrushResourceServer;
......
......@@ -26,8 +26,6 @@
#include "kis_gbr_brush.h"
#include "kis_brush.h"
#include <QDomElement>
#include <QFile>
#include <QImage>
......
......@@ -38,9 +38,8 @@
#include "kis_global.h"
#include "kis_paint_device.h"
#include "kis_brush.h"
#include "kis_layer.h"
#include "kis_boundary.h"
/**
* The parasite info that gets loaded from the terribly documented gimp pipe brush parasite.
......
......@@ -24,7 +24,6 @@
#include "kis_brush.h"
#include "kritabrush_export.h"
#include "kis_gbr_brush.h"
class KisTextBrushesPipe;
......
......@@ -21,7 +21,6 @@
#include "kritaglobal_export.h"
class QIcon;
class QAbstractButton;
class QComboBox;
class QAction;
......
......@@ -20,7 +20,6 @@
#include <QUuid>
#include "KoPattern.h"
#include "kis_debug.h"
namespace KisAslWriterUtils {
......
......@@ -22,7 +22,6 @@
#include "kritapsd_export.h"
class QDomDocument;
class QIODevice;
class KisAslObjectCatcher;
......
......@@ -36,6 +36,7 @@
#include <kis_types.h>
#include "kis_action.h"
#include "KisViewManager.h"
#include "kis_mainwindow_observer.h"
......
......@@ -28,6 +28,7 @@
#include <KoColorSpace.h>
#include <KoChannelInfo.h>
#include <KoColor.h>
#include <kis_debug.h>
#include <kis_types.h>
......
......@@ -35,6 +35,7 @@
#include "kis_paintop_registry.h"
#include "kis_brush_based_paintop_settings.h"
#include "kis_brush_server.h"
#include "kis_duplicateop_settings_widget.h"
K_PLUGIN_FACTORY_WITH_JSON(DefaultPaintOpsPluginFactory, "kritadefaultpaintops.json", registerPlugin<DefaultPaintOpsPlugin>();)
......
......@@ -27,8 +27,6 @@
#include <kis_types.h>
#include <QPointF>
#include "kis_duplicateop_settings_widget.h"
class QDomElement;
class KisDuplicateOpSettings : public KisBrushBasedPaintOpSettings
{
......
......@@ -30,8 +30,6 @@
#include "kis_global.h"
#include "kis_paint_device.h"
#include "kis_painter.h"
#include "kis_types.h"
#include "kis_paintop.h"
#include "kis_selection.h"
#include "kis_random_accessor_ng.h"
......
......@@ -25,9 +25,9 @@
#include "dyna_brush.h"
#include "kis_dyna_paintop_settings.h"
class KisPainter;
class KisDynaPaintOpSettings;
class KisDynaPaintOp : public KisPaintOp
{
......
......@@ -24,7 +24,6 @@
#include <QDomDocument>
#include "kis_filterop_settings_widget.h"
#include <kis_filter_option.h>
#include <filter/kis_filter.h>
......
......@@ -26,7 +26,6 @@ inline double drand48()
#endif
#include "hairy_brush.h"
#include "trajectory.h"
#include <KoColor.h>
#include <KoColorSpace.h>
......
......@@ -25,7 +25,6 @@
#include <kis_brush_based_paintop_settings.h>
#include <kis_types.h>
class QPainter;
class KisHairyPaintOpSettings : public KisBrushBasedPaintOpSettings
{
......
......@@ -16,7 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_brush_based_paintop.h"
#include "kis_brush.h"
#include "kis_properties_configuration.h"
#include "kis_brush_option.h"
#include <kis_pressure_spacing_option.h>
......
......@@ -30,6 +30,7 @@
class KisPropertiesConfiguration;
class KisPressureSpacingOption;
class KisDabCache;
/// Internal
class TextBrushInitializationWorkaround
......
......@@ -27,6 +27,7 @@
#include <kis_painter.h>
#include <kis_types.h>
#include <kis_paintop.h>
#include <kis_node.h>
#include <kis_pressure_rotation_option.h>
#include <kis_pressure_opacity_option.h>
......
......@@ -30,13 +30,11 @@
#include "kis_sprayop_option.h"
#include "random_gauss.h"
#include <QImage>
#include <kis_brush.h>
class KisPaintInformation;
class KisBrush;
class RandomGauss;
class SprayBrush
{
......
......@@ -36,7 +36,6 @@ const QString TANGENT_MIX_VAL = "Tangent/mixValue";
//const QString TANGENT_DIR_MAX = "Tangent/directionMaximum";
class KisPropertiesConfiguration;
class KisPainter;
class KisTangentTiltOptionWidget;
class KisTangentTiltOption: public KisPaintOpOption//not really//
......
......@@ -26,6 +26,7 @@
#include <klocalizedstring.h>
#include <QAction>
#include <QLabel>
#include <kactioncollection.h>
......@@ -35,6 +36,7 @@
#include "kis_cursor.h"
#include "kis_config.h"
#include "kis_slider_spin_box.h"
#include "kundo2magicstring.h"
#define MAXIMUM_SMOOTHNESS_DISTANCE 1000.0 // 0..1000.0 == weight in gui
#define MAXIMUM_MAGNETISM 1000
......
......@@ -26,6 +26,7 @@
#include <QFormLayout>
#include <QStackedWidget>
#include <kis_slider_spin_box.h>
#include <QLabel>
#include "kis_canvas2.h"
#include "kis_cursor.h"
......
......@@ -22,11 +22,13 @@
#include <QCheckBox>
#include <QDoubleSpinBox>
#include <QLabel>
#include <klocalizedstring.h>
#include <ksharedconfig.h>
#include "KoPointerEvent.h"
#include "kundo2magicstring.h"
#include "kis_cursor.h"
#include <kis_slider_spin_box.h>
......
......@@ -30,6 +30,7 @@
#include <kis_config.h>
#include <kis_cursor.h>
#include <KisViewManager.h>
#include "kis_canvas_decoration.h"
KisToolGrid::KisToolGrid(KoCanvasBase * canvas)
......
......@@ -25,10 +25,7 @@
class KisMainWindow;
class KisApplicationPrivate;
class KCmdLineArgs;
class QWidget;
class QStringList;
class QCommandLineParser;
class KisApplicationArguments;
#include <KisImportExportManager.h>
......
......@@ -63,7 +63,6 @@
#include <kfileitem.h>
#include <kdirnotify.h>
#include <QTemporaryFile>
#include "kundo2stack.h"
#include <kbackup.h>
#include <QApplication>
......
......@@ -26,7 +26,6 @@
#include "kritaui_export.h"
class QStringList;
class KisDocument;
class QPluginLoader;
/**
......
......@@ -21,7 +21,6 @@ Boston, MA 02110-1301, USA.
#include "KisImportExportManager.h" // KisImportExportManager::filterAvailable, private API
#include "KisDocumentEntry.h"
#include "KisFilterEntry.h"
#include "KisDocument.h"
#include "KisPart.h"
......
......@@ -22,7 +22,6 @@ Boston, MA 02110-1301, USA.
#include <KisFilterChain.h>
class QByteArray;
class KoUpdater;
namespace CalligraFilter {
......
......@@ -21,7 +21,6 @@ Boston, MA 02110-1301, USA.
#include "kritaui_export.h"
#include "KisFilterChain.h"
#include "KisFilterVertex.h"
#include <QByteArray>
#include <QHash>
......
......@@ -27,10 +27,10 @@ Boston, MA 02110-1301, USA.
#include <QByteArray>
#include <QUrl>
#include "KisFilterChain.h"
#include "KisFilterGraph.h"
#include "kritaui_export.h"
class KisFilterChain;
class KisDocument;
class KoProgressUpdater;
......
......@@ -103,7 +103,6 @@
#include "kis_canvas2.h"
#include "KisViewManager.h"
#include "KisDocument.h"
#include "KisView.h"
#include "dialogs/kis_dlg_preferences.h"
#include "kis_config_notifier.h"
#include "kis_canvas_resource_provider.h"
......
......@@ -24,7 +24,6 @@
#include <QPixmap>
#include <QList>
class KConfig;
class KisOpenPanePrivate;
class QPixmap;
class KisTemplatesPane;
......
......@@ -34,7 +34,6 @@
#include <kis_icon_utils.h>
#include "KisApplication.h"
#include "KisMainWindow.h"
#include "KisDocument.h"
#include "KisView.h"
#include "KisViewManager.h"
......@@ -48,7 +47,6 @@
#include <KoDialog.h>
#include <kdesktopfile.h>
#include <QMessageBox>
#include <klocalizedstring.h>
#include <kactioncollection.h>
#include <kconfig.h>
......
......@@ -29,8 +29,6 @@
#include <kis_types.h>
class QWidget;
/**
* A print job is an interface that the KisView uses to create an application-specific
* class that can take care of printing.
......
......@@ -98,7 +98,6 @@
#include <kis_image.h>
#include "kis_image_manager.h"
#include <kis_layer.h>
#include "KisMainWindow.h"
#include "kis_mainwindow_observer.h"
#include "kis_mask_manager.h"
#include "kis_mimedata.h"
......
......@@ -24,7 +24,6 @@
#include <QPointer>
#include <KisMainWindow.h>
#include <KisView.h>
#include <KoProgressUpdater.h>
#include <KoToolManager.h>
......@@ -32,18 +31,15 @@
#include <kis_types.h>
#include "kis_floating_message.h"
#include "KisView.h"
class KisAction;
class QPoint;
class KisView;
class KisCanvas2;
class KisCanvasResourceProvider;
class KisDocument;
class KisFilterManager;
class KisGridManager;
class KisImage;
class KisImageManager;
class KisNodeManager;
class KisPaintingAssistantsManager;
......
......@@ -23,6 +23,7 @@
#include <KisMainWindow.h>
#include <KisDocumentEntry.h>
#include <KisDocument.h>
#include <KisPart.h>
#include <KoPathShape.h>
#include <KoShapeController.h>
......
......@@ -26,7 +26,6 @@ class QRect;
class KoToolProxy;
class KisCanvas2;
class KisCanvasDecoration;
class KisDisplayFilter;
class KisDisplayColorConverter;
......
......@@ -18,8 +18,6 @@
#include "kis_canvas_decoration.h"
#include "KisView.h"
#include "kis_canvas2.h"
#include "kis_debug.h"
struct KisCanvasDecoration::Private {
......
......@@ -27,8 +27,6 @@
#include <kis_canvas2.h>
#include <KisView.h>
class QPoint;
class QRect;
class QRectF;
class QPainter;
class KisCoordinatesConverter;
......
......@@ -38,6 +38,7 @@
#include "kis_canvas2.h"
#include "../KisViewManager.h"
#include "../kis_selection_manager.h"
#include "../KisDocument.h"
struct KisCanvasWidgetBase::Private
{
......
......@@ -31,6 +31,7 @@ class QVariant;
class KisCoordinatesConverter;
class KisDisplayFilter;
class KisCanvas2;
#include "kritaui_export.h"
......
......@@ -25,9 +25,8 @@
#include <opengl/kis_opengl.h>
#include <kritaui_export.h>
#include "kis_exposure_gamma_correction_interface.h"
class KisExposureGammaCorrectionInterface;
/**
* @brief The KisDisplayFilter class is the base class for filters that
......
......@@ -35,7 +35,6 @@
#include "KisViewManager.h"
#include "KisDocument.h"