Commit a596e86e authored by Alexander Potashev's avatar Alexander Potashev

Reduce number of include directories

parent 971cfa29
......@@ -38,66 +38,8 @@ endif(KF5Sane_FOUND)
include_directories(
# GENERATED BY ./gen_cmake_include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/commands
${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib
${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects
${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/flow
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/polygonal
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/rectangular
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text
${CMAKE_CURRENT_SOURCE_DIR}/cursors
${CMAKE_CURRENT_SOURCE_DIR}/dialogs
${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib
${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/effects
${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms
${CMAKE_CURRENT_SOURCE_DIR}/document
${CMAKE_CURRENT_SOURCE_DIR}/environments
${CMAKE_CURRENT_SOURCE_DIR}/environments/commands
${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs
${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib
${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib/transforms
${CMAKE_CURRENT_SOURCE_DIR}/environments/document
${CMAKE_CURRENT_SOURCE_DIR}/environments/tools
${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/selection
${CMAKE_CURRENT_SOURCE_DIR}/generic
${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets
${CMAKE_CURRENT_SOURCE_DIR}/imagelib
${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects
${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms
${CMAKE_CURRENT_SOURCE_DIR}/layers
${CMAKE_CURRENT_SOURCE_DIR}/layers/selections
${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image
${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text
${CMAKE_CURRENT_SOURCE_DIR}/layers/tempImage
${CMAKE_CURRENT_SOURCE_DIR}/lgpl
${CMAKE_CURRENT_SOURCE_DIR}/lgpl/generic
${CMAKE_CURRENT_SOURCE_DIR}/lgpl/generic/widgets
${CMAKE_CURRENT_SOURCE_DIR}/mainWindow
${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx
${CMAKE_CURRENT_SOURCE_DIR}/tools
${CMAKE_CURRENT_SOURCE_DIR}/tools/flow
${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal
${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular
${CMAKE_CURRENT_SOURCE_DIR}/tools/selection
${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image
${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text
${CMAKE_CURRENT_SOURCE_DIR}/views
${CMAKE_CURRENT_SOURCE_DIR}/views/manager
${CMAKE_CURRENT_SOURCE_DIR}/widgets
${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity
${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib
${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects
${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars
${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options
${QIMAGEBLITZ_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}
${QIMAGEBLITZ_INCLUDES}
)
add_subdirectory( pics )
......
......@@ -29,13 +29,13 @@
#define DEBUG_KP_EFFECT_BALANCE 0
#include <kpEffectBalanceCommand.h>
#include "kpEffectBalanceCommand.h"
#include "imagelib/effects/kpEffectBalance.h"
#include <kdebug.h>
#include <klocale.h>
#include <kpEffectBalance.h>
kpEffectBalanceCommand::kpEffectBalanceCommand (int channels,
int brightness, int contrast, int gamma,
......
......@@ -30,8 +30,8 @@
#define kpEffectBalanceCommand_H
#include <kpEffectCommandBase.h>
#include <kpImage.h>
#include "kpEffectCommandBase.h"
#include "imagelib/kpImage.h"
class kpEffectBalanceCommand : public kpEffectCommandBase
......
......@@ -29,7 +29,7 @@
#define DEBUG_KP_EFFECT_BLUR_SHARPEN 0
#include <kpEffectBlurSharpenCommand.h>
#include "kpEffectBlurSharpenCommand.h"
#include <kdebug.h>
#include <klocale.h>
......
......@@ -30,9 +30,9 @@
#define kpEffectBlurSharpenCommand_H
#include <kpEffectBlurSharpen.h>
#include <kpEffectCommandBase.h>
#include <kpImage.h>
#include "kpEffectCommandBase.h"
#include "imagelib/effects/kpEffectBlurSharpen.h"
#include "imagelib/kpImage.h"
class kpEffectBlurSharpenCommand : public kpEffectCommandBase
......
......@@ -26,16 +26,16 @@
*/
#include <kpEffectClearCommand.h>
#include "kpEffectClearCommand.h"
#include "layers/selections/image/kpAbstractImageSelection.h"
#include "kpDefs.h"
#include "document/kpDocument.h"
#include "pixmapfx/kpPixmapFX.h"
#include <kdebug.h>
#include <klocale.h>
#include <kpAbstractImageSelection.h>
#include <kpDefs.h>
#include <kpDocument.h>
#include <kpPixmapFX.h>
kpEffectClearCommand::kpEffectClearCommand (bool actOnSelection,
const kpColor &newColor,
......
......@@ -30,10 +30,10 @@
#define kpEffectClearCommand_H
#include <kpCommand.h>
#include "commands/kpCommand.h"
#include <kpColor.h>
#include <kpImage.h>
#include "imagelib/kpColor.h"
#include "imagelib/kpImage.h"
class kpEffectClearCommand : public kpCommand
......
......@@ -26,13 +26,13 @@
*/
#include <kpEffectCommandBase.h>
#include "kpEffectCommandBase.h"
#include <klocale.h>
#include <kpDefs.h>
#include <kpDocument.h>
#include <kpSetOverrideCursorSaver.h>
#include "kpDefs.h"
#include "document/kpDocument.h"
#include "generic/kpSetOverrideCursorSaver.h"
struct kpEffectCommandBasePrivate
......
......@@ -32,8 +32,8 @@
#include <qwidget.h>
#include <kpCommand.h>
#include <kpImage.h>
#include "commands/kpCommand.h"
#include "imagelib/kpImage.h"
class kpEffectCommandBase : public kpCommand
......
......@@ -29,13 +29,12 @@
#define DEBUG_KP_EFFECT_EMBOSS 0
#include <kpEffectEmbossCommand.h>
#include "kpEffectEmbossCommand.h"
#include "imagelib/effects/kpEffectEmboss.h"
#include <kdebug.h>
#include <klocale.h>
#include <kpEffectEmboss.h>
kpEffectEmbossCommand::kpEffectEmbossCommand (int strength,
bool actOnSelection,
......
......@@ -30,8 +30,8 @@
#define kpEffectEmbossCommand_H
#include <kpEffectCommandBase.h>
#include <kpImage.h>
#include "kpEffectCommandBase.h"
#include "imagelib/kpImage.h"
class kpEffectEmbossCommand : public kpEffectCommandBase
......
......@@ -29,13 +29,12 @@
#define DEBUG_KP_EFFECT_FLATTEN 0
#include <kpEffectFlattenCommand.h>
#include "kpEffectFlattenCommand.h"
#include "imagelib/effects/kpEffectFlatten.h"
#include <kdebug.h>
#include <klocale.h>
#include <kpEffectFlatten.h>
kpEffectFlattenCommand::kpEffectFlattenCommand (const QColor &color1,
const QColor &color2,
......
......@@ -32,8 +32,8 @@
#include <qcolor.h>
#include <kpEffectCommandBase.h>
#include <kpImage.h>
#include "kpEffectCommandBase.h"
#include "imagelib/kpImage.h"
class kpEffectFlattenCommand : public kpEffectCommandBase
......
......@@ -26,12 +26,11 @@
*/
#include <kpEffectGrayscaleCommand.h>
#include "kpEffectGrayscaleCommand.h"
#include "imagelib/effects/kpEffectGrayscale.h"
#include <klocale.h>
#include <kpEffectGrayscale.h>
kpEffectGrayscaleCommand::kpEffectGrayscaleCommand (
bool actOnSelection,
......
......@@ -30,8 +30,8 @@
#define kpEffectGrayscaleCommand_H
#include <kpEffectCommandBase.h>
#include <kpImage.h>
#include "kpEffectCommandBase.h"
#include "imagelib/kpImage.h"
class kpEffectGrayscaleCommand : public kpEffectCommandBase
......
......@@ -24,8 +24,8 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kpEffectHSVCommand.h>
#include <kpEffectHSV.h>
#include "kpEffectHSVCommand.h"
#include "imagelib/effects/kpEffectHSV.h"
#include <klocale.h>
......
......@@ -30,7 +30,7 @@
#define kpEffectHSVCommand_H
#include <kpEffectCommandBase.h>
#include "kpEffectCommandBase.h"
class kpEffectHSVCommand : public kpEffectCommandBase
......
......@@ -29,7 +29,10 @@
#define DEBUG_KP_EFFECT_INVERT 0
#include <kpEffectInvertCommand.h>
#include "kpEffectInvertCommand.h"
#include "imagelib/effects/kpEffectInvert.h"
#include "pixmapfx/kpPixmapFX.h"
#include <qcheckbox.h>
#include <qimage.h>
......@@ -39,9 +42,6 @@
#include <kdebug.h>
#include <klocale.h>
#include <kpEffectInvert.h>
#include <kpPixmapFX.h>
kpEffectInvertCommand::kpEffectInvertCommand (int channels,
bool actOnSelection,
......
......@@ -30,8 +30,8 @@
#define kpEffectInvertCommand_H
#include <kpEffectCommandBase.h>
#include <kpImage.h>
#include "kpEffectCommandBase.h"
#include "imagelib/kpImage.h"
......
......@@ -29,13 +29,13 @@
#define DEBUG_KP_EFFECT_REDUCE_COLORS 0
#include <kpEffectReduceColorsCommand.h>
#include "kpEffectReduceColorsCommand.h"
#include "imagelib/effects/kpEffectReduceColors.h"
#include <kdebug.h>
#include <klocale.h>
#include <kpEffectReduceColors.h>
//---------------------------------------------------------------------
kpEffectReduceColorsCommand::kpEffectReduceColorsCommand (int depth, bool dither,
......
......@@ -30,9 +30,8 @@
#define kpEffectReduceColorsCommand_H
#include <kpEffectCommandBase.h>
#include <kpImage.h>
#include "kpEffectCommandBase.h"
#include "imagelib/kpImage.h"
class kpEffectReduceColorsCommand : public kpEffectCommandBase
......
......@@ -27,13 +27,13 @@
*/
#include <kpEffectToneEnhanceCommand.h>
#include "kpEffectToneEnhanceCommand.h"
#include "imagelib/effects/kpEffectToneEnhance.h"
#include <kdebug.h>
#include <klocale.h>
#include <kpEffectToneEnhance.h>
kpEffectToneEnhanceCommand::kpEffectToneEnhanceCommand (double granularity, double amount,
bool actOnSelection,
......
......@@ -31,7 +31,7 @@
#define kpEffectToneEnhanceCommand_H
#include <kpEffectCommandBase.h>
#include "kpEffectCommandBase.h"
class kpEffectToneEnhanceCommand : public kpEffectCommandBase
......
......@@ -26,13 +26,13 @@
*/
#include <kpDocumentMetaInfoCommand.h>
#include "kpDocumentMetaInfoCommand.h"
#include <klocale.h>
#include "document/kpDocument.h"
#include "imagelib/kpDocumentMetaInfo.h"
#include "kpDefs.h"
#include <kpDefs.h>
#include <kpDocument.h>
#include <kpDocumentMetaInfo.h>
#include <klocale.h>
struct kpDocumentMetaInfoCommandPrivate
......
......@@ -30,12 +30,11 @@
#define kpDocumentMetaInfoCommand_H
#include <kpNamedCommand.h>
#include "commands/kpNamedCommand.h"
class kpDocumentMetaInfo;
class kpDocumentMetaInfoCommand : public kpNamedCommand
{
public:
......
......@@ -26,7 +26,7 @@
*/
#include <kpTransformFlipCommand.h>
#include "kpTransformFlipCommand.h"
#include <qapplication.h>
#include <qgroupbox.h>
......@@ -37,11 +37,11 @@
#include <kdebug.h>
#include <klocale.h>
#include <kpAbstractImageSelection.h>
#include <kpCommandEnvironment.h>
#include <kpDefs.h>
#include <kpDocument.h>
#include <kpPixmapFX.h>
#include "layers/selections/image/kpAbstractImageSelection.h"
#include "environments/commands/kpCommandEnvironment.h"
#include "kpDefs.h"
#include "document/kpDocument.h"
#include "pixmapfx/kpPixmapFX.h"
//---------------------------------------------------------------------
......
......@@ -30,7 +30,7 @@
#define kpTransformFlipCommand_H
#include <kpCommand.h>
#include "commands/kpCommand.h"
class kpTransformFlipCommand : public kpCommand
......
......@@ -30,7 +30,16 @@
#define DEBUG_KP_TOOL_RESIZE_SCALE_DIALOG 0
#include <kpTransformResizeScaleCommand.h>
#include "kpTransformResizeScaleCommand.h"
#include "layers/selections/image/kpAbstractImageSelection.h"
#include "environments/commands/kpCommandEnvironment.h"
#include "kpDefs.h"
#include "document/kpDocument.h"
#include "layers/selections/image/kpFreeFormImageSelection.h"
#include "pixmapfx/kpPixmapFX.h"
#include "layers/selections/image/kpRectangularImageSelection.h"
#include "layers/selections/text/kpTextSelection.h"
#include <math.h>
......@@ -50,15 +59,6 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kpAbstractImageSelection.h>
#include <kpCommandEnvironment.h>
#include <kpDefs.h>
#include <kpDocument.h>
#include <kpFreeFormImageSelection.h>
#include <kpPixmapFX.h>
#include <kpRectangularImageSelection.h>
#include <kpTextSelection.h>
kpTransformResizeScaleCommand::kpTransformResizeScaleCommand (bool actOnSelection,
int newWidth, int newHeight,
......
......@@ -32,9 +32,9 @@
#include <qpixmap.h>
#include <kpColor.h>
#include <kpCommand.h>
#include <kpImage.h>
#include "imagelib/kpColor.h"
#include "commands/kpCommand.h"
#include "imagelib/kpImage.h"