Commit 2b1d2752 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Fix some headers

svn path=/trunk/koffice/; revision=850383
parent 4b9e7598
......@@ -27,7 +27,7 @@ class KoStore;
// Change the following two lines to switch (at compiletime) to another datamanager
//#define USE_OLD_TILESYSTEM
#include "config-tiles.h" // For the next define
#include <config-tiles.h> // For the next define
#ifdef USE_OLD_TILESYSTEM
......
......@@ -28,22 +28,18 @@
#include <klocale.h>
#include "KoColorSpaceRegistry.h"
#include <KoColorSpace.h>
#include <KoColorProfile.h>
#include <KoCompositeOp.h>
#include "kis_debug.h"
#include "kis_image.h"
#include "kis_selection.h"
#include "kis_painter.h"
#include "kis_undo_adapter.h"
#include "kis_iterators_pixel.h"
#include "kis_paint_device.h"
#include "KoColorSpaceRegistry.h"
#include "kis_datamanager.h"
#include "kis_undo_adapter.h"
#include "kis_effect_mask.h"
#include "kis_transparency_mask.h"
#include "kis_mask.h"
......
......@@ -21,7 +21,7 @@
#include "kis_random_accessor.h"
#include "config-tiles.h" // For the next define
#include <config-tiles.h> // For the next define
#ifdef USE_OLD_TILESYSTEM
#include "tiles/kis_tiled_random_accessor.h"
#else
......
......@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KIS_CURVE_ITERATOR_H
#define KIS_CURVE_ITERATOR_H
#ifndef KIS_RANDOM_SUB_ACCESSOR_H
#define KIS_RANDOM_SUB_ACCESSOR_H
#include "kis_random_accessor.h"
......
......@@ -41,10 +41,7 @@
#include "kis_clone_layer.h"
#include "kis_processing_information.h"
#include "kis_node.h"
#include "kis_image.h"
#include "kis_projection.h"
#include "kis_layer.h"
#include "kis_group_layer.h"
namespace {
/**
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KIS_TILE_COMMAND_H_
#define KIS_TILE_COMMAND_H_
#ifndef KIS_TRANSACTION_H_
#define KIS_TRANSACTION_H_
#include <QString>
#include <QUndoCommand>
......
......@@ -18,8 +18,6 @@
#include "kis_legacy_importer.h"
#include <kis_legacy_importer.h>
/*
struct ExifToKMD {
QString exivPrefix;
......
......@@ -15,6 +15,8 @@
* 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_META_DATA_FILTER_P_H
#define KIS_META_DATA_FILTER_P_H
#include "kis_meta_data_filter.h"
......@@ -45,3 +47,4 @@ namespace KisMetaData {
virtual void filter(KisMetaData::Store*) const;
};
}
#endif
\ No newline at end of file
......@@ -15,6 +15,8 @@
* 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_META_DATA_MERGE_STRATEGY_P_H
#define KIS_META_DATA_MERGE_STRATEGY_P_H
#include "kis_meta_data_merge_strategy.h"
......@@ -69,3 +71,4 @@ namespace KisMetaData {
Value election(QList<const Store*> srcs, QList<double> score, const QString & key ) const;
};
}
#endif
\ No newline at end of file
......@@ -20,8 +20,6 @@
#include <assert.h>
#include <kis_debug.h>
#include "kis_debug.h"
#include "kis_tileddatamanager.h"
#include "kis_tilemanager.h"
......
......@@ -20,8 +20,6 @@
#include <q3valuevector.h>
#include <kis_debug.h>
#include <KoStore.h>
#include "kis_global.h"
......
......@@ -20,7 +20,7 @@
#include <qglobal.h>
#include <q3valuevector.h>
#include <qvector.h>
#include <QVector>
#include <kis_shared.h>
#include <kis_shared_ptr.h>
......
......@@ -53,7 +53,6 @@
#include <KoProgressUpdater.h>
#include <KoDocumentSectionView.h>
#include <kis_image.h>
#include <kis_debug.h>
#include <kis_doc2.h>
#include <filter/kis_filter_registry.h>
......@@ -64,7 +63,6 @@
#include <kis_selection.h>
#include <kis_types.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
#include <kis_processing_information.h>
#include <kis_node_model.h>
......
......@@ -42,7 +42,6 @@
#include <KoColorSpace.h>
#include <KoColorTransformation.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
#include <kis_processing_information.h>
#include <kis_doc2.h>
......@@ -51,7 +50,6 @@
#include <kis_global.h>
#include <kis_types.h>
#include <kis_iterators_pixel.h>
#include <kis_painter.h>
#include <kis_selection.h>
#include "kis_histogram.h"
#include "kis_hsv_adjustment_filter.h"
......
......@@ -17,8 +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. */
#ifndef BRIGHTNESSCONTRAST_H
#define BRIGHTNESSCONTRAST_H
#ifndef COLORSFILTERS_H
#define COLORSFILTERS_H
#include <kparts/plugin.h>
#include "kis_perchannel_filter.h"
......
......@@ -18,8 +18,8 @@
*/
#ifndef _KIS_HSV_ADJUSTEMENT_FILTER_H_
#define _KIS_HSV_ADJUSTEMENT_FILTER_H_
#ifndef _KIS_HSV_ADJUSTMENT_FILTER_H_
#define _KIS_HSV_ADJUSTMENT_FILTER_H_
#include <QList>
......@@ -54,7 +54,7 @@ public:
) const;
static inline KoID id() { return KoID("hsvadjustment", i18n("HSV Adjustment")); }
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
};
......
......@@ -35,9 +35,7 @@
#include <KoProgressUpdater.h>
#include "kis_bookmarked_configuration_manager.h"
#include "filter/kis_filter_configuration.h"
#include "filter/kis_filter_config_widget.h"
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
......
......@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef EXAMPLE_H
#define EXAMPLE_H
#ifndef IMAGEENHANCEMENT_H
#define IMAGEENHANCEMENT_H
#include <kparts/plugin.h>
......
......@@ -17,7 +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 "kgradientslider.h"
// C++ includes.
#include <cmath>
......@@ -33,13 +34,13 @@
// Local includes.
#include "kgradientslider.h"
KGradientSlider::KGradientSlider(QWidget *parent)
: QWidget(parent)
{
m_dragging = false;
setMouseTracking(true);
setMaximumSize(255, 28);
......@@ -61,7 +62,7 @@ void KGradientSlider::paintEvent(QPaintEvent *)
int wHeight = height();
int gradientHeight = (wHeight / 3);
// A QPixmap is used for enable the double buffering.
/*if (!m_dragging) {*/
QPainter p1(this);
......@@ -75,7 +76,7 @@ void KGradientSlider::paintEvent(QPaintEvent *)
p1.setPen(QColor(gray, gray, gray));
p1.drawLine(x, y, x, y + gradientHeight - 1);
}
// Draw second gradient
y = (wHeight / 3);
if (m_blackcursor > 0) {
......@@ -124,10 +125,10 @@ void KGradientSlider::mousePressEvent ( QMouseEvent * e )
{
eCursor closest_cursor;
int distance;
if (e->button() != Qt::LeftButton)
return;
unsigned int x = e->pos().x();
distance = 1000; // just a big number
......
......@@ -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 "kis_level_filter.h"
#include <math.h>
......@@ -33,7 +34,7 @@
#include <KoColorTransformation.h>
#include <KoProgressUpdater.h>
#include "kis_level_filter.h"
#include "kis_paint_device.h"
#include "kis_iterators_pixel.h"
#include "kis_iterator.h"
......
......@@ -36,7 +36,6 @@
#include <KoProgressUpdater.h>
#include <kis_painter.h>
#include <kis_doc2.h>
#include <kis_debug.h>
#include <kis_image.h>
......@@ -75,7 +74,7 @@ void KisSmallTilesFilter::process(KisConstProcessingInformation srcInfo,
QPoint srcTopLeft = srcInfo.topLeft();
Q_ASSERT(!src.isNull());
Q_ASSERT(!dst.isNull());
//read the filter configuration values from the KisFilterConfiguration object
quint32 numberOfTiles = config->getInt( "numberOfTiles", 2);
......
......@@ -37,8 +37,6 @@
#include <kgenericfactory.h>
#include <knuminput.h>
#include <KoProgressUpdater.h>
#include <kis_doc2.h>
#include <kis_image.h>
#include <kis_iterators_pixel.h>
......@@ -114,7 +112,7 @@ void KisSobelFilter::process(KisConstProcessingInformation srcInfo,
Q_ASSERT(!src.isNull());
Q_ASSERT(!dst.isNull());
//read the filter configuration values from the KisFilterConfiguration object
bool doHorizontal = configuration->getBool("doHorizontally", true);
bool doVertical = configuration->getBool("doVertically", true);
......
......@@ -18,19 +18,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KIS_BLUR_FILTER_H
#define KIS_BLUR_FILTER_H
#ifndef KIS_UNSHARP_FILTER_H
#define KIS_UNSHARP_FILTER_H
#include "filter/kis_filter.h"
class KisUnsharpFilter : public KisFilter
{
public:
KisUnsharpFilter();
using KisFilter::process;
void process(KisConstProcessingInformation src,
KisProcessingInformation dst,
const QSize& size,
......@@ -39,7 +39,7 @@ public:
) const;
static inline KoID id() { return KoID("unsharp", i18n("Unsharp Mask")); }
virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageSP image =0) const;
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
int overlapMarginNeeded(const KisFilterConfiguration* /*c*/) const;
......
......@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef COLORFILTER_H
#define COLORFILTER_H
#ifndef COLOR_GENERATOR_H
#define COLOR_GENERATOR_H
#include <kparts/plugin.h>
#include "generator/kis_generator.h"
......@@ -40,13 +40,13 @@ public:
KisColorGenerator();
using KisGenerator::generate;
void generate( KisProcessingInformation dst,
const QSize& size,
const KisFilterConfiguration* config,
KoUpdater* progressUpdater
) const;
static inline KoID id() { return KoID("color", i18n("Color")); }
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageSP image =0) const;
......
......@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KIS_KS_TO_CTL_RGB_COLOR_CONVERSION_TRANSFORMATION_H_
#define KIS_KS_TO_CTL_RGB_COLOR_CONVERSION_TRANSFORMATION_H_
#ifndef KIS_KS_TO_RGB_COLOR_CONVERSION_TRANSFORMATION_CTL_H_
#define KIS_KS_TO_RGB_COLOR_CONVERSION_TRANSFORMATION_CTL_H_
#include "kis_illuminant_profile.h"
#include "kis_ks_colorspace.h"
......
......@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KIS_CTL_RGB_TO_KS_COLOR_CONVERSION_TRANSFORMATION_H_
#define KIS_CTL_RGB_TO_KS_COLOR_CONVERSION_TRANSFORMATION_H_
#ifndef KIS_RGB_TO_KS_COLOR_CONVERSION_TRANSFORMATION_CTL_H_
#define KIS_RGB_TO_KS_COLOR_CONVERSION_TRANSFORMATION_CTL_H_
#include <KoColorConversionTransformation.h>
#include <KoColorConversionTransformationFactory.h>
......
......@@ -27,7 +27,6 @@
#include <kis_paintop_registry.h>
#include "kis_cpaintop.h"
#include "kis_paintop_registry.h"
typedef KGenericFactory<CPaintBrush> CPaintBrushFactory;
K_EXPORT_COMPONENT_FACTORY(kritacpaintbrush, CPaintBrushFactory("krita"))
......
......@@ -26,8 +26,6 @@
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kis_paintop_registry.h>
#include "kis_airbrushop.h"
#include "kis_brushop.h"
#include "kis_duplicateop.h"
......
......@@ -42,7 +42,6 @@
#include <widgets/kcurve.h>
#include <kis_brush.h>
#include <kis_brushop.h>
#include <kis_datamanager.h>
#include <kis_global.h>
#include <kis_paint_device.h>
......
......@@ -101,8 +101,6 @@ KisPaintOpSettingsSP KisDynamicOpSettings::clone() const
return new KisDynamicOpSettings(0, m_shapeBookmarksModel->bookmarkedConfigurationManager(), m_coloringBookmarksModel->bookmarkedConfigurationManager());
}
// TEMP
#include <kis_dynamic_brush.h>
// TEMP
KisDynamicBrush* KisDynamicOpSettings::createBrush(KisPainter *painter) const
{
......
......@@ -15,8 +15,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _KIS_DYNAMICS_SENSORS_H_
#define _KIS_DYNAMICS_SENSORS_H_
#ifndef _KIS_DYNAMIC_SENSORS_H_
#define _KIS_DYNAMIC_SENSORS_H_
#include "kis_dynamic_sensor.h"
......
......@@ -15,8 +15,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _KIS_FILTERS_MODEL_H_
#define _KIS_FILTERS_MODEL_H_
#ifndef _KIS_FILTERS_LIST_MODEL_H_
#define _KIS_FILTERS_LIST_MODEL_H_
#include <QAbstractListModel>
......
......@@ -27,7 +27,6 @@
#include <kis_paintop_registry.h>
#include "kis_filterop.h"
#include "kis_paintop_registry.h"
typedef KGenericFactory<FilterOp> FilterOpFactory;
K_EXPORT_COMPONENT_FACTORY(kritafilterop, FilterOpFactory("krita"))
......
......@@ -15,6 +15,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 "kis_filterop_settings.h"
#include <QDomElement>
#include <QRect>
......@@ -43,7 +44,7 @@
#include <kis_selection.h>
#include <kis_paintop_settings.h>
#include "ui_FilterOpOptionsWidget.h"
#include "kis_filterop_settings.h"
KisFilterOpSettings::KisFilterOpSettings(QWidget* parent, KisImageSP image)
......
......@@ -15,11 +15,21 @@
* 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_FILTEROP_SETTINGS_H
#define KIS_FILTEROP_SETTINGS_H
#include "kis_types.h"
#include "kis_paintop_settings.h"
class QWidget;
class KisFilterConfiguration;
class QDomElement;
class QDomDocument;
class QGridLayout;
class Ui_FilterOpOptions;
class KoID;
class KisFilterConfigWidget;
class KisFilterOpSettings : public QObject, public KisPaintOpSettings {
Q_OBJECT
......
......@@ -22,6 +22,8 @@
*/
#include "kis_brush.h"
#include "kis_brush_p.h"
#include <QDomElement>
#include <QFile>
#include <QImage>
......@@ -40,7 +42,7 @@
#include "kis_iterators_pixel.h"
#include "kis_image.h"
#include "kis_brush_p.h"
#include <netinet/in.h> // htonl
......@@ -82,7 +84,7 @@ KisBrush::PlainColoringInformation::~PlainColoringInformation()
{
}
const quint8* KisBrush::PlainColoringInformation::color() const
const quint8* KisBrush::PlainColoringInformation::color() const
{
return m_color;
}
......@@ -457,13 +459,13 @@ void KisBrush::generateMask(KisPaintDeviceSP dst, ColoringInformation* src, doub
{
Q_UNUSED(angle);
Q_UNUSED(info_);
double scale = 0.5 *(scaleX + scaleY);
if (d->scaledBrushes.isEmpty()) {
createScaledBrushes();
}
const ScaledBrush *aboveBrush = 0;
const ScaledBrush *belowBrush = 0;
......@@ -491,13 +493,13 @@ void KisBrush::generateMask(KisPaintDeviceSP dst, ColoringInformation* src, doub
outputMask = scaleSinglePixelMask(s, aboveBrush->mask()->alphaAt(0, 0), subPixelX, subPixelY);
}
}
// Generate the paint device from the mask
const KoColorSpace* cs = dst->colorSpace();
quint32 pixelSize = cs->pixelSize();
quint8 * maskData = outputMask->data();
qint32 maskWidth = outputMask->width();
qint32 maskHeight = outputMask->height();
......@@ -522,7 +524,7 @@ void KisBrush::generateMask(KisPaintDeviceSP dst, ColoringInformation* src, doub
if(src) src->nextRow();
hiter.nextRow();
}
}
void KisBrush::mask(KisPaintDeviceSP dst, double scaleX, double scaleY, double angle, const KisPaintInformation& info , double subPixelX, double subPixelY ) const
......
......@@ -15,8 +15,8 @@
* 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_ALPHA_MASK_
#define KIS_ALPHA_MASK_
#ifndef KIS_BRUSH_P_H_
#define KIS_BRUSH_P_H_
#include "kis_brush.h"
......
......@@ -16,11 +16,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 <kis_sumipaintopsettings.h>
#include <KoColorSpaceRegistry.h>
#include <kis_sumipaintopsettings.h>
#include <kis_image.h>
#include <kis_debug.h>
......
......@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __filltool_h__
#define __filltool_h__
#ifndef KIS_TOOL_FILL_H_
#define KIS_TOOL_FILL_H_
#include <QPoint>
//Added by qt3to4:
......
......@@ -22,9 +22,9 @@
#include "kis_tool_line.h"
#include <QPainter>
#include <QLayout>
#include <QWidget>
#include "QPainter"
#include <kis_debug.h>
#include <klocale.h>
......@@ -37,8 +37,6 @@
#include "KoPointerEvent.h"
#include "kis_paintop_registry.h"
#include "QPainter"
#include "kis_cursor.h"
#include "kis_layer.h"
#include "KoCanvasBase.h"
......
......@@ -41,11 +41,9 @@
#include "kis_image.h"
#include "canvas/kis_canvas2.h"
#include "kis_layer.h"
#include "kis_paint_device.h"
#include "kis_selection_options.h"
#include "kis_paint_device.h"
#include "kis_iterators_pixel.h"
#include "kis_selection_options.h"
#include "kis_fill_painter.h"
#include "kis_pixel_selection.h"
#include "kis_selection_tool_helper.h"
......@@ -64,7 +62,7 @@ KisToolSelectContiguous::~KisToolSelectContiguous()
{
}
void KisToolSelectContiguous::activate( bool tmp )
void KisToolSelectContiguous::activate( bool tmp )
{
super::activate( tmp );
......
......@@ -23,8 +23,6 @@
#include "kis_tool_select_outline.h"
#include <kis_tool_select_outline.h>
#include <QApplication>
#include <QPainter>
#include <QWidget>
......
......@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __selecttoolfreehand_h__
#define __selecttoolfreehand_h__
#ifndef KIS_TOOL_SELECT_OUTLINE_H_
#define KIS_TOOL_SELECT_OUTLINE_H_
#include <QPoint>
......