diff --git a/krita/plugins/extensions/resourcemanager/resourcebundle_manifest.h b/krita/plugins/extensions/resourcemanager/resourcebundle_manifest.h index 1d3c29235c9..d3c6c683e39 100644 --- a/krita/plugins/extensions/resourcemanager/resourcebundle_manifest.h +++ b/krita/plugins/extensions/resourcemanager/resourcebundle_manifest.h @@ -1,97 +1,96 @@ /* This file is part of the KDE project Copyright (C) 2014, Victor Lafon This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #ifndef KOXMLRESOURCEBUNDLEMANIFEST_H #define KOXMLRESOURCEBUNDLEMANIFEST_H #include #include #include -#include "krita_export.h" class ResourceBundleManifest { public: struct ResourceReference { ResourceReference(const QString &_resourcePath, const QList &_tagList, const QString &_fileTypeName, const QByteArray &_md5) { resourcePath = _resourcePath; tagList = _tagList; fileTypeName = _fileTypeName; md5sum = _md5; } QString resourcePath; QList tagList; QString fileTypeName; QByteArray md5sum; }; /** * @brief ResourceBundleManifest : Ctor * @param xmlName the name of the XML file to be created */ ResourceBundleManifest(); /** * @brief ~ResourceBundleManifest : Dtor */ virtual ~ResourceBundleManifest(); /** * @brief load the ResourceBundleManifest from the given device */ bool load(QIODevice *device); /** * @brief save the ResourceBundleManifest to the given device */ bool save(QIODevice *device); /** * @brief addTag : Add a file tag as a child of the fileType tag. * @param fileType the type of the file to be added * @param fileName the name of the file to be added * @param emptyFile true if the file is empty * @return the element corresponding to the created tag. */ void addResource(const QString &fileType, const QString &fileName, const QStringList &tagFileList, const QByteArray &md5); QStringList types() const; QStringList tags() const; QList files(const QString &type = QString()) const; /** * @brief removeFile : remove a file from the manifest * @param fileName : the name of the file to be removed * @return the list of resource tags to be removed from meta file. */ void removeFile(QString fileName); private: QMap > m_resources; }; #endif // KOXMLRESOURCEBUNDLEMANIFEST_H diff --git a/krita/plugins/paintops/chalk/kis_chalkop_option.h b/krita/plugins/paintops/chalk/kis_chalkop_option.h index 8a346d0aed7..d61a4d260ac 100644 --- a/krita/plugins/paintops/chalk/kis_chalkop_option.h +++ b/krita/plugins/paintops/chalk/kis_chalkop_option.h @@ -1,70 +1,69 @@ /* * Copyright (c) 2008,2010 Lukáš Tvrdý * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_CHALKOP_OPTION_H #define KIS_CHALKOP_OPTION_H #include -#include const QString CHALK_RADIUS = "Chalk/radius"; const QString CHALK_INK_DEPLETION = "Chalk/inkDepletion"; const QString CHALK_USE_OPACITY = "Chalk/opacity"; const QString CHALK_USE_SATURATION = "Chalk/saturation"; class KisChalkOpOptionsWidget; class KisChalkOpOption : public KisPaintOpOption { public: KisChalkOpOption(); ~KisChalkOpOption(); void setRadius(int radius) const; int radius() const; bool inkDepletion() const; bool saturation() const; bool opacity() const; void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); private: KisChalkOpOptionsWidget * m_options; }; class ChalkProperties { public: int radius; bool inkDepletion; bool useOpacity; bool useSaturation; void readOptionSetting(const KisPropertiesConfiguration* settings) { radius = settings->getInt(CHALK_RADIUS); inkDepletion = settings->getBool(CHALK_INK_DEPLETION); useOpacity = settings->getBool(CHALK_USE_OPACITY); useSaturation = settings->getBool(CHALK_USE_SATURATION); } }; #endif diff --git a/krita/plugins/paintops/curvebrush/kis_curve_line_option.h b/krita/plugins/paintops/curvebrush/kis_curve_line_option.h index a296342ab99..6c045bf619d 100644 --- a/krita/plugins/paintops/curvebrush/kis_curve_line_option.h +++ b/krita/plugins/paintops/curvebrush/kis_curve_line_option.h @@ -1,65 +1,64 @@ /* * Copyright (c) 2011 Lukáš Tvrdý * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_CURVE_LINE_OPTION_H #define KIS_CURVE_LINE_OPTION_H #include -#include class KisCurveOpOptionsWidget; // new rewrite const QString CURVE_LINE_WIDTH = "Curve/lineWidth"; // same as in sketch const QString CURVE_PAINT_CONNECTION_LINE = "Curve/makeConnection"; // same as in sketch const QString CURVE_STROKE_HISTORY_SIZE = "Curve/strokeHistorySize"; const QString CURVE_SMOOTHING = "Curve/smoothing"; const QString CURVE_CURVES_OPACITY = "Curve/curvesOpacity"; class KisCurveOpOption : public KisPaintOpOption { public: KisCurveOpOption(); ~KisCurveOpOption(); void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); private: KisCurveOpOptionsWidget * m_options; }; class CurveProperties { public: int lineWidth; int historySize; qreal curvesOpacity; bool paintConnectionLine; bool smoothing; void readOptionSetting(const KisPropertiesConfiguration* settings) { lineWidth = settings->getInt(CURVE_LINE_WIDTH); historySize = settings->getInt(CURVE_STROKE_HISTORY_SIZE); paintConnectionLine = settings->getBool(CURVE_PAINT_CONNECTION_LINE); smoothing = settings->getBool(CURVE_SMOOTHING); curvesOpacity = settings->getDouble(CURVE_CURVES_OPACITY); } }; #endif diff --git a/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h b/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h index 3b1164a218d..820b2c075c9 100644 --- a/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h +++ b/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h @@ -1,62 +1,61 @@ /* * Copyright (c) 2008 Boudewijn Rempt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_DUPLICATEOP_OPTION_H #define KIS_DUPLICATEOP_OPTION_H #include -#include const QString DUPLICATE_HEALING = "Duplicateop/Healing"; const QString DUPLICATE_CORRECT_PERSPECTIVE = "Duplicateop/CorrectPerspective"; const QString DUPLICATE_MOVE_SOURCE_POINT = "Duplicateop/MoveSourcePoint"; const QString DUPLICATE_CLONE_FROM_PROJECTION = "Duplicateop/CloneFromProjection"; class KisDuplicateOpOptionsWidget; class KisDuplicateOpOption : public KisPaintOpOption { public: KisDuplicateOpOption(); ~KisDuplicateOpOption(); bool healing() const; void setHealing(bool healing); bool correctPerspective() const; void setPerspective(bool perspective); bool moveSourcePoint() const; void setMoveSourcePoint(bool move); bool cloneFromProjection() const; void setCloneFromProjection(bool cloneFromProjection); void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); void setImage(KisImageWSP image); private: KisDuplicateOpOptionsWidget * m_optionWidget; }; #endif diff --git a/krita/plugins/paintops/deform/kis_deform_option.h b/krita/plugins/paintops/deform/kis_deform_option.h index 2e7ea13cc98..b943d16f4fb 100644 --- a/krita/plugins/paintops/deform/kis_deform_option.h +++ b/krita/plugins/paintops/deform/kis_deform_option.h @@ -1,54 +1,53 @@ /* * Copyright (c) 2010 Lukáš Tvrdý * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_DEFORM_OPTION_H #define KIS_DEFORM_OPTION_H #include -#include class KisDeformOptionsWidget; const QString DEFORM_AMOUNT = "Deform/deformAmount"; const QString DEFORM_ACTION = "Deform/deformAction"; const QString DEFORM_USE_BILINEAR = "Deform/bilinear"; const QString DEFORM_USE_MOVEMENT_PAINT = "Deform/useMovementPaint"; const QString DEFORM_USE_COUNTER = "Deform/useCounter"; const QString DEFORM_USE_OLD_DATA = "Deform/useOldData"; class KisDeformOption : public KisPaintOpOption { public: KisDeformOption(); ~KisDeformOption(); double deformAmount() const; int deformAction() const; bool bilinear() const; bool useMovementPaint() const; bool useCounter() const; bool useOldData() const; void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); private: KisDeformOptionsWidget * m_options; }; #endif diff --git a/krita/plugins/paintops/experiment/kis_experimentop_option.h b/krita/plugins/paintops/experiment/kis_experimentop_option.h index 81fa352a27a..00ff3b146ad 100644 --- a/krita/plugins/paintops/experiment/kis_experimentop_option.h +++ b/krita/plugins/paintops/experiment/kis_experimentop_option.h @@ -1,82 +1,81 @@ /* * Copyright (c) 2010 Lukáš Tvrdý * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_EXPERIMENTOP_OPTION_H #define KIS_EXPERIMENTOP_OPTION_H #include -#include const QString EXPERIMENT_DISPLACEMENT_ENABLED = "Experiment/displacementEnabled"; const QString EXPERIMENT_DISPLACEMENT_VALUE = "Experiment/displacement"; const QString EXPERIMENT_SMOOTHING_ENABLED = "Experiment/smoothing"; const QString EXPERIMENT_SMOOTHING_VALUE = "Experiment/smoothingValue"; const QString EXPERIMENT_SPEED_ENABLED = "Experiment/speedEnabled"; const QString EXPERIMENT_SPEED_VALUE = "Experiment/speed"; const QString EXPERIMENT_WINDING_FILL = "Experiment/windingFill"; const QString EXPERIMENT_HARD_EDGE = "Experiment/hardEdge"; class KisExperimentOpOptionsWidget; class KisExperimentOpOption : public KisPaintOpOption { Q_OBJECT public: KisExperimentOpOption(); ~KisExperimentOpOption(); void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); private Q_SLOTS: void enableSpeed(qreal value); void enableSmooth(qreal value); void enableDisplacement(qreal value); private: KisExperimentOpOptionsWidget * m_options; }; class ExperimentOption { public: bool isDisplacementEnabled; qreal displacement; bool isSpeedEnabled; qreal speed; bool isSmoothingEnabled; qreal smoothing; bool windingFill; bool hardEdge; void readOptionSetting(const KisPropertiesConfiguration* setting) { isDisplacementEnabled = setting->getBool(EXPERIMENT_DISPLACEMENT_ENABLED); displacement = setting->getDouble(EXPERIMENT_DISPLACEMENT_VALUE, 50.0); isSpeedEnabled = setting->getBool(EXPERIMENT_SPEED_ENABLED); speed = setting->getDouble(EXPERIMENT_SPEED_VALUE, 50.0); isSmoothingEnabled = setting->getBool(EXPERIMENT_SMOOTHING_ENABLED); smoothing = setting->getDouble(EXPERIMENT_SMOOTHING_VALUE, 20.0); windingFill = setting->getBool(EXPERIMENT_WINDING_FILL); hardEdge = setting->getBool(EXPERIMENT_HARD_EDGE); } }; #endif diff --git a/krita/plugins/paintops/gridbrush/kis_gridop_option.h b/krita/plugins/paintops/gridbrush/kis_gridop_option.h index fc3f86e210b..0a9a2e22ea6 100644 --- a/krita/plugins/paintops/gridbrush/kis_gridop_option.h +++ b/krita/plugins/paintops/gridbrush/kis_gridop_option.h @@ -1,66 +1,65 @@ /* * Copyright (c) 2009,2010 Lukáš Tvrdý (lukast.dev@gmail.com) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_GRIDOP_OPTION_H #define KIS_GRIDOP_OPTION_H #include -#include const QString GRID_WIDTH = "Grid/gridWidth"; const QString GRID_HEIGHT = "Grid/gridHeight"; const QString GRID_DIVISION_LEVEL = "Grid/divisionLevel"; const QString GRID_PRESSURE_DIVISION = "Grid/pressureDivision"; const QString GRID_SCALE = "Grid/scale"; const QString GRID_VERTICAL_BORDER = "Grid/verticalBorder"; const QString GRID_HORIZONTAL_BORDER = "Grid/horizontalBorder"; const QString GRID_RANDOM_BORDER = "Grid/randomBorder"; class KisGridOpOptionsWidget; class KisGridOpOption : public KisPaintOpOption { public: KisGridOpOption(); ~KisGridOpOption(); int gridWidth() const; void setWidth(int width) const; int gridHeight() const; void setHeight(int height) const; int divisionLevel() const; bool pressureDivision() const; qreal scale() const; qreal vertBorder() const; qreal horizBorder() const; bool randomBorder() const; void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); private: KisGridOpOptionsWidget * m_options; }; #endif diff --git a/krita/plugins/paintops/hairy/kis_hairy_bristle_option.h b/krita/plugins/paintops/hairy/kis_hairy_bristle_option.h index 4af9c987e9b..d2cf404e537 100644 --- a/krita/plugins/paintops/hairy/kis_hairy_bristle_option.h +++ b/krita/plugins/paintops/hairy/kis_hairy_bristle_option.h @@ -1,58 +1,57 @@ /* * Copyright (c) 2010 Lukáš Tvrdý * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_HAIRY_BRISTLE_OPTION_H #define KIS_HAIRY_BRISTLE_OPTION_H #include -#include const QString HAIRY_BRISTLE_USE_MOUSEPRESSURE = "HairyBristle/useMousePressure"; const QString HAIRY_BRISTLE_SCALE = "HairyBristle/scale"; const QString HAIRY_BRISTLE_SHEAR = "HairyBristle/shear"; const QString HAIRY_BRISTLE_RANDOM = "HairyBristle/random"; const QString HAIRY_BRISTLE_DENSITY = "HairyBristle/density"; const QString HAIRY_BRISTLE_THRESHOLD = "HairyBristle/threshold"; const QString HAIRY_BRISTLE_ANTI_ALIASING = "HairyBristle/antialias"; const QString HAIRY_BRISTLE_USE_COMPOSITING = "HairyBristle/useCompositing"; const QString HAIRY_BRISTLE_CONNECTED = "HairyBristle/isConnected"; class KisBristleOptionsWidget; class KisHairyBristleOption : public KisPaintOpOption { public: KisHairyBristleOption(); ~KisHairyBristleOption(); void setScaleFactor(qreal scale) const; bool useMousePressure() const; double scaleFactor() const; double shearFactor() const; double randomFactor() const; void writeOptionSetting(KisPropertiesConfiguration* config) const; void readOptionSetting(const KisPropertiesConfiguration* config); private: KisBristleOptionsWidget * m_options; }; #endif // KIS_HAIRY_BRISTLE_OPTION_H diff --git a/krita/plugins/paintops/hairy/kis_hairy_ink_option.h b/krita/plugins/paintops/hairy/kis_hairy_ink_option.h index 387a13a07e9..94a40ddc185 100644 --- a/krita/plugins/paintops/hairy/kis_hairy_ink_option.h +++ b/krita/plugins/paintops/hairy/kis_hairy_ink_option.h @@ -1,64 +1,63 @@ /* This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef KIS_HAIRY_INK_OPTION_H #define KIS_HAIRY_INK_OPTION_H #include -#include const QString HAIRY_INK_DEPLETION_ENABLED = "HairyInk/enabled"; const QString HAIRY_INK_AMOUNT = "HairyInk/inkAmount"; const QString HAIRY_INK_USE_SATURATION = "HairyInk/useSaturation"; const QString HAIRY_INK_USE_OPACITY = "HairyInk/useOpacity"; const QString HAIRY_INK_USE_WEIGHTS = "HairyInk/useWeights"; const QString HAIRY_INK_PRESSURE_WEIGHT = "HairyInk/pressureWeights"; const QString HAIRY_INK_BRISTLE_LENGTH_WEIGHT = "HairyInk/bristleLengthWeights"; const QString HAIRY_INK_BRISTLE_INK_AMOUNT_WEIGHT = "HairyInk/bristleInkAmountWeight"; const QString HAIRY_INK_DEPLETION_WEIGHT = "HairyInk/inkDepletionWeight"; const QString HAIRY_INK_DEPLETION_CURVE = "HairyInk/inkDepletionCurve"; const QString HAIRY_INK_SOAK = "HairyInk/soak"; class KisInkOptionsWidget; class KisHairyInkOption : public KisPaintOpOption { public: KisHairyInkOption(); ~KisHairyInkOption(); int inkAmount() const; QList curve() const; bool useSaturation() const; bool useOpacity() const; bool useWeights() const; int pressureWeight() const; int bristleLengthWeight() const; int bristleInkAmountWeight() const; int inkDepletionWeight() const; int m_curveSamples; void writeOptionSetting(KisPropertiesConfiguration* config) const; void readOptionSetting(const KisPropertiesConfiguration* config); private: KisInkOptionsWidget * m_options; }; #endif // KIS_HAIRY_SHAPE_OPTION_H diff --git a/krita/plugins/paintops/hairy/kis_hairy_shape_option.h b/krita/plugins/paintops/hairy/kis_hairy_shape_option.h index 1467a00317a..3bcfaffd277 100644 --- a/krita/plugins/paintops/hairy/kis_hairy_shape_option.h +++ b/krita/plugins/paintops/hairy/kis_hairy_shape_option.h @@ -1,52 +1,51 @@ /* * Copyright (c) 2008-2010 Lukáš Tvrdý * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_HAIRY_SHAPE_OPTION_H #define KIS_HAIRY_SHAPE_OPTION_H #include -#include const QString HAIRY_RADIUS = "Hairy/radius"; const QString HAIRY_SIGMA = "Hairy/sigma"; const QString HAIRY_IS_DIMENSION_1D = "Hairy/isDimension1D"; class KisShapeOptionsWidget; class KisHairyShapeOption : public KisPaintOpOption { public: KisHairyShapeOption(); ~KisHairyShapeOption(); void setRadius(int radius) const; void setScaleFactor(qreal scale) const; int radius() const; double sigma() const; bool isbrushDimension1D() const; bool useMousePressure() const; void writeOptionSetting(KisPropertiesConfiguration* config) const; void readOptionSetting(const KisPropertiesConfiguration* config); private: KisShapeOptionsWidget * m_options; }; #endif // KIS_HAIRY_SHAPE_OPTION_H diff --git a/krita/plugins/paintops/hatching/kis_hatching_options.h b/krita/plugins/paintops/hatching/kis_hatching_options.h index 683b7f0d120..e072c6cf83e 100644 --- a/krita/plugins/paintops/hatching/kis_hatching_options.h +++ b/krita/plugins/paintops/hatching/kis_hatching_options.h @@ -1,43 +1,42 @@ /* * Copyright (c) 2008 Lukas Tvrdy * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_HATCHING_OPTIONS_H #define KIS_HATCHING_OPTIONS_H #include -#include class KisHatchingOptionsWidget; class KisHatchingOptions : public KisPaintOpOption { public: KisHatchingOptions(); ~KisHatchingOptions(); void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); private: KisHatchingOptionsWidget * m_options; }; #endif diff --git a/krita/plugins/paintops/hatching/kis_hatching_preferences.h b/krita/plugins/paintops/hatching/kis_hatching_preferences.h index 4fb9fb18946..9a4bd91fdfe 100644 --- a/krita/plugins/paintops/hatching/kis_hatching_preferences.h +++ b/krita/plugins/paintops/hatching/kis_hatching_preferences.h @@ -1,42 +1,41 @@ /* * Copyright (c) 2010 José Luis Vergara * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_HATCHING_PREFERENCES_H #define KIS_HATCHING_PREFERENCES_H #include -#include class KisHatchingPreferencesWidget; class KisHatchingPreferences : public KisPaintOpOption { public: KisHatchingPreferences(); ~KisHatchingPreferences(); void writeOptionSetting(KisPropertiesConfiguration* setting) const; void readOptionSetting(const KisPropertiesConfiguration* setting); private: KisHatchingPreferencesWidget * m_options; }; #endif diff --git a/krita/plugins/paintops/hatching/kis_hatching_pressure_crosshatching_option.h b/krita/plugins/paintops/hatching/kis_hatching_pressure_crosshatching_option.h index 905df815946..2baf7a44ca4 100644 --- a/krita/plugins/paintops/hatching/kis_hatching_pressure_crosshatching_option.h +++ b/krita/plugins/paintops/hatching/kis_hatching_pressure_crosshatching_option.h @@ -1,38 +1,37 @@ /* * Copyright (c) 2010 José Luis Vergara * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_HATCHING_PRESSURE_CROSSHATCHING_OPTION_H #define KIS_HATCHING_PRESSURE_CROSSHATCHING_OPTION_H #include "kis_curve_option.h" #include -#include /** * The pressure crosshatching option defines a curve that is used to * calculate the effect of pressure (or other parameters) on * crosshatching in the hatching brush */ class KisHatchingPressureCrosshatchingOption : public KisCurveOption { public: KisHatchingPressureCrosshatchingOption(); double apply(const KisPaintInformation & info) const; }; #endif diff --git a/krita/plugins/paintops/hatching/kis_hatching_pressure_separation_option.h b/krita/plugins/paintops/hatching/kis_hatching_pressure_separation_option.h index 007a973b116..bf6076e89d6 100644 --- a/krita/plugins/paintops/hatching/kis_hatching_pressure_separation_option.h +++ b/krita/plugins/paintops/hatching/kis_hatching_pressure_separation_option.h @@ -1,39 +1,38 @@ /* * Copyright (c) 2010 José Luis Vergara * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_HATCHING_PRESSURE_SEPARATION_OPTION_H #define KIS_HATCHING_PRESSURE_SEPARATION_OPTION_H #include "kis_curve_option.h" #include -#include /** * The pressure separation option defines a curve that is used to * calculate the effect of pressure (or other parameters) on * separation in the hatching brush */ class KisHatchingPressureSeparationOption : public KisCurveOption { public: KisHatchingPressureSeparationOption(); double apply(const KisPaintInformation & info) const; }; #endif diff --git a/krita/plugins/paintops/hatching/kis_hatching_pressure_thickness_option.h b/krita/plugins/paintops/hatching/kis_hatching_pressure_thickness_option.h index 310df0e5ed1..fea369b6f71 100644 --- a/krita/plugins/paintops/hatching/kis_hatching_pressure_thickness_option.h +++ b/krita/plugins/paintops/hatching/kis_hatching_pressure_thickness_option.h @@ -1,38 +1,37 @@ /* * Copyright (c) 2010 José Luis Vergara * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * 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. */ #ifndef KIS_HATCHING_PRESSURE_THICKNESS_OPTION_H #define KIS_HATCHING_PRESSURE_THICKNESS_OPTION_H #include "kis_curve_option.h" #include -#include /** * The pressure thickness option defines a curve that is used to * calculate the effect of pressure (or other parameters) on * thickness in the hatching brush */ class KisHatchingPressureThicknessOption : public KisCurveOption { public: KisHatchingPressureThicknessOption(); double apply(const KisPaintInformation & info) const; }; #endif