summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Potashev <[email protected]>2015-09-25 17:12:34 +0300
committerAlexander Potashev <[email protected]>2015-09-25 17:12:34 +0300
commita596e86ef6512d6f1d6aa786f23073ec2d4c76b4 (patch)
tree1224198be5d2e0449043be18aebcebc2245db0bf
parent971cfa29ec733c49f89f2d53b6b2297c96bdf1ef (diff)
Reduce number of include directories
-rw-r--r--CMakeLists.txt62
-rw-r--r--commands/imagelib/effects/kpEffectBalanceCommand.cpp6
-rw-r--r--commands/imagelib/effects/kpEffectBalanceCommand.h4
-rw-r--r--commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp2
-rw-r--r--commands/imagelib/effects/kpEffectBlurSharpenCommand.h6
-rw-r--r--commands/imagelib/effects/kpEffectClearCommand.cpp12
-rw-r--r--commands/imagelib/effects/kpEffectClearCommand.h6
-rw-r--r--commands/imagelib/effects/kpEffectCommandBase.cpp8
-rw-r--r--commands/imagelib/effects/kpEffectCommandBase.h4
-rw-r--r--commands/imagelib/effects/kpEffectEmbossCommand.cpp5
-rw-r--r--commands/imagelib/effects/kpEffectEmbossCommand.h4
-rw-r--r--commands/imagelib/effects/kpEffectFlattenCommand.cpp5
-rw-r--r--commands/imagelib/effects/kpEffectFlattenCommand.h4
-rw-r--r--commands/imagelib/effects/kpEffectGrayscaleCommand.cpp5
-rw-r--r--commands/imagelib/effects/kpEffectGrayscaleCommand.h4
-rw-r--r--commands/imagelib/effects/kpEffectHSVCommand.cpp4
-rw-r--r--commands/imagelib/effects/kpEffectHSVCommand.h2
-rw-r--r--commands/imagelib/effects/kpEffectInvertCommand.cpp8
-rw-r--r--commands/imagelib/effects/kpEffectInvertCommand.h4
-rw-r--r--commands/imagelib/effects/kpEffectReduceColorsCommand.cpp6
-rw-r--r--commands/imagelib/effects/kpEffectReduceColorsCommand.h5
-rw-r--r--commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp6
-rw-r--r--commands/imagelib/effects/kpEffectToneEnhanceCommand.h2
-rw-r--r--commands/imagelib/kpDocumentMetaInfoCommand.cpp10
-rw-r--r--commands/imagelib/kpDocumentMetaInfoCommand.h3
-rw-r--r--commands/imagelib/transforms/kpTransformFlipCommand.cpp12
-rw-r--r--commands/imagelib/transforms/kpTransformFlipCommand.h2
-rw-r--r--commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp20
-rw-r--r--commands/imagelib/transforms/kpTransformResizeScaleCommand.h6
-rw-r--r--commands/imagelib/transforms/kpTransformRotateCommand.cpp20
-rw-r--r--commands/imagelib/transforms/kpTransformRotateCommand.h6
-rw-r--r--commands/imagelib/transforms/kpTransformSkewCommand.cpp20
-rw-r--r--commands/imagelib/transforms/kpTransformSkewCommand.h6
-rw-r--r--commands/kpCommand.cpp4
-rw-r--r--commands/kpCommand.h2
-rw-r--r--commands/kpCommandHistory.cpp10
-rw-r--r--commands/kpCommandHistory.h2
-rw-r--r--commands/kpCommandHistoryBase.cpp14
-rw-r--r--commands/kpCommandHistoryBase.h2
-rw-r--r--commands/kpCommandSize.cpp5
-rw-r--r--commands/kpCommandSize.h2
-rw-r--r--commands/kpMacroCommand.cpp4
-rw-r--r--commands/kpMacroCommand.h2
-rw-r--r--commands/kpNamedCommand.cpp2
-rw-r--r--commands/kpNamedCommand.h2
-rw-r--r--commands/tools/flow/kpToolFlowCommand.cpp14
-rw-r--r--commands/tools/flow/kpToolFlowCommand.h2
-rw-r--r--commands/tools/kpToolColorPickerCommand.cpp8
-rw-r--r--commands/tools/kpToolColorPickerCommand.h4
-rw-r--r--commands/tools/kpToolFloodFillCommand.cpp14
-rw-r--r--commands/tools/kpToolFloodFillCommand.h4
-rw-r--r--commands/tools/polygonal/kpToolPolygonalCommand.cpp28
-rw-r--r--commands/tools/polygonal/kpToolPolygonalCommand.h4
-rw-r--r--commands/tools/rectangular/kpToolRectangularCommand.cpp32
-rw-r--r--commands/tools/rectangular/kpToolRectangularCommand.h4
-rw-r--r--commands/tools/selection/kpAbstractSelectionContentCommand.cpp4
-rw-r--r--commands/tools/selection/kpAbstractSelectionContentCommand.h2
-rw-r--r--commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp12
-rw-r--r--commands/tools/selection/kpToolImageSelectionTransparencyCommand.h4
-rw-r--r--commands/tools/selection/kpToolSelectionCreateCommand.cpp30
-rw-r--r--commands/tools/selection/kpToolSelectionCreateCommand.h2
-rw-r--r--commands/tools/selection/kpToolSelectionDestroyCommand.cpp20
-rw-r--r--commands/tools/selection/kpToolSelectionDestroyCommand.h4
-rw-r--r--commands/tools/selection/kpToolSelectionMoveCommand.cpp26
-rw-r--r--commands/tools/selection/kpToolSelectionMoveCommand.h4
-rw-r--r--commands/tools/selection/kpToolSelectionPullFromDocumentCommand.cpp12
-rw-r--r--commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h4
-rw-r--r--commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp30
-rw-r--r--commands/tools/selection/kpToolSelectionResizeScaleCommand.h2
-rw-r--r--commands/tools/selection/text/kpToolTextBackspaceCommand.cpp8
-rw-r--r--commands/tools/selection/text/kpToolTextBackspaceCommand.h2
-rw-r--r--commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp8
-rw-r--r--commands/tools/selection/text/kpToolTextChangeStyleCommand.h4
-rw-r--r--commands/tools/selection/text/kpToolTextDeleteCommand.cpp8
-rw-r--r--commands/tools/selection/text/kpToolTextDeleteCommand.h2
-rw-r--r--commands/tools/selection/text/kpToolTextEnterCommand.cpp8
-rw-r--r--commands/tools/selection/text/kpToolTextEnterCommand.h2
-rw-r--r--commands/tools/selection/text/kpToolTextGiveContentCommand.cpp12
-rw-r--r--commands/tools/selection/text/kpToolTextGiveContentCommand.h2
-rw-r--r--commands/tools/selection/text/kpToolTextInsertCommand.cpp8
-rw-r--r--commands/tools/selection/text/kpToolTextInsertCommand.h2
-rw-r--r--cursors/kpCursorLightCross.cpp6
-rw-r--r--cursors/kpCursorProvider.cpp6
-rw-r--r--dialogs/imagelib/effects/kpEffectsDialog.cpp38
-rw-r--r--dialogs/imagelib/effects/kpEffectsDialog.h2
-rw-r--r--dialogs/imagelib/kpDocumentMetaInfoDialog.cpp15
-rw-r--r--dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp14
-rw-r--r--dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp14
-rw-r--r--dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h4
-rw-r--r--dialogs/imagelib/transforms/kpTransformRotateDialog.cpp24
-rw-r--r--dialogs/imagelib/transforms/kpTransformRotateDialog.h4
-rw-r--r--dialogs/imagelib/transforms/kpTransformSkewDialog.cpp12
-rw-r--r--dialogs/imagelib/transforms/kpTransformSkewDialog.h4
-rw-r--r--dialogs/kpColorSimilarityDialog.cpp10
-rw-r--r--dialogs/kpDocumentSaveOptionsPreviewDialog.cpp14
-rw-r--r--dialogs/kpDocumentSaveOptionsPreviewDialog.h3
-rw-r--r--document/kpDocument.cpp42
-rw-r--r--document/kpDocument.h4
-rw-r--r--document/kpDocumentSaveOptions.cpp12
-rw-r--r--document/kpDocument_Open.cpp28
-rw-r--r--document/kpDocument_Save.cpp28
-rw-r--r--document/kpDocument_Selection.cpp16
-rw-r--r--environments/commands/kpCommandEnvironment.cpp16
-rw-r--r--environments/commands/kpCommandEnvironment.h2
-rw-r--r--environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.cpp4
-rw-r--r--environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h2
-rw-r--r--environments/document/kpDocumentEnvironment.cpp24
-rw-r--r--environments/document/kpDocumentEnvironment.h2
-rw-r--r--environments/kpEnvironmentBase.cpp12
-rw-r--r--environments/tools/kpToolEnvironment.cpp16
-rw-r--r--environments/tools/kpToolEnvironment.h2
-rw-r--r--environments/tools/selection/kpToolSelectionEnvironment.cpp8
-rw-r--r--environments/tools/selection/kpToolSelectionEnvironment.h2
-rw-r--r--generic/kpSetOverrideCursorSaver.cpp2
-rw-r--r--generic/kpWidgetMapper.cpp2
-rw-r--r--generic/widgets/kpResizeSignallingLabel.cpp2
-rw-r--r--generic/widgets/kpSubWindow.cpp2
-rw-r--r--imagelib/effects/kpEffectBalance.cpp4
-rw-r--r--imagelib/effects/kpEffectBalance.h2
-rw-r--r--imagelib/effects/kpEffectBlurSharpen.cpp4
-rw-r--r--imagelib/effects/kpEffectBlurSharpen.h2
-rw-r--r--imagelib/effects/kpEffectEmboss.cpp4
-rw-r--r--imagelib/effects/kpEffectEmboss.h2
-rw-r--r--imagelib/effects/kpEffectFlatten.cpp4
-rw-r--r--imagelib/effects/kpEffectGrayscale.cpp4
-rw-r--r--imagelib/effects/kpEffectGrayscale.h2
-rw-r--r--imagelib/effects/kpEffectHSV.cpp4
-rw-r--r--imagelib/effects/kpEffectHSV.h2
-rw-r--r--imagelib/effects/kpEffectInvert.cpp4
-rw-r--r--imagelib/effects/kpEffectReduceColors.cpp2
-rw-r--r--imagelib/effects/kpEffectToneEnhance.cpp4
-rw-r--r--imagelib/effects/kpEffectToneEnhance.h2
-rw-r--r--imagelib/kpColor.cpp2
-rw-r--r--imagelib/kpColor_Constants.cpp2
-rw-r--r--imagelib/kpDocumentMetaInfo.cpp4
-rw-r--r--imagelib/kpDocumentMetaInfo.h2
-rw-r--r--imagelib/kpFloodFill.cpp12
-rw-r--r--imagelib/kpFloodFill.h4
-rw-r--r--imagelib/kpPainter.cpp12
-rw-r--r--imagelib/kpPainter.h4
-rw-r--r--imagelib/transforms/kpTransformAutoCrop.cpp36
-rw-r--r--imagelib/transforms/kpTransformAutoCrop.h2
-rw-r--r--imagelib/transforms/kpTransformCrop.cpp18
-rw-r--r--imagelib/transforms/kpTransformCrop_ImageSelection.cpp26
-rw-r--r--imagelib/transforms/kpTransformCrop_TextSelection.cpp12
-rw-r--r--kolourpaint.cpp2
-rw-r--r--kpThumbnail.cpp16
-rw-r--r--kpThumbnail.h2
-rw-r--r--kpViewScrollableContainer.cpp10
-rw-r--r--layers/selections/image/kpAbstractImageSelection.cpp2
-rw-r--r--layers/selections/image/kpAbstractImageSelection.h7
-rw-r--r--layers/selections/image/kpEllipticalImageSelection.cpp2
-rw-r--r--layers/selections/image/kpEllipticalImageSelection.h2
-rw-r--r--layers/selections/image/kpFreeFormImageSelection.cpp4
-rw-r--r--layers/selections/image/kpFreeFormImageSelection.h2
-rw-r--r--layers/selections/image/kpImageSelectionTransparency.cpp6
-rw-r--r--layers/selections/image/kpImageSelectionTransparency.h2
-rw-r--r--layers/selections/image/kpRectangularImageSelection.cpp2
-rw-r--r--layers/selections/image/kpRectangularImageSelection.h2
-rw-r--r--layers/selections/kpAbstractSelection.cpp2
-rw-r--r--layers/selections/kpAbstractSelection.h4
-rw-r--r--layers/selections/kpSelectionDrag.cpp8
-rw-r--r--layers/selections/kpSelectionFactory.cpp8
-rw-r--r--layers/selections/kpSelectionFactory.h2
-rw-r--r--layers/selections/text/kpPreeditText.cpp2
-rw-r--r--layers/selections/text/kpTextSelection.cpp12
-rw-r--r--layers/selections/text/kpTextSelection.h8
-rw-r--r--layers/selections/text/kpTextSelectionPrivate.h6
-rw-r--r--layers/selections/text/kpTextSelection_Cursor.cpp14
-rw-r--r--layers/selections/text/kpTextSelection_Paint.cpp16
-rw-r--r--layers/selections/text/kpTextStyle.cpp2
-rw-r--r--layers/selections/text/kpTextStyle.h2
-rw-r--r--layers/tempImage/kpTempImage.cpp6
-rw-r--r--layers/tempImage/kpTempImage.h2
-rw-r--r--lgpl/generic/kpColorCollection.cpp16
-rw-r--r--lgpl/generic/kpUrlFormatter.cpp2
-rw-r--r--lgpl/generic/widgets/kpColorCellsBase.cpp2
-rw-r--r--mainWindow/kpMainWindow.cpp46
-rw-r--r--mainWindow/kpMainWindow.h6
-rw-r--r--mainWindow/kpMainWindowPrivate.h2
-rw-r--r--mainWindow/kpMainWindow_Colors.cpp16
-rw-r--r--mainWindow/kpMainWindow_Edit.cpp52
-rw-r--r--mainWindow/kpMainWindow_File.cpp24
-rw-r--r--mainWindow/kpMainWindow_Image.cpp68
-rw-r--r--mainWindow/kpMainWindow_Settings.cpp12
-rw-r--r--mainWindow/kpMainWindow_StatusBar.cpp16
-rw-r--r--mainWindow/kpMainWindow_Text.cpp18
-rw-r--r--mainWindow/kpMainWindow_Tools.cpp66
-rw-r--r--mainWindow/kpMainWindow_View.cpp26
-rw-r--r--mainWindow/kpMainWindow_View_Thumbnail.cpp26
-rw-r--r--mainWindow/kpMainWindow_View_Zoom.cpp26
-rw-r--r--pixmapfx/kpPixmapFX.h2
-rw-r--r--pixmapfx/kpPixmapFX_DrawShapes.cpp8
-rw-r--r--pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp4
-rw-r--r--pixmapfx/kpPixmapFX_Transforms.cpp8
-rw-r--r--tools/flow/kpToolBrush.cpp2
-rw-r--r--tools/flow/kpToolBrush.h2
-rw-r--r--tools/flow/kpToolColorEraser.cpp18
-rw-r--r--tools/flow/kpToolColorEraser.h2
-rw-r--r--tools/flow/kpToolEraser.cpp10
-rw-r--r--tools/flow/kpToolEraser.h2
-rw-r--r--tools/flow/kpToolFlowBase.cpp32
-rw-r--r--tools/flow/kpToolFlowBase.h4
-rw-r--r--tools/flow/kpToolFlowPixmapBase.cpp14
-rw-r--r--tools/flow/kpToolFlowPixmapBase.h2
-rw-r--r--tools/flow/kpToolPen.cpp18
-rw-r--r--tools/flow/kpToolPen.h2
-rw-r--r--tools/flow/kpToolSpraycan.cpp30
-rw-r--r--tools/flow/kpToolSpraycan.h2
-rw-r--r--tools/kpTool.cpp20
-rw-r--r--tools/kpTool.h2
-rw-r--r--tools/kpToolAction.cpp4
-rw-r--r--tools/kpToolColorPicker.cpp16
-rw-r--r--tools/kpToolColorPicker.h4
-rw-r--r--tools/kpToolFloodFill.cpp14
-rw-r--r--tools/kpToolFloodFill.h2
-rw-r--r--tools/kpToolZoom.cpp20
-rw-r--r--tools/kpToolZoom.h2
-rw-r--r--tools/kpTool_Drawing.cpp12
-rw-r--r--tools/kpTool_KeyboardEvents.cpp22
-rw-r--r--tools/kpTool_MouseEvents.cpp10
-rw-r--r--tools/kpTool_OtherEvents.cpp6
-rw-r--r--tools/kpTool_UserNotifications.cpp4
-rw-r--r--tools/kpTool_Utilities.cpp14
-rw-r--r--tools/polygonal/kpToolCurve.cpp4
-rw-r--r--tools/polygonal/kpToolCurve.h2
-rw-r--r--tools/polygonal/kpToolLine.cpp6
-rw-r--r--tools/polygonal/kpToolLine.h2
-rw-r--r--tools/polygonal/kpToolPolygon.cpp6
-rw-r--r--tools/polygonal/kpToolPolygon.h2
-rw-r--r--tools/polygonal/kpToolPolygonalBase.cpp26
-rw-r--r--tools/polygonal/kpToolPolygonalBase.h8
-rw-r--r--tools/polygonal/kpToolPolyline.cpp4
-rw-r--r--tools/polygonal/kpToolPolyline.h2
-rw-r--r--tools/rectangular/kpToolEllipse.cpp5
-rw-r--r--tools/rectangular/kpToolEllipse.h2
-rw-r--r--tools/rectangular/kpToolRectangle.cpp5
-rw-r--r--tools/rectangular/kpToolRectangle.h2
-rw-r--r--tools/rectangular/kpToolRectangularBase.cpp30
-rw-r--r--tools/rectangular/kpToolRectangularBase.h4
-rw-r--r--tools/rectangular/kpToolRoundedRectangle.cpp5
-rw-r--r--tools/rectangular/kpToolRoundedRectangle.h2
-rw-r--r--tools/selection/image/kpAbstractImageSelectionTool.cpp10
-rw-r--r--tools/selection/image/kpAbstractImageSelectionTool.h2
-rw-r--r--tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp48
-rw-r--r--tools/selection/image/kpToolEllipticalSelection.cpp8
-rw-r--r--tools/selection/image/kpToolEllipticalSelection.h2
-rw-r--r--tools/selection/image/kpToolFreeFormSelection.cpp8
-rw-r--r--tools/selection/image/kpToolFreeFormSelection.h2
-rw-r--r--tools/selection/image/kpToolRectSelection.cpp8
-rw-r--r--tools/selection/image/kpToolRectSelection.h2
-rw-r--r--tools/selection/kpAbstractSelectionTool.cpp30
-rw-r--r--tools/selection/kpAbstractSelectionTool.h2
-rw-r--r--tools/selection/kpAbstractSelectionToolPrivate.h3
-rw-r--r--tools/selection/kpAbstractSelectionTool_Create.cpp36
-rw-r--r--tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp13
-rw-r--r--tools/selection/kpAbstractSelectionTool_Move.cpp36
-rw-r--r--tools/selection/kpAbstractSelectionTool_ResizeScale.cpp36
-rw-r--r--tools/selection/text/kpToolText.cpp32
-rw-r--r--tools/selection/text/kpToolText.h2
-rw-r--r--tools/selection/text/kpToolText_Commands.cpp16
-rw-r--r--tools/selection/text/kpToolText_Create.cpp12
-rw-r--r--tools/selection/text/kpToolText_CursorCalc.cpp26
-rw-r--r--tools/selection/text/kpToolText_InputMethodEvents.cpp14
-rw-r--r--tools/selection/text/kpToolText_KeyboardEvents.cpp30
-rw-r--r--tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp30
-rw-r--r--tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp30
-rw-r--r--tools/selection/text/kpToolText_Move.cpp6
-rw-r--r--tools/selection/text/kpToolText_ResizeScale.cpp6
-rw-r--r--tools/selection/text/kpToolText_SelectText.cpp12
-rw-r--r--tools/selection/text/kpToolText_TextStyle.cpp32
-rw-r--r--views/kpThumbnailView.cpp2
-rw-r--r--views/kpThumbnailView.h2
-rw-r--r--views/kpUnzoomedThumbnailView.cpp8
-rw-r--r--views/kpUnzoomedThumbnailView.h2
-rw-r--r--views/kpView.cpp18
-rw-r--r--views/kpView.h2
-rw-r--r--views/kpView_Events.cpp6
-rw-r--r--views/kpView_Paint.cpp18
-rw-r--r--views/kpView_Selections.cpp10
-rw-r--r--views/kpZoomedThumbnailView.cpp6
-rw-r--r--views/kpZoomedThumbnailView.h2
-rw-r--r--views/kpZoomedView.cpp8
-rw-r--r--views/kpZoomedView.h2
-rw-r--r--views/manager/kpViewManager.cpp18
-rw-r--r--views/manager/kpViewManager_TextCursor.cpp18
-rw-r--r--views/manager/kpViewManager_ViewUpdates.cpp18
-rw-r--r--widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp6
-rw-r--r--widgets/colorSimilarity/kpColorSimilarityFrame.cpp6
-rw-r--r--widgets/colorSimilarity/kpColorSimilarityFrame.h3
-rw-r--r--widgets/colorSimilarity/kpColorSimilarityHolder.cpp10
-rw-r--r--widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp10
-rw-r--r--widgets/colorSimilarity/kpColorSimilarityToolBarItem.h2
-rw-r--r--widgets/imagelib/effects/kpEffectBalanceWidget.cpp17
-rw-r--r--widgets/imagelib/effects/kpEffectBalanceWidget.h4
-rw-r--r--widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp10
-rw-r--r--widgets/imagelib/effects/kpEffectBlurSharpenWidget.h6
-rw-r--r--widgets/imagelib/effects/kpEffectEmbossWidget.cpp6
-rw-r--r--widgets/imagelib/effects/kpEffectEmbossWidget.h4
-rw-r--r--widgets/imagelib/effects/kpEffectFlattenWidget.cpp12
-rw-r--r--widgets/imagelib/effects/kpEffectFlattenWidget.h2
-rw-r--r--widgets/imagelib/effects/kpEffectHSVWidget.cpp6
-rw-r--r--widgets/imagelib/effects/kpEffectHSVWidget.h2
-rw-r--r--widgets/imagelib/effects/kpEffectInvertWidget.cpp16
-rw-r--r--widgets/imagelib/effects/kpEffectInvertWidget.h2
-rw-r--r--widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp16
-rw-r--r--widgets/imagelib/effects/kpEffectReduceColorsWidget.h2
-rw-r--r--widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp10
-rw-r--r--widgets/imagelib/effects/kpEffectToneEnhanceWidget.h2
-rw-r--r--widgets/imagelib/effects/kpEffectWidgetBase.cpp2
-rw-r--r--widgets/imagelib/effects/kpEffectWidgetBase.h2
-rw-r--r--widgets/kpColorCells.cpp16
-rw-r--r--widgets/kpColorCells.h2
-rw-r--r--widgets/kpColorPalette.cpp8
-rw-r--r--widgets/kpDefaultColorCollection.cpp4
-rw-r--r--widgets/kpDefaultColorCollection.h2
-rw-r--r--widgets/kpDocumentSaveOptionsWidget.cpp28
-rw-r--r--widgets/kpDocumentSaveOptionsWidget.h4
-rw-r--r--widgets/kpDualColorButton.cpp14
-rw-r--r--widgets/kpDualColorButton.h2
-rw-r--r--widgets/kpPrintDialogPage.cpp4
-rw-r--r--widgets/kpTransparentColorCell.cpp10
-rw-r--r--widgets/toolbars/kpColorToolBar.cpp14
-rw-r--r--widgets/toolbars/kpColorToolBar.h2
-rw-r--r--widgets/toolbars/kpToolToolBar.cpp20
-rw-r--r--widgets/toolbars/options/kpToolWidgetBase.cpp16
-rw-r--r--widgets/toolbars/options/kpToolWidgetBrush.cpp4
-rw-r--r--widgets/toolbars/options/kpToolWidgetBrush.h7
-rw-r--r--widgets/toolbars/options/kpToolWidgetEraserSize.cpp16
-rw-r--r--widgets/toolbars/options/kpToolWidgetEraserSize.h7
-rw-r--r--widgets/toolbars/options/kpToolWidgetFillStyle.cpp16
-rw-r--r--widgets/toolbars/options/kpToolWidgetFillStyle.h2
-rw-r--r--widgets/toolbars/options/kpToolWidgetLineWidth.cpp12
-rw-r--r--widgets/toolbars/options/kpToolWidgetLineWidth.h2
-rw-r--r--widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp2
-rw-r--r--widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h2
-rw-r--r--widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp12
-rw-r--r--widgets/toolbars/options/kpToolWidgetSpraycanSize.h2
338 files changed, 1606 insertions, 1672 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9ffa6c..b9ff0e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
diff --git a/commands/imagelib/effects/kpEffectBalanceCommand.cpp b/commands/imagelib/effects/kpEffectBalanceCommand.cpp
index 33b4122..0dfe028 100644
--- a/commands/imagelib/effects/kpEffectBalanceCommand.cpp
+++ b/commands/imagelib/effects/kpEffectBalanceCommand.cpp
@@ -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,
diff --git a/commands/imagelib/effects/kpEffectBalanceCommand.h b/commands/imagelib/effects/kpEffectBalanceCommand.h
index c5053c1..44d525b 100644
--- a/commands/imagelib/effects/kpEffectBalanceCommand.h
+++ b/commands/imagelib/effects/kpEffectBalanceCommand.h
@@ -30,8 +30,8 @@
#define kpEffectBalanceCommand_H
-#include <kpEffectCommandBase.h>
-#include <kpImage.h>
+#include "kpEffectCommandBase.h"
+#include "imagelib/kpImage.h"
class kpEffectBalanceCommand : public kpEffectCommandBase
diff --git a/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp b/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp
index d2f0a70..9a48aee 100644
--- a/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp
+++ b/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_EFFECT_BLUR_SHARPEN 0
-#include <kpEffectBlurSharpenCommand.h>
+#include "kpEffectBlurSharpenCommand.h"
#include <kdebug.h>
#include <klocale.h>
diff --git a/commands/imagelib/effects/kpEffectBlurSharpenCommand.h b/commands/imagelib/effects/kpEffectBlurSharpenCommand.h
index b235837..a14002f 100644
--- a/commands/imagelib/effects/kpEffectBlurSharpenCommand.h
+++ b/commands/imagelib/effects/kpEffectBlurSharpenCommand.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
diff --git a/commands/imagelib/effects/kpEffectClearCommand.cpp b/commands/imagelib/effects/kpEffectClearCommand.cpp
index dafdb73..748f184 100644
--- a/commands/imagelib/effects/kpEffectClearCommand.cpp
+++ b/commands/imagelib/effects/kpEffectClearCommand.cpp
@@ -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,
diff --git a/commands/imagelib/effects/kpEffectClearCommand.h b/commands/imagelib/effects/kpEffectClearCommand.h
index 6578e26..8053ca2 100644
--- a/commands/imagelib/effects/kpEffectClearCommand.h
+++ b/commands/imagelib/effects/kpEffectClearCommand.h
@@ -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
diff --git a/commands/imagelib/effects/kpEffectCommandBase.cpp b/commands/imagelib/effects/kpEffectCommandBase.cpp
index 7ff22a7..792be9b 100644
--- a/commands/imagelib/effects/kpEffectCommandBase.cpp
+++ b/commands/imagelib/effects/kpEffectCommandBase.cpp
@@ -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
diff --git a/commands/imagelib/effects/kpEffectCommandBase.h b/commands/imagelib/effects/kpEffectCommandBase.h
index 3cf15e6..b29fa4c 100644
--- a/commands/imagelib/effects/kpEffectCommandBase.h
+++ b/commands/imagelib/effects/kpEffectCommandBase.h
@@ -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
diff --git a/commands/imagelib/effects/kpEffectEmbossCommand.cpp b/commands/imagelib/effects/kpEffectEmbossCommand.cpp
index 473db0f..1d08c62 100644
--- a/commands/imagelib/effects/kpEffectEmbossCommand.cpp
+++ b/commands/imagelib/effects/kpEffectEmbossCommand.cpp
@@ -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,
diff --git a/commands/imagelib/effects/kpEffectEmbossCommand.h b/commands/imagelib/effects/kpEffectEmbossCommand.h
index b97d9f0..834d64e 100644
--- a/commands/imagelib/effects/kpEffectEmbossCommand.h
+++ b/commands/imagelib/effects/kpEffectEmbossCommand.h
@@ -30,8 +30,8 @@
#define kpEffectEmbossCommand_H
-#include <kpEffectCommandBase.h>
-#include <kpImage.h>
+#include "kpEffectCommandBase.h"
+#include "imagelib/kpImage.h"
class kpEffectEmbossCommand : public kpEffectCommandBase
diff --git a/commands/imagelib/effects/kpEffectFlattenCommand.cpp b/commands/imagelib/effects/kpEffectFlattenCommand.cpp
index 1188e76..d696cd2 100644
--- a/commands/imagelib/effects/kpEffectFlattenCommand.cpp
+++ b/commands/imagelib/effects/kpEffectFlattenCommand.cpp
@@ -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,
diff --git a/commands/imagelib/effects/kpEffectFlattenCommand.h b/commands/imagelib/effects/kpEffectFlattenCommand.h
index a69716a..066cd48 100644
--- a/commands/imagelib/effects/kpEffectFlattenCommand.h
+++ b/commands/imagelib/effects/kpEffectFlattenCommand.h
@@ -32,8 +32,8 @@
#include <qcolor.h>
-#include <kpEffectCommandBase.h>
-#include <kpImage.h>
+#include "kpEffectCommandBase.h"
+#include "imagelib/kpImage.h"
class kpEffectFlattenCommand : public kpEffectCommandBase
diff --git a/commands/imagelib/effects/kpEffectGrayscaleCommand.cpp b/commands/imagelib/effects/kpEffectGrayscaleCommand.cpp
index e4659f9..196e614 100644
--- a/commands/imagelib/effects/kpEffectGrayscaleCommand.cpp
+++ b/commands/imagelib/effects/kpEffectGrayscaleCommand.cpp
@@ -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,
diff --git a/commands/imagelib/effects/kpEffectGrayscaleCommand.h b/commands/imagelib/effects/kpEffectGrayscaleCommand.h
index 56c9259..3a49eea 100644
--- a/commands/imagelib/effects/kpEffectGrayscaleCommand.h
+++ b/commands/imagelib/effects/kpEffectGrayscaleCommand.h
@@ -30,8 +30,8 @@
#define kpEffectGrayscaleCommand_H
-#include <kpEffectCommandBase.h>
-#include <kpImage.h>
+#include "kpEffectCommandBase.h"
+#include "imagelib/kpImage.h"
class kpEffectGrayscaleCommand : public kpEffectCommandBase
diff --git a/commands/imagelib/effects/kpEffectHSVCommand.cpp b/commands/imagelib/effects/kpEffectHSVCommand.cpp
index 5f9b327..f871021 100644
--- a/commands/imagelib/effects/kpEffectHSVCommand.cpp
+++ b/commands/imagelib/effects/kpEffectHSVCommand.cpp
@@ -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>
diff --git a/commands/imagelib/effects/kpEffectHSVCommand.h b/commands/imagelib/effects/kpEffectHSVCommand.h
index 9c29335..7bd9c59 100644
--- a/commands/imagelib/effects/kpEffectHSVCommand.h
+++ b/commands/imagelib/effects/kpEffectHSVCommand.h
@@ -30,7 +30,7 @@
#define kpEffectHSVCommand_H
-#include <kpEffectCommandBase.h>
+#include "kpEffectCommandBase.h"
class kpEffectHSVCommand : public kpEffectCommandBase
diff --git a/commands/imagelib/effects/kpEffectInvertCommand.cpp b/commands/imagelib/effects/kpEffectInvertCommand.cpp
index 373c847..6b8e2f8 100644
--- a/commands/imagelib/effects/kpEffectInvertCommand.cpp
+++ b/commands/imagelib/effects/kpEffectInvertCommand.cpp
@@ -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,
diff --git a/commands/imagelib/effects/kpEffectInvertCommand.h b/commands/imagelib/effects/kpEffectInvertCommand.h
index f5eee36..015dbbf 100644
--- a/commands/imagelib/effects/kpEffectInvertCommand.h
+++ b/commands/imagelib/effects/kpEffectInvertCommand.h
@@ -30,8 +30,8 @@
#define kpEffectInvertCommand_H
-#include <kpEffectCommandBase.h>
-#include <kpImage.h>
+#include "kpEffectCommandBase.h"
+#include "imagelib/kpImage.h"
diff --git a/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp b/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp
index 4e5f5bf..c0499ec 100644
--- a/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp
+++ b/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp
@@ -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,
diff --git a/commands/imagelib/effects/kpEffectReduceColorsCommand.h b/commands/imagelib/effects/kpEffectReduceColorsCommand.h
index 06ecac6..f86e882 100644
--- a/commands/imagelib/effects/kpEffectReduceColorsCommand.h
+++ b/commands/imagelib/effects/kpEffectReduceColorsCommand.h
@@ -30,9 +30,8 @@
#define kpEffectReduceColorsCommand_H
-#include <kpEffectCommandBase.h>
-#include <kpImage.h>
-
+#include "kpEffectCommandBase.h"
+#include "imagelib/kpImage.h"
class kpEffectReduceColorsCommand : public kpEffectCommandBase
diff --git a/commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp b/commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp
index 1d6d289..83ae3c7 100644
--- a/commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp
+++ b/commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp
@@ -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,
diff --git a/commands/imagelib/effects/kpEffectToneEnhanceCommand.h b/commands/imagelib/effects/kpEffectToneEnhanceCommand.h
index 7a29da8..619fe7b 100644
--- a/commands/imagelib/effects/kpEffectToneEnhanceCommand.h
+++ b/commands/imagelib/effects/kpEffectToneEnhanceCommand.h
@@ -31,7 +31,7 @@
#define kpEffectToneEnhanceCommand_H
-#include <kpEffectCommandBase.h>
+#include "kpEffectCommandBase.h"
class kpEffectToneEnhanceCommand : public kpEffectCommandBase
diff --git a/commands/imagelib/kpDocumentMetaInfoCommand.cpp b/commands/imagelib/kpDocumentMetaInfoCommand.cpp
index eafb7cf..0fd8f13 100644
--- a/commands/imagelib/kpDocumentMetaInfoCommand.cpp
+++ b/commands/imagelib/kpDocumentMetaInfoCommand.cpp
@@ -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
diff --git a/commands/imagelib/kpDocumentMetaInfoCommand.h b/commands/imagelib/kpDocumentMetaInfoCommand.h
index c7c40e2..7636fc8 100644
--- a/commands/imagelib/kpDocumentMetaInfoCommand.h
+++ b/commands/imagelib/kpDocumentMetaInfoCommand.h
@@ -30,12 +30,11 @@
#define kpDocumentMetaInfoCommand_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class kpDocumentMetaInfo;
-
class kpDocumentMetaInfoCommand : public kpNamedCommand
{
public:
diff --git a/commands/imagelib/transforms/kpTransformFlipCommand.cpp b/commands/imagelib/transforms/kpTransformFlipCommand.cpp
index 9f2b570..221d8c9 100644
--- a/commands/imagelib/transforms/kpTransformFlipCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformFlipCommand.cpp
@@ -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"
//---------------------------------------------------------------------
diff --git a/commands/imagelib/transforms/kpTransformFlipCommand.h b/commands/imagelib/transforms/kpTransformFlipCommand.h
index fd11483..b85c86f 100644
--- a/commands/imagelib/transforms/kpTransformFlipCommand.h
+++ b/commands/imagelib/transforms/kpTransformFlipCommand.h
@@ -30,7 +30,7 @@
#define kpTransformFlipCommand_H
-#include <kpCommand.h>
+#include "commands/kpCommand.h"
class kpTransformFlipCommand : public kpCommand
diff --git a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
index b120275..103e629 100644
--- a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
@@ -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,
diff --git a/commands/imagelib/transforms/kpTransformResizeScaleCommand.h b/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
index 9d48cd8..59b99ec 100644
--- a/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
+++ b/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
@@ -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"
class QSize;
diff --git a/commands/imagelib/transforms/kpTransformRotateCommand.cpp b/commands/imagelib/transforms/kpTransformRotateCommand.cpp
index 4eb96b1..36f2ad0 100644
--- a/commands/imagelib/transforms/kpTransformRotateCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformRotateCommand.cpp
@@ -28,7 +28,16 @@
#define DEBUG_KP_TOOL_ROTATE 0
-#include <kpTransformRotateCommand.h>
+#include "kpTransformRotateCommand.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 "views/manager/kpViewManager.h"
#include <qapplication.h>
#include <qpixmap.h>
@@ -38,15 +47,6 @@
#include <kdebug.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 <kpViewManager.h>
-
kpTransformRotateCommand::kpTransformRotateCommand (bool actOnSelection,
double angle,
diff --git a/commands/imagelib/transforms/kpTransformRotateCommand.h b/commands/imagelib/transforms/kpTransformRotateCommand.h
index 40c903a..5583904 100644
--- a/commands/imagelib/transforms/kpTransformRotateCommand.h
+++ b/commands/imagelib/transforms/kpTransformRotateCommand.h
@@ -30,9 +30,9 @@
#define kpTransformRotateCommand_H
-#include <kpColor.h>
-#include <kpCommand.h>
-#include <kpImage.h>
+#include "imagelib/kpColor.h"
+#include "commands/kpCommand.h"
+#include "imagelib/kpImage.h"
class kpAbstractImageSelection;
diff --git a/commands/imagelib/transforms/kpTransformSkewCommand.cpp b/commands/imagelib/transforms/kpTransformSkewCommand.cpp
index acf74c3..227c751 100644
--- a/commands/imagelib/transforms/kpTransformSkewCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformSkewCommand.cpp
@@ -30,7 +30,15 @@
#define DEBUG_KP_TOOL_SKEW_DIALOG 0
-#include <kpTransformSkewCommand.h>
+#include "kpTransformSkewCommand.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 <qapplication.h>
#include <qmatrix.h>
@@ -40,16 +48,8 @@
#include <kdebug.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>
-
// TODO: nasty, should avoid using GUI class in this command class
-#include <kpTransformSkewDialog.h>
+#include "dialogs/imagelib/transforms/kpTransformSkewDialog.h"
kpTransformSkewCommand::kpTransformSkewCommand (bool actOnSelection,
diff --git a/commands/imagelib/transforms/kpTransformSkewCommand.h b/commands/imagelib/transforms/kpTransformSkewCommand.h
index 4f96ece..96fa5ac 100644
--- a/commands/imagelib/transforms/kpTransformSkewCommand.h
+++ b/commands/imagelib/transforms/kpTransformSkewCommand.h
@@ -30,9 +30,9 @@
#define kpTransformSkewCommand_H
-#include <kpColor.h>
-#include <kpImage.h>
-#include <kpCommand.h>
+#include "imagelib/kpColor.h"
+#include "imagelib/kpImage.h"
+#include "commands/kpCommand.h"
class kpAbstractSelection;
diff --git a/commands/kpCommand.cpp b/commands/kpCommand.cpp
index 6a2b028..ec4de7b 100644
--- a/commands/kpCommand.cpp
+++ b/commands/kpCommand.cpp
@@ -29,9 +29,9 @@
#define DEBUG_KP_COMMAND_HISTORY 0
-#include <kpCommand.h>
+#include "kpCommand.h"
-#include <kpCommandEnvironment.h>
+#include "environments/commands/kpCommandEnvironment.h"
kpCommand::kpCommand (kpCommandEnvironment *environ)
diff --git a/commands/kpCommand.h b/commands/kpCommand.h
index 7824811..ad4f545 100644
--- a/commands/kpCommand.h
+++ b/commands/kpCommand.h
@@ -30,7 +30,7 @@
#define kpCommand_H
-#include <kpCommandSize.h>
+#include "kpCommandSize.h"
#undef environ // macro on win32
diff --git a/commands/kpCommandHistory.cpp b/commands/kpCommandHistory.cpp
index 3a17f24..640b893 100644
--- a/commands/kpCommandHistory.cpp
+++ b/commands/kpCommandHistory.cpp
@@ -29,12 +29,12 @@
#define DEBUG_KP_COMMAND_HISTORY 0
-#include <kpCommandHistory.h>
+#include "kpCommandHistory.h"
-#include <kpAbstractSelection.h>
-#include <kpMainWindow.h>
-#include <kpTool.h>
-#include <kpToolSelectionCreateCommand.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "mainWindow/kpMainWindow.h"
+#include "tools/kpTool.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
kpCommandHistory::kpCommandHistory (bool doReadConfig, kpMainWindow *mainWindow)
diff --git a/commands/kpCommandHistory.h b/commands/kpCommandHistory.h
index 199eed1..ff985cc 100644
--- a/commands/kpCommandHistory.h
+++ b/commands/kpCommandHistory.h
@@ -30,7 +30,7 @@
#define kpCommandHistory_H
-#include <kpCommandHistoryBase.h>
+#include "kpCommandHistoryBase.h"
class kpToolSelectionCreateCommand;
diff --git a/commands/kpCommandHistoryBase.cpp b/commands/kpCommandHistoryBase.cpp
index b49609f..b5a0d5a 100644
--- a/commands/kpCommandHistoryBase.cpp
+++ b/commands/kpCommandHistoryBase.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_COMMAND_HISTORY 0
-#include <kpCommandHistoryBase.h>
+#include "kpCommandHistoryBase.h"
#include <climits>
@@ -48,12 +48,12 @@
#include <kconfiggroup.h>
#include <kiconloader.h>
-#include <kpCommand.h>
-#include <kpCommandEnvironment.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpTool.h>
+#include "kpCommand.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "tools/kpTool.h"
//---------------------------------------------------------------------
diff --git a/commands/kpCommandHistoryBase.h b/commands/kpCommandHistoryBase.h
index 8748136..a562eda 100644
--- a/commands/kpCommandHistoryBase.h
+++ b/commands/kpCommandHistoryBase.h
@@ -34,7 +34,7 @@
#include <qstring.h>
#include <qlinkedlist.h>
-#include <kpCommandSize.h>
+#include "commands/kpCommandSize.h"
class QAction;
diff --git a/commands/kpCommandSize.cpp b/commands/kpCommandSize.cpp
index 65481f5..f20629f 100644
--- a/commands/kpCommandSize.cpp
+++ b/commands/kpCommandSize.cpp
@@ -29,14 +29,13 @@
#define DEBUG_KP_COMMAND_SIZE 0
-#include <kpCommandSize.h>
+#include "commands/kpCommandSize.h"
+#include "layers/selections/kpAbstractSelection.h"
#include <QImage>
#include <QPolygon>
#include <QString>
-#include <kpAbstractSelection.h>
-
// public static
kpCommandSize::SizeType kpCommandSize::PixmapSize (const QImage &image)
diff --git a/commands/kpCommandSize.h b/commands/kpCommandSize.h
index 126713f..c6594b5 100644
--- a/commands/kpCommandSize.h
+++ b/commands/kpCommandSize.h
@@ -30,7 +30,7 @@
#define kpCommandSize_H
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
class QImage;
diff --git a/commands/kpMacroCommand.cpp b/commands/kpMacroCommand.cpp
index aa9031b..d933451 100644
--- a/commands/kpMacroCommand.cpp
+++ b/commands/kpMacroCommand.cpp
@@ -29,8 +29,8 @@
#define DEBUG_KP_COMMAND_HISTORY 0
-#include <kpMacroCommand.h>
-#include <kpViewManager.h>
+#include "commands/kpMacroCommand.h"
+#include "views/manager/kpViewManager.h"
#include <climits>
diff --git a/commands/kpMacroCommand.h b/commands/kpMacroCommand.h
index 1283615..85d7ef1 100644
--- a/commands/kpMacroCommand.h
+++ b/commands/kpMacroCommand.h
@@ -30,7 +30,7 @@
#define kpMacroCommand_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
#include <QLinkedList>
diff --git a/commands/kpNamedCommand.cpp b/commands/kpNamedCommand.cpp
index e8aec64..c903626 100644
--- a/commands/kpNamedCommand.cpp
+++ b/commands/kpNamedCommand.cpp
@@ -24,7 +24,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
//---------------------------------------------------------------------
diff --git a/commands/kpNamedCommand.h b/commands/kpNamedCommand.h
index 2d3416a..d5f54d4 100644
--- a/commands/kpNamedCommand.h
+++ b/commands/kpNamedCommand.h
@@ -30,7 +30,7 @@
#define kpNamedCommand_H
-#include <kpCommand.h>
+#include "commands/kpCommand.h"
#include <QString>
diff --git a/commands/tools/flow/kpToolFlowCommand.cpp b/commands/tools/flow/kpToolFlowCommand.cpp
index ef6caec..2b99c40 100644
--- a/commands/tools/flow/kpToolFlowCommand.cpp
+++ b/commands/tools/flow/kpToolFlowCommand.cpp
@@ -29,15 +29,15 @@
#define DEBUG_KP_TOOL_FLOW_COMMAND 0
-#include <kpToolFlowCommand.h>
+#include "kpToolFlowCommand.h"
-#include <qrect.h>
+#include "document/kpDocument.h"
+#include "imagelib/kpImage.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
+#include "views/manager/kpViewManager.h"
-#include <kpDocument.h>
-#include <kpImage.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
-#include <kpViewManager.h>
+#include <qrect.h>
struct kpToolFlowCommandPrivate
diff --git a/commands/tools/flow/kpToolFlowCommand.h b/commands/tools/flow/kpToolFlowCommand.h
index fe6a48c..3f80871 100644
--- a/commands/tools/flow/kpToolFlowCommand.h
+++ b/commands/tools/flow/kpToolFlowCommand.h
@@ -30,7 +30,7 @@
#define KP_TOOL_FLOW_COMMAND_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class QPoint;
diff --git a/commands/tools/kpToolColorPickerCommand.cpp b/commands/tools/kpToolColorPickerCommand.cpp
index 30ba6f9..b6d07e4 100644
--- a/commands/tools/kpToolColorPickerCommand.cpp
+++ b/commands/tools/kpToolColorPickerCommand.cpp
@@ -29,12 +29,12 @@
#define DEBUG_KP_TOOL_COLOR_PICKER 0
-#include <kpToolColorPickerCommand.h>
+#include "kpToolColorPickerCommand.h"
-#include <KLocalizedString>
+#include "environments/commands/kpCommandEnvironment.h"
+#include "kpDefs.h"
-#include <kpCommandEnvironment.h>
-#include <kpDefs.h>
+#include <KLocalizedString>
kpToolColorPickerCommand::kpToolColorPickerCommand (
diff --git a/commands/tools/kpToolColorPickerCommand.h b/commands/tools/kpToolColorPickerCommand.h
index 2570748..7864386 100644
--- a/commands/tools/kpToolColorPickerCommand.h
+++ b/commands/tools/kpToolColorPickerCommand.h
@@ -30,8 +30,8 @@
#define kpToolColorPickerCommand_H
-#include <kpColor.h>
-#include <kpCommand.h>
+#include "imagelib/kpColor.h"
+#include "commands/kpCommand.h"
class kpToolColorPickerCommand : public kpCommand
diff --git a/commands/tools/kpToolFloodFillCommand.cpp b/commands/tools/kpToolFloodFillCommand.cpp
index 3387dd4..c812950 100644
--- a/commands/tools/kpToolFloodFillCommand.cpp
+++ b/commands/tools/kpToolFloodFillCommand.cpp
@@ -29,18 +29,18 @@
#define DEBUG_KP_TOOL_FLOOD_FILL 0
-#include <kpToolFloodFillCommand.h>
+#include "kpToolFloodFillCommand.h"
-#include <qapplication.h>
+#include "imagelib/kpColor.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpImage.h"
+#include "pixmapfx/kpPixmapFX.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpImage.h>
-#include <kpPixmapFX.h>
+#include <qapplication.h>
//---------------------------------------------------------------------
diff --git a/commands/tools/kpToolFloodFillCommand.h b/commands/tools/kpToolFloodFillCommand.h
index 094b9e6..446eaa4 100644
--- a/commands/tools/kpToolFloodFillCommand.h
+++ b/commands/tools/kpToolFloodFillCommand.h
@@ -30,8 +30,8 @@
#define kpToolFloodFillCommand_H
-#include <kpCommand.h>
-#include <kpFloodFill.h>
+#include "commands/kpCommand.h"
+#include "imagelib/kpFloodFill.h"
class kpColor;
diff --git a/commands/tools/polygonal/kpToolPolygonalCommand.cpp b/commands/tools/polygonal/kpToolPolygonalCommand.cpp
index e21eb7c..4849bcd 100644
--- a/commands/tools/polygonal/kpToolPolygonalCommand.cpp
+++ b/commands/tools/polygonal/kpToolPolygonalCommand.cpp
@@ -29,11 +29,24 @@
#define DEBUG_KP_TOOL_POLYGON 0
-#include <kpToolPolygonalCommand.h>
+#include "kpToolPolygonalCommand.h"
+
+#include "document/kpDocument.h"
+#include "kpDefs.h"
+#include "imagelib/kpImage.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "tools/polygonal/kpToolPolygonalBase.h"
+#include "widgets/toolbars/options/kpToolWidgetLineWidth.h"
+#include "views/manager/kpViewManager.h"
#include <float.h>
#include <math.h>
+#include <kdebug.h>
+#include <klocale.h>
+
#include <qbitmap.h>
#include <qcursor.h>
#include <qlayout.h>
@@ -44,19 +57,6 @@
#include <qpushbutton.h>
#include <qrect.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpDocument.h>
-#include <kpDefs.h>
-#include <kpImage.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpTempImage.h>
-#include <kpToolPolygonalBase.h>
-#include <kpToolWidgetLineWidth.h>
-#include <kpViewManager.h>
-
struct kpToolPolygonalCommandPrivate
{
diff --git a/commands/tools/polygonal/kpToolPolygonalCommand.h b/commands/tools/polygonal/kpToolPolygonalCommand.h
index 7d0aac1..bdaedb0 100644
--- a/commands/tools/polygonal/kpToolPolygonalCommand.h
+++ b/commands/tools/polygonal/kpToolPolygonalCommand.h
@@ -30,8 +30,8 @@
#define kpToolPolygonalCommand_H
-#include <kpNamedCommand.h>
-#include <kpToolPolygonalBase.h>
+#include "commands/kpNamedCommand.h"
+#include "tools/polygonal/kpToolPolygonalBase.h"
class QPolygon;
diff --git a/commands/tools/rectangular/kpToolRectangularCommand.cpp b/commands/tools/rectangular/kpToolRectangularCommand.cpp
index 1c0ab84..b316faa 100644
--- a/commands/tools/rectangular/kpToolRectangularCommand.cpp
+++ b/commands/tools/rectangular/kpToolRectangularCommand.cpp
@@ -29,7 +29,22 @@
#define DEBUG_KP_TOOL_RECTANGULAR_COMMAND 0
-#include <kpToolRectangularCommand.h>
+#include "kpToolRectangularCommand.h"
+
+#include "imagelib/kpColor.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetFillStyle.h"
+#include "widgets/toolbars/options/kpToolWidgetLineWidth.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
+
+#include <kdebug.h>
+#include <klocale.h>
#include <qbitmap.h>
#include <qcursor.h>
@@ -37,21 +52,6 @@
#include <qpainter.h>
#include <qpixmap.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpColor.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpTempImage.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetFillStyle.h>
-#include <kpToolWidgetLineWidth.h>
-#include <kpView.h>
-#include <kpViewManager.h>
-
struct kpToolRectangularCommandPrivate
{
diff --git a/commands/tools/rectangular/kpToolRectangularCommand.h b/commands/tools/rectangular/kpToolRectangularCommand.h
index f471012..37394b4 100644
--- a/commands/tools/rectangular/kpToolRectangularCommand.h
+++ b/commands/tools/rectangular/kpToolRectangularCommand.h
@@ -30,8 +30,8 @@
#define KP_TOOL_RECTANGULAR_COMMAND_H
-#include <kpNamedCommand.h>
-#include <kpToolRectangularBase.h>
+#include "commands/kpNamedCommand.h"
+#include "tools/rectangular/kpToolRectangularBase.h"
class kpColor;
diff --git a/commands/tools/selection/kpAbstractSelectionContentCommand.cpp b/commands/tools/selection/kpAbstractSelectionContentCommand.cpp
index 66669a0..333d183 100644
--- a/commands/tools/selection/kpAbstractSelectionContentCommand.cpp
+++ b/commands/tools/selection/kpAbstractSelectionContentCommand.cpp
@@ -26,9 +26,9 @@
*/
-#include <kpAbstractSelectionContentCommand.h>
+#include "kpAbstractSelectionContentCommand.h"
-#include <kpAbstractSelection.h>
+#include "layers/selections/kpAbstractSelection.h"
struct kpAbstractSelectionContentCommandPrivate
diff --git a/commands/tools/selection/kpAbstractSelectionContentCommand.h b/commands/tools/selection/kpAbstractSelectionContentCommand.h
index 173f91d..cc12746 100644
--- a/commands/tools/selection/kpAbstractSelectionContentCommand.h
+++ b/commands/tools/selection/kpAbstractSelectionContentCommand.h
@@ -30,7 +30,7 @@
#define kpAbstractSelectionContentCommand_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
// Converts a selection border to a selection with content.
diff --git a/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp b/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp
index de8048a..46a6ae7 100644
--- a/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp
+++ b/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp
@@ -29,17 +29,17 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpToolImageSelectionTransparencyCommand.h>
+#include "kpToolImageSelectionTransparencyCommand.h"
-#include <qcursor.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "kpDefs.h"
+#include "generic/kpSetOverrideCursorSaver.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpAbstractImageSelection.h>
-#include <kpCommandEnvironment.h>
-#include <kpDefs.h>
-#include <kpSetOverrideCursorSaver.h>
+#include <qcursor.h>
kpToolImageSelectionTransparencyCommand::kpToolImageSelectionTransparencyCommand (
diff --git a/commands/tools/selection/kpToolImageSelectionTransparencyCommand.h b/commands/tools/selection/kpToolImageSelectionTransparencyCommand.h
index cd6054b..e4b9976 100644
--- a/commands/tools/selection/kpToolImageSelectionTransparencyCommand.h
+++ b/commands/tools/selection/kpToolImageSelectionTransparencyCommand.h
@@ -30,8 +30,8 @@
#define kpToolImageSelectionTransparencyCommand_H
-#include <kpNamedCommand.h>
-#include <kpImageSelectionTransparency.h>
+#include "commands/kpNamedCommand.h"
+#include "layers/selections/image/kpImageSelectionTransparency.h"
class kpToolImageSelectionTransparencyCommand : public kpNamedCommand
diff --git a/commands/tools/selection/kpToolSelectionCreateCommand.cpp b/commands/tools/selection/kpToolSelectionCreateCommand.cpp
index 7cfbad2..3533b14 100644
--- a/commands/tools/selection/kpToolSelectionCreateCommand.cpp
+++ b/commands/tools/selection/kpToolSelectionCreateCommand.cpp
@@ -29,7 +29,21 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpToolSelectionCreateCommand.h>
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+
+#include "layers/selections/kpAbstractSelection.h"
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
+
+#include <kdebug.h>
+#include <klocale.h>
#include <qapplication.h>
#include <qbitmap.h>
@@ -41,20 +55,6 @@
#include <qpolygon.h>
#include <qtimer.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpAbstractSelection.h>
-#include <kpAbstractImageSelection.h>
-#include <kpCommandEnvironment.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
-
kpToolSelectionCreateCommand::kpToolSelectionCreateCommand (const QString &name,
const kpAbstractSelection &fromSelection,
diff --git a/commands/tools/selection/kpToolSelectionCreateCommand.h b/commands/tools/selection/kpToolSelectionCreateCommand.h
index 6a286ef..6d92fb8 100644
--- a/commands/tools/selection/kpToolSelectionCreateCommand.h
+++ b/commands/tools/selection/kpToolSelectionCreateCommand.h
@@ -30,7 +30,7 @@
#define kpToolSelectionCreateCommand_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class kpAbstractSelection;
diff --git a/commands/tools/selection/kpToolSelectionDestroyCommand.cpp b/commands/tools/selection/kpToolSelectionDestroyCommand.cpp
index b556a05..773c4b8 100644
--- a/commands/tools/selection/kpToolSelectionDestroyCommand.cpp
+++ b/commands/tools/selection/kpToolSelectionDestroyCommand.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpToolSelectionDestroyCommand.h>
+#include "kpToolSelectionDestroyCommand.h"
#include <qapplication.h>
#include <qbitmap.h>
@@ -43,15 +43,15 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpAbstractSelection.h>
-#include <kpAbstractImageSelection.h>
-#include <kpCommandEnvironment.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
//---------------------------------------------------------------------
diff --git a/commands/tools/selection/kpToolSelectionDestroyCommand.h b/commands/tools/selection/kpToolSelectionDestroyCommand.h
index 07f2ca9..2f9a47f 100644
--- a/commands/tools/selection/kpToolSelectionDestroyCommand.h
+++ b/commands/tools/selection/kpToolSelectionDestroyCommand.h
@@ -30,8 +30,8 @@
#define kpToolSelectionDestroyCommand_H
-#include <kpImage.h>
-#include <kpNamedCommand.h>
+#include "imagelib/kpImage.h"
+#include "commands/kpNamedCommand.h"
class kpAbstractSelection;
diff --git a/commands/tools/selection/kpToolSelectionMoveCommand.cpp b/commands/tools/selection/kpToolSelectionMoveCommand.cpp
index f55e3ed..2f9bdf9 100644
--- a/commands/tools/selection/kpToolSelectionMoveCommand.cpp
+++ b/commands/tools/selection/kpToolSelectionMoveCommand.cpp
@@ -29,7 +29,19 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpToolSelectionMoveCommand.h>
+#include "kpToolSelectionMoveCommand.h"
+
+#include "layers/selections/kpAbstractSelection.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
+
+#include <kdebug.h>
+#include <klocale.h>
#include <qapplication.h>
#include <qbitmap.h>
@@ -41,18 +53,6 @@
#include <qpolygon.h>
#include <qtimer.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpAbstractSelection.h>
-#include <kpCommandEnvironment.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpTool.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
-
kpToolSelectionMoveCommand::kpToolSelectionMoveCommand (const QString &name,
kpCommandEnvironment *environ)
diff --git a/commands/tools/selection/kpToolSelectionMoveCommand.h b/commands/tools/selection/kpToolSelectionMoveCommand.h
index 584555d..8f8606c 100644
--- a/commands/tools/selection/kpToolSelectionMoveCommand.h
+++ b/commands/tools/selection/kpToolSelectionMoveCommand.h
@@ -34,8 +34,8 @@
#include <QPolygon>
#include <QRect>
-#include <kpImage.h>
-#include <kpNamedCommand.h>
+#include "imagelib/kpImage.h"
+#include "commands/kpNamedCommand.h"
class kpAbstractSelection;
diff --git a/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.cpp b/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.cpp
index 4079a97..1285473 100644
--- a/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.cpp
+++ b/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.cpp
@@ -29,16 +29,16 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpToolSelectionPullFromDocumentCommand.h>
+#include "kpToolSelectionPullFromDocumentCommand.h"
+
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "document/kpDocument.h"
+#include "views/manager/kpViewManager.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpAbstractImageSelection.h>
-#include <kpCommandEnvironment.h>
-#include <kpDocument.h>
-#include <kpViewManager.h>
-
kpToolSelectionPullFromDocumentCommand::kpToolSelectionPullFromDocumentCommand (
const kpAbstractImageSelection &originalSelBorder,
diff --git a/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h b/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h
index d07241f..2ff30f0 100644
--- a/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h
+++ b/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h
@@ -30,8 +30,8 @@
#define kpToolSelectionPullFromDocumentCommand_H
-#include <kpColor.h>
-#include <kpAbstractSelectionContentCommand.h>
+#include "kpAbstractSelectionContentCommand.h"
+#include "imagelib/kpColor.h"
class kpAbstractImageSelection;
diff --git a/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp b/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp
index 2cf4734..4713978 100644
--- a/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp
+++ b/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp
@@ -29,7 +29,21 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpToolSelectionResizeScaleCommand.h>
+#include "kpToolSelectionResizeScaleCommand.h"
+
+#include "layers/selections/kpAbstractSelection.h"
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "layers/selections/image/kpRectangularImageSelection.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
+
+#include <kdebug.h>
+#include <klocale.h>
#include <qapplication.h>
#include <qbitmap.h>
@@ -41,20 +55,6 @@
#include <qpolygon.h>
#include <qtimer.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpAbstractSelection.h>
-#include <kpAbstractImageSelection.h>
-#include <kpCommandEnvironment.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpRectangularImageSelection.h>
-#include <kpTextSelection.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
-
kpToolSelectionResizeScaleCommand::kpToolSelectionResizeScaleCommand (
kpCommandEnvironment *environ)
diff --git a/commands/tools/selection/kpToolSelectionResizeScaleCommand.h b/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
index 1605775..7b61e66 100644
--- a/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
+++ b/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
@@ -33,7 +33,7 @@
#include <QObject>
#include <QPoint>
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class QTimer;
diff --git a/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp b/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
index 85090df..d371d35 100644
--- a/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
@@ -28,12 +28,12 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolTextBackspaceCommand.h>
+#include "kpToolTextBackspaceCommand.h"
-#include <qlist.h>
+#include "layers/selections/text/kpTextSelection.h"
+#include "views/manager/kpViewManager.h"
-#include <kpTextSelection.h>
-#include <kpViewManager.h>
+#include <qlist.h>
kpToolTextBackspaceCommand::kpToolTextBackspaceCommand (const QString &name,
diff --git a/commands/tools/selection/text/kpToolTextBackspaceCommand.h b/commands/tools/selection/text/kpToolTextBackspaceCommand.h
index 4c557f2..9a1f0e6 100644
--- a/commands/tools/selection/text/kpToolTextBackspaceCommand.h
+++ b/commands/tools/selection/text/kpToolTextBackspaceCommand.h
@@ -30,7 +30,7 @@
#define KP_TOOL_TEXT_BACKSPACE_COMMAND_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class kpToolTextBackspaceCommand : public kpNamedCommand
diff --git a/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp b/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp
index 10f9b95..08cfc07 100644
--- a/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp
@@ -28,12 +28,12 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolTextChangeStyleCommand.h>
+#include "kpToolTextChangeStyleCommand.h"
-#include <kdebug.h>
+#include "environments/commands/kpCommandEnvironment.h"
+#include "layers/selections/text/kpTextSelection.h"
-#include <kpCommandEnvironment.h>
-#include <kpTextSelection.h>
+#include <kdebug.h>
kpToolTextChangeStyleCommand::kpToolTextChangeStyleCommand (const QString &name,
diff --git a/commands/tools/selection/text/kpToolTextChangeStyleCommand.h b/commands/tools/selection/text/kpToolTextChangeStyleCommand.h
index 9dda749..b2cd011 100644
--- a/commands/tools/selection/text/kpToolTextChangeStyleCommand.h
+++ b/commands/tools/selection/text/kpToolTextChangeStyleCommand.h
@@ -30,8 +30,8 @@
#define KP_TOOL_TEXT_CHANGE_STYLE_COMMAND_H
-#include <kpNamedCommand.h>
-#include <kpTextStyle.h>
+#include "commands/kpNamedCommand.h"
+#include "layers/selections/text/kpTextStyle.h"
class kpToolTextChangeStyleCommand : public kpNamedCommand
diff --git a/commands/tools/selection/text/kpToolTextDeleteCommand.cpp b/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
index a248f6f..ea7cc8d 100644
--- a/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
@@ -28,12 +28,12 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolTextDeleteCommand.h>
+#include "kpToolTextDeleteCommand.h"
-#include <qlist.h>
+#include "layers/selections/text/kpTextSelection.h"
+#include "views/manager/kpViewManager.h"
-#include <kpTextSelection.h>
-#include <kpViewManager.h>
+#include <qlist.h>
kpToolTextDeleteCommand::kpToolTextDeleteCommand (const QString &name,
diff --git a/commands/tools/selection/text/kpToolTextDeleteCommand.h b/commands/tools/selection/text/kpToolTextDeleteCommand.h
index 2d82036..8c8511c 100644
--- a/commands/tools/selection/text/kpToolTextDeleteCommand.h
+++ b/commands/tools/selection/text/kpToolTextDeleteCommand.h
@@ -30,7 +30,7 @@
#define KP_TOOL_TEXT_DELETE_COMMAND_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class kpToolTextDeleteCommand : public kpNamedCommand
diff --git a/commands/tools/selection/text/kpToolTextEnterCommand.cpp b/commands/tools/selection/text/kpToolTextEnterCommand.cpp
index 6c4a82e..b77abc3 100644
--- a/commands/tools/selection/text/kpToolTextEnterCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextEnterCommand.cpp
@@ -28,12 +28,12 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolTextEnterCommand.h>
+#include "kpToolTextEnterCommand.h"
-#include <qlist.h>
+#include "layers/selections/text/kpTextSelection.h"
+#include "views/manager/kpViewManager.h"
-#include <kpTextSelection.h>
-#include <kpViewManager.h>
+#include <qlist.h>
kpToolTextEnterCommand::kpToolTextEnterCommand (const QString &name,
diff --git a/commands/tools/selection/text/kpToolTextEnterCommand.h b/commands/tools/selection/text/kpToolTextEnterCommand.h
index babf968..93f6fdd 100644
--- a/commands/tools/selection/text/kpToolTextEnterCommand.h
+++ b/commands/tools/selection/text/kpToolTextEnterCommand.h
@@ -30,7 +30,7 @@
#define KP_TOOL_TEXT_ENTER_COMMAND_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class kpToolTextEnterCommand : public kpNamedCommand
diff --git a/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp b/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp
index ab2347f..5bfee24 100644
--- a/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp
@@ -29,16 +29,16 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpToolTextGiveContentCommand.h>
+#include "kpToolTextGiveContentCommand.h"
+
+#include "environments/commands/kpCommandEnvironment.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "views/manager/kpViewManager.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandEnvironment.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpViewManager.h>
-
kpToolTextGiveContentCommand::kpToolTextGiveContentCommand (
const kpTextSelection &originalSelBorder,
diff --git a/commands/tools/selection/text/kpToolTextGiveContentCommand.h b/commands/tools/selection/text/kpToolTextGiveContentCommand.h
index 796aa18..247dbcd 100644
--- a/commands/tools/selection/text/kpToolTextGiveContentCommand.h
+++ b/commands/tools/selection/text/kpToolTextGiveContentCommand.h
@@ -30,7 +30,7 @@
#define kpToolTextGiveContentCommand_H
-#include <kpAbstractSelectionContentCommand.h>
+#include "commands/tools/selection/kpAbstractSelectionContentCommand.h"
class kpTextSelection;
diff --git a/commands/tools/selection/text/kpToolTextInsertCommand.cpp b/commands/tools/selection/text/kpToolTextInsertCommand.cpp
index a946a37..2a95021 100644
--- a/commands/tools/selection/text/kpToolTextInsertCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextInsertCommand.cpp
@@ -28,12 +28,12 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolTextInsertCommand.h>
+#include "kpToolTextInsertCommand.h"
-#include <qlist.h>
+#include "layers/selections/text/kpTextSelection.h"
+#include "views/manager/kpViewManager.h"
-#include <kpTextSelection.h>
-#include <kpViewManager.h>
+#include <qlist.h>
//---------------------------------------------------------------------
diff --git a/commands/tools/selection/text/kpToolTextInsertCommand.h b/commands/tools/selection/text/kpToolTextInsertCommand.h
index b2bc3a5..7b22bcd 100644
--- a/commands/tools/selection/text/kpToolTextInsertCommand.h
+++ b/commands/tools/selection/text/kpToolTextInsertCommand.h
@@ -30,7 +30,7 @@
#define KP_TOOL_TEXT_INSERT_COMMAND_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class kpToolTextInsertCommand : public kpNamedCommand
diff --git a/cursors/kpCursorLightCross.cpp b/cursors/kpCursorLightCross.cpp
index 10f11e8..8a5beaf 100644
--- a/cursors/kpCursorLightCross.cpp
+++ b/cursors/kpCursorLightCross.cpp
@@ -28,13 +28,13 @@
#define DEBUG_KP_CURSOR_LIGHT_CROSS 0
-#include <kpCursorLightCross.h>
+#include "kpCursorLightCross.h"
+
+#include <kdebug.h>
#include <qbitmap.h>
#include <qcursor.h>
-#include <kdebug.h>
-
enum PixelValue
{
diff --git a/cursors/kpCursorProvider.cpp b/cursors/kpCursorProvider.cpp
index 96c4e69..92a1746 100644
--- a/cursors/kpCursorProvider.cpp
+++ b/cursors/kpCursorProvider.cpp
@@ -26,11 +26,11 @@
*/
-#include <kpCursorProvider.h>
+#include "kpCursorProvider.h"
-#include <qcursor.h>
+#include "kpCursorLightCross.h"
-#include <kpCursorLightCross.h>
+#include <qcursor.h>
static const QCursor *TheLightCursor = 0;
diff --git a/dialogs/imagelib/effects/kpEffectsDialog.cpp b/dialogs/imagelib/effects/kpEffectsDialog.cpp
index 4b1565a..8c1f5db 100644
--- a/dialogs/imagelib/effects/kpEffectsDialog.cpp
+++ b/dialogs/imagelib/effects/kpEffectsDialog.cpp
@@ -29,7 +29,25 @@
#define DEBUG_KP_EFFECTS_DIALOG 0
-#include <kpEffectsDialog.h>
+#include "kpEffectsDialog.h"
+
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "widgets/imagelib/effects/kpEffectBalanceWidget.h"
+#include "widgets/imagelib/effects/kpEffectBlurSharpenWidget.h"
+#include "widgets/imagelib/effects/kpEffectEmbossWidget.h"
+#include "widgets/imagelib/effects/kpEffectFlattenWidget.h"
+#include "widgets/imagelib/effects/kpEffectHSVWidget.h"
+#include "widgets/imagelib/effects/kpEffectInvertWidget.h"
+#include "widgets/imagelib/effects/kpEffectReduceColorsWidget.h"
+#include "widgets/imagelib/effects/kpEffectToneEnhanceWidget.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h"
+
+#include <kapplication.h>
+#include <kconfig.h>
+#include <kdebug.h>
+#include <klocale.h>
#include <qcombobox.h>
#include <qgroupbox.h>
@@ -38,24 +56,6 @@
#include <qtimer.h>
#include <QImage>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpEffectBalanceWidget.h>
-#include <kpEffectBlurSharpenWidget.h>
-#include <kpEffectEmbossWidget.h>
-#include <kpEffectFlattenWidget.h>
-#include <kpEffectHSVWidget.h>
-#include <kpEffectInvertWidget.h>
-#include <kpEffectReduceColorsWidget.h>
-#include <kpEffectToneEnhanceWidget.h>
-#include <kpPixmapFX.h>
-#include <kpTransformDialogEnvironment.h>
-
// protected static
int kpEffectsDialog::s_lastWidth = 640;
diff --git a/dialogs/imagelib/effects/kpEffectsDialog.h b/dialogs/imagelib/effects/kpEffectsDialog.h
index 840d0d7..7e37b4b 100644
--- a/dialogs/imagelib/effects/kpEffectsDialog.h
+++ b/dialogs/imagelib/effects/kpEffectsDialog.h
@@ -30,7 +30,7 @@
#define KP_EFFECTS_DIALOG_H
-#include <kpTransformPreviewDialog.h>
+#include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"
class QComboBox;
diff --git a/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp b/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp
index d57b774..9111fc8 100644
--- a/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp
+++ b/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp
@@ -28,7 +28,14 @@
#define DEBUG_KP_DOCUMENT_META_INFO_DIALOG 0
-#include <kpDocumentMetaInfoDialog.h>
+#include "kpDocumentMetaInfoDialog.h"
+
+#include "kpDefs.h"
+#include "imagelib/kpDocumentMetaInfo.h"
+
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KDebug>
#include <QAbstractItemView>
#include <QDialogButtonBox>
@@ -40,12 +47,6 @@
#include <QTableWidget>
#include <QSpinBox>
#include <QDoubleSpinBox>
-#include <KLocalizedString>
-#include <KMessageBox>
-#include <KDebug>
-
-#include <kpDefs.h>
-#include <kpDocumentMetaInfo.h>
struct kpDocumentMetaInfoDialogPrivate
diff --git a/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp b/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp
index 32751ff..acd4315 100644
--- a/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TRANSFORM_PREVIEW_DIALOG 0
-#include <kpTransformPreviewDialog.h>
+#include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"
#include <qapplication.h>
#include <qboxlayout.h>
@@ -44,12 +44,12 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpAbstractImageSelection.h>
-#include <kpColor.h>
-#include <kpDocument.h>
-#include <kpPixmapFX.h>
-#include <kpResizeSignallingLabel.h>
-#include <kpTransformDialogEnvironment.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "imagelib/kpColor.h"
+#include "document/kpDocument.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "generic/widgets/kpResizeSignallingLabel.h"
+#include "environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h"
kpTransformPreviewDialog::kpTransformPreviewDialog (Features features,
diff --git a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
index 74168fd..d96feb9 100644
--- a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TOOL_RESIZE_SCALE_DIALOG 0
-#include <kpTransformResizeScaleDialog.h>
+#include "kpTransformResizeScaleDialog.h"
#include <math.h>
@@ -55,12 +55,12 @@
#include <kiconloader.h>
#include <klocale.h>
-#include <kpAbstractSelection.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpTool.h>
-#include <kpTransformDialogEnvironment.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "tools/kpTool.h"
+#include "environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h"
//---------------------------------------------------------------------
diff --git a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
index c9ab419..50a3f32 100644
--- a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
+++ b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
@@ -31,8 +31,8 @@
#include <QDialog>
-#include <kpColor.h>
-#include <kpTransformResizeScaleCommand.h>
+#include "imagelib/kpColor.h"
+#include "commands/imagelib/transforms/kpTransformResizeScaleCommand.h"
class QCheckBox;
diff --git a/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp b/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp
index e5d17e3..320ac8c 100644
--- a/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp
@@ -27,7 +27,18 @@
#define DEBUG_KP_TOOL_ROTATE 0
-#include <kpTransformRotateDialog.h>
+#include "kpTransformRotateDialog.h"
+
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
+#include "environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h"
+#include "views/manager/kpViewManager.h"
+
+#include <kdebug.h>
+#include <kiconloader.h>
+#include <klocale.h>
#include <qapplication.h>
#include <qbuttongroup.h>
@@ -41,17 +52,6 @@
#include <qradiobutton.h>
#include <qmatrix.h>
-#include <kdebug.h>
-#include <kiconloader.h>
-#include <klocale.h>
-
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
-#include <kpTransformDialogEnvironment.h>
-#include <kpViewManager.h>
-
// private static
int kpTransformRotateDialog::s_lastWidth = -1,
diff --git a/dialogs/imagelib/transforms/kpTransformRotateDialog.h b/dialogs/imagelib/transforms/kpTransformRotateDialog.h
index 3f82fbf..eca82c9 100644
--- a/dialogs/imagelib/transforms/kpTransformRotateDialog.h
+++ b/dialogs/imagelib/transforms/kpTransformRotateDialog.h
@@ -33,8 +33,8 @@
#include <QImage>
#include <qpoint.h>
-#include <kpColor.h>
-#include <kpTransformPreviewDialog.h>
+#include "imagelib/kpColor.h"
+#include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"
class QButtonGroup;
diff --git a/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp b/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp
index d8718e0..68bdd6a 100644
--- a/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TOOL_SKEW_DIALOG 0
-#include <kpTransformSkewDialog.h>
+#include "dialogs/imagelib/transforms/kpTransformSkewDialog.h"
#include <qapplication.h>
#include <qgridlayout.h>
@@ -45,11 +45,11 @@
#include <kiconloader.h>
#include <klocale.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
-#include <kpTransformDialogEnvironment.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
+#include "environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h"
// private static
diff --git a/dialogs/imagelib/transforms/kpTransformSkewDialog.h b/dialogs/imagelib/transforms/kpTransformSkewDialog.h
index 6a385d0..4d219a0 100644
--- a/dialogs/imagelib/transforms/kpTransformSkewDialog.h
+++ b/dialogs/imagelib/transforms/kpTransformSkewDialog.h
@@ -28,8 +28,8 @@
#ifndef kpTransformSkewDialog_H
#define kpTransformSkewDialog_H
-#include <kpColor.h>
-#include <kpTransformPreviewDialog.h>
+#include "kpTransformPreviewDialog.h"
+#include "imagelib/kpColor.h"
class QSpinBox;
diff --git a/dialogs/kpColorSimilarityDialog.cpp b/dialogs/kpColorSimilarityDialog.cpp
index 2312ced..7fee5c2 100644
--- a/dialogs/kpColorSimilarityDialog.cpp
+++ b/dialogs/kpColorSimilarityDialog.cpp
@@ -26,7 +26,11 @@
*/
-#include <kpColorSimilarityDialog.h>
+#include "kpColorSimilarityDialog.h"
+
+#include "widgets/colorSimilarity/kpColorSimilarityFrame.h"
+
+#include <klocale.h>
#include <qboxlayout.h>
#include <qdialogbuttonbox.h>
@@ -37,10 +41,6 @@
#include <QWhatsThis>
#include <QSpinBox>
-#include <klocale.h>
-
-#include <kpColorSimilarityFrame.h>
-
kpColorSimilarityDialog::kpColorSimilarityDialog (QWidget *parent)
: QDialog (parent)
diff --git a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
index ccd2531..49fe389 100644
--- a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
+++ b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
@@ -28,7 +28,7 @@
#define DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET 0
-#include <kpDocumentSaveOptionsPreviewDialog.h>
+#include "kpDocumentSaveOptionsPreviewDialog.h"
#include <qevent.h>
#include <qgridlayout.h>
@@ -40,12 +40,12 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandSize.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpPixmapFX.h>
-#include <kpResizeSignallingLabel.h>
-#include <kpTransformPreviewDialog.h>
+#include "commands/kpCommandSize.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "generic/widgets/kpResizeSignallingLabel.h"
+#include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"
// protected static
diff --git a/dialogs/kpDocumentSaveOptionsPreviewDialog.h b/dialogs/kpDocumentSaveOptionsPreviewDialog.h
index 1c45f7c..1869e0a 100644
--- a/dialogs/kpDocumentSaveOptionsPreviewDialog.h
+++ b/dialogs/kpDocumentSaveOptionsPreviewDialog.h
@@ -29,11 +29,10 @@
#ifndef kpDocumentSaveOptionsPreviewDialog_H
#define kpDocumentSaveOptionsPreviewDialog_H
+#include "generic/widgets/kpSubWindow.h"
#include <qsize.h>
-#include <kpSubWindow.h>
-
class QCloseEvent;
class QImage;
diff --git a/document/kpDocument.cpp b/document/kpDocument.cpp
index e832447..a73581f 100644
--- a/document/kpDocument.cpp
+++ b/document/kpDocument.cpp
@@ -29,11 +29,30 @@
#define DEBUG_KP_DOCUMENT 0
-#include <kpDocument.h>
-#include <kpDocumentPrivate.h>
+#include "kpDocument.h"
+#include "kpDocumentPrivate.h"
+
+#include "layers/selections/kpAbstractSelection.h"
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "imagelib/kpColor.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "kpDefs.h"
+#include "environments/document/kpDocumentEnvironment.h"
+#include "document/kpDocumentSaveOptions.h"
+#include "imagelib/kpDocumentMetaInfo.h"
+#include "imagelib/effects/kpEffectReduceColors.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "lgpl/generic/kpUrlFormatter.h"
#include <math.h>
+#include <kdebug.h>
+#include <kimageio.h>
+#include <kio/netaccess.h>
+#include <klocale.h>
+
#include <qcolor.h>
#include <qbitmap.h>
#include <qbrush.h>
@@ -46,25 +65,6 @@
#include <qsize.h>
#include <qmatrix.h>
-#include <kdebug.h>
-#include <kimageio.h>
-#include <kio/netaccess.h>
-#include <klocale.h>
-
-#include <kpAbstractSelection.h>
-#include <kpAbstractImageSelection.h>
-#include <kpColor.h>
-#include <kpColorToolBar.h>
-#include <kpDefs.h>
-#include <kpDocumentEnvironment.h>
-#include <kpDocumentSaveOptions.h>
-#include <kpDocumentMetaInfo.h>
-#include <kpEffectReduceColors.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
-#include <kpToolToolBar.h>
-#include <kpUrlFormatter.h>
-
//---------------------------------------------------------------------
kpDocument::kpDocument (int w, int h,
diff --git a/document/kpDocument.h b/document/kpDocument.h
index 37dc813..f9e7acb 100644
--- a/document/kpDocument.h
+++ b/document/kpDocument.h
@@ -35,8 +35,8 @@
#include <qstring.h>
#include <qurl.h>
-#include <kpImage.h>
-#include <kpPixmapFX.h>
+#include "imagelib/kpImage.h"
+#include "pixmapfx/kpPixmapFX.h"
#undef environ
class QImage;
diff --git a/document/kpDocumentSaveOptions.cpp b/document/kpDocumentSaveOptions.cpp
index 38ce087..ad4a940 100644
--- a/document/kpDocumentSaveOptions.cpp
+++ b/document/kpDocumentSaveOptions.cpp
@@ -28,18 +28,18 @@
#define DEBUG_KP_DOCUMENT_SAVE_OPTIONS 0
-#include <kpDocumentSaveOptions.h>
+#include "kpDocumentSaveOptions.h"
-#include <qbitmap.h>
-#include <QImage>
-#include <qstring.h>
+#include "kpDefs.h"
+#include "pixmapfx/kpPixmapFX.h"
#include <kconfiggroup.h>
#include <kdebug.h>
#include <ksharedconfig.h>
-#include <kpDefs.h>
-#include <kpPixmapFX.h>
+#include <qbitmap.h>
+#include <QImage>
+#include <qstring.h>
//---------------------------------------------------------------------
diff --git a/document/kpDocument_Open.cpp b/document/kpDocument_Open.cpp
index 85088fa..5aebb1c 100644
--- a/document/kpDocument_Open.cpp
+++ b/document/kpDocument_Open.cpp
@@ -29,8 +29,20 @@
#define DEBUG_KP_DOCUMENT 0
-#include <kpDocument.h>
-#include <kpDocumentPrivate.h>
+#include "kpDocument.h"
+#include "kpDocumentPrivate.h"
+
+#include "imagelib/kpColor.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "kpDefs.h"
+#include "environments/document/kpDocumentEnvironment.h"
+#include "document/kpDocumentSaveOptions.h"
+#include "imagelib/kpDocumentMetaInfo.h"
+#include "imagelib/effects/kpEffectReduceColors.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
+#include "lgpl/generic/kpUrlFormatter.h"
+#include "views/manager/kpViewManager.h"
#include <math.h>
@@ -44,18 +56,6 @@
#include <kmessagebox.h>
#include <kmimetype.h> // TODO: isn't this in KIO?
-#include <kpColor.h>
-#include <kpColorToolBar.h>
-#include <kpDefs.h>
-#include <kpDocumentEnvironment.h>
-#include <kpDocumentSaveOptions.h>
-#include <kpDocumentMetaInfo.h>
-#include <kpEffectReduceColors.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
-#include <kpUrlFormatter.h>
-#include <kpViewManager.h>
-
//---------------------------------------------------------------------
void kpDocument::getDataFromImage(const QImage &image,
diff --git a/document/kpDocument_Save.cpp b/document/kpDocument_Save.cpp
index 345ce43..13d624e 100644
--- a/document/kpDocument_Save.cpp
+++ b/document/kpDocument_Save.cpp
@@ -28,8 +28,8 @@
#define DEBUG_KP_DOCUMENT 0
-#include <kpDocument.h>
-#include <kpDocumentPrivate.h>
+#include "kpDocument.h"
+#include "kpDocumentPrivate.h"
#include <math.h>
@@ -54,18 +54,18 @@
#include <kmessagebox.h>
#include <kmimetype.h> // TODO: isn't this in KIO?
-#include <kpColor.h>
-#include <kpColorToolBar.h>
-#include <kpDefs.h>
-#include <kpDocumentEnvironment.h>
-#include <kpDocumentSaveOptions.h>
-#include <kpDocumentMetaInfo.h>
-#include <kpEffectReduceColors.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
-#include <kpToolToolBar.h>
-#include <kpUrlFormatter.h>
-#include <kpViewManager.h>
+#include "imagelib/kpColor.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "kpDefs.h"
+#include "environments/document/kpDocumentEnvironment.h"
+#include "document/kpDocumentSaveOptions.h"
+#include "imagelib/kpDocumentMetaInfo.h"
+#include "imagelib/effects/kpEffectReduceColors.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "lgpl/generic/kpUrlFormatter.h"
+#include "views/manager/kpViewManager.h"
bool kpDocument::save (bool overwritePrompt, bool lossyPrompt)
diff --git a/document/kpDocument_Selection.cpp b/document/kpDocument_Selection.cpp
index ffdfb87..195d2eb 100644
--- a/document/kpDocument_Selection.cpp
+++ b/document/kpDocument_Selection.cpp
@@ -29,8 +29,8 @@
#define DEBUG_KP_DOCUMENT 0
-#include <kpDocument.h>
-#include <kpDocumentPrivate.h>
+#include "kpDocument.h"
+#include "kpDocumentPrivate.h"
#include <math.h>
@@ -42,12 +42,12 @@
#include <kimageio.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpDefs.h>
-#include <kpDocumentEnvironment.h>
-#include <kpAbstractSelection.h>
-#include <kpAbstractImageSelection.h>
-#include <kpTextSelection.h>
+#include "imagelib/kpColor.h"
+#include "kpDefs.h"
+#include "environments/document/kpDocumentEnvironment.h"
+#include "layers/selections/kpAbstractSelection.h"
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "layers/selections/text/kpTextSelection.h"
// public
diff --git a/environments/commands/kpCommandEnvironment.cpp b/environments/commands/kpCommandEnvironment.cpp
index e19fe80..940aa65 100644
--- a/environments/commands/kpCommandEnvironment.cpp
+++ b/environments/commands/kpCommandEnvironment.cpp
@@ -26,14 +26,14 @@
*/
-#include <kpCommandEnvironment.h>
-
-#include <kpColorToolBar.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpImageSelectionTransparency.h>
-#include <kpTextStyle.h>
-#include <kpTool.h>
+#include "environments/commands/kpCommandEnvironment.h"
+
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "layers/selections/image/kpImageSelectionTransparency.h"
+#include "layers/selections/text/kpTextStyle.h"
+#include "tools/kpTool.h"
struct kpCommandEnvironmentPrivate
diff --git a/environments/commands/kpCommandEnvironment.h b/environments/commands/kpCommandEnvironment.h
index fb2b0ad..a494cc2 100644
--- a/environments/commands/kpCommandEnvironment.h
+++ b/environments/commands/kpCommandEnvironment.h
@@ -30,7 +30,7 @@
#define kpCommandEnvironment_H
-#include <kpEnvironmentBase.h>
+#include "environments/kpEnvironmentBase.h"
class kpMainWindow;
diff --git a/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.cpp b/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.cpp
index 022b62e..5978d33 100644
--- a/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.cpp
+++ b/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.cpp
@@ -26,9 +26,9 @@
*/
-#include <kpTransformDialogEnvironment.h>
+#include "environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h"
-#include <kpMainWindow.h>
+#include "mainWindow/kpMainWindow.h"
//---------------------------------------------------------------------
diff --git a/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h b/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h
index a3f4b21..3254070 100644
--- a/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h
+++ b/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h
@@ -30,7 +30,7 @@
#define kpTransformDialogEnvironment_H
-#include <kpEnvironmentBase.h>
+#include "environments/kpEnvironmentBase.h"
class kpCommandEnvironment;
diff --git a/environments/document/kpDocumentEnvironment.cpp b/environments/document/kpDocumentEnvironment.cpp
index bafce86..8a154b4 100644
--- a/environments/document/kpDocumentEnvironment.cpp
+++ b/environments/document/kpDocumentEnvironment.cpp
@@ -29,23 +29,23 @@
#define DEBUG_KP_DOCUMENT_ENVIRONMENT 0
-#include <kpDocumentEnvironment.h>
+#include "environments/document/kpDocumentEnvironment.h"
#include <KDebug>
-#include <kpMainWindow.h>
-#include <kpAbstractSelection.h>
-#include <kpDocument.h>
-#include <kpEllipticalImageSelection.h>
-#include <kpFreeFormImageSelection.h>
-#include <kpImageSelectionTransparency.h>
-#include <kpRectangularImageSelection.h>
-#include <kpTextSelection.h>
-#include <kpTextStyle.h>
+#include "mainWindow/kpMainWindow.h"
+#include "layers/selections/kpAbstractSelection.h"
+#include "document/kpDocument.h"
+#include "layers/selections/image/kpEllipticalImageSelection.h"
+#include "layers/selections/image/kpFreeFormImageSelection.h"
+#include "layers/selections/image/kpImageSelectionTransparency.h"
+#include "layers/selections/image/kpRectangularImageSelection.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "layers/selections/text/kpTextStyle.h"
#if DEBUG_KP_DOCUMENT_ENVIRONMENT
- #include <kpTool.h>
+ #include "tools/kpTool.h"
#endif
-#include <kpViewManager.h>
+#include "views/manager/kpViewManager.h"
struct kpDocumentEnvironmentPrivate
diff --git a/environments/document/kpDocumentEnvironment.h b/environments/document/kpDocumentEnvironment.h
index 264d335..8d6721b 100644
--- a/environments/document/kpDocumentEnvironment.h
+++ b/environments/document/kpDocumentEnvironment.h
@@ -30,7 +30,7 @@
#define kpDocumentEnvironment_H
-#include <kpEnvironmentBase.h>
+#include "environments/kpEnvironmentBase.h"
class QRect;
diff --git a/environments/kpEnvironmentBase.cpp b/environments/kpEnvironmentBase.cpp
index e2fdda2..602b78a 100644
--- a/environments/kpEnvironmentBase.cpp
+++ b/environments/kpEnvironmentBase.cpp
@@ -26,13 +26,13 @@
*/
-#include <kpEnvironmentBase.h>
+#include "environments/kpEnvironmentBase.h"
-#include <kpColorToolBar.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpTextStyle.h>
-#include <kpTool.h>
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "layers/selections/text/kpTextStyle.h"
+#include "tools/kpTool.h"
struct kpEnvironmentBasePrivate
diff --git a/environments/tools/kpToolEnvironment.cpp b/environments/tools/kpToolEnvironment.cpp
index 77bb207..c2255e5 100644
--- a/environments/tools/kpToolEnvironment.cpp
+++ b/environments/tools/kpToolEnvironment.cpp
@@ -26,18 +26,18 @@
*/
-#include <kpToolEnvironment.h>
+#include "kpToolEnvironment.h"
-#include <QActionGroup>
-#include <QPoint>
-#include <QString>
+#include "imagelib/kpColor.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "mainWindow/kpMainWindow.h"
+#include "widgets/toolbars/kpToolToolBar.h"
#include <KActionCollection>
-#include <kpColor.h>
-#include <kpColorToolBar.h>
-#include <kpMainWindow.h>
-#include <kpToolToolBar.h>
+#include <QActionGroup>
+#include <QPoint>
+#include <QString>
struct kpToolEnvironmentPrivate
diff --git a/environments/tools/kpToolEnvironment.h b/environments/tools/kpToolEnvironment.h
index 16c43b0..cc5080c 100644
--- a/environments/tools/kpToolEnvironment.h
+++ b/environments/tools/kpToolEnvironment.h
@@ -30,7 +30,7 @@
#define kpToolEnvironment_H
-#include <kpEnvironmentBase.h>
+#include "environments/kpEnvironmentBase.h"
class QActionGroup;
diff --git a/environments/tools/selection/kpToolSelectionEnvironment.cpp b/environments/tools/selection/kpToolSelectionEnvironment.cpp
index 4280cf2..4513e9d 100644
--- a/environments/tools/selection/kpToolSelectionEnvironment.cpp
+++ b/environments/tools/selection/kpToolSelectionEnvironment.cpp
@@ -26,11 +26,11 @@
*/
-#include <kpToolSelectionEnvironment.h>
+#include "kpToolSelectionEnvironment.h"
-#include <kpMainWindow.h>
-#include <kpImageSelectionTransparency.h>
-#include <kpTextStyle.h>
+#include "mainWindow/kpMainWindow.h"
+#include "layers/selections/image/kpImageSelectionTransparency.h"
+#include "layers/selections/text/kpTextStyle.h"
struct kpToolSelectionEnvironmentPrivate
diff --git a/environments/tools/selection/kpToolSelectionEnvironment.h b/environments/tools/selection/kpToolSelectionEnvironment.h
index 6df7dc1..48e32d3 100644
--- a/environments/tools/selection/kpToolSelectionEnvironment.h
+++ b/environments/tools/selection/kpToolSelectionEnvironment.h
@@ -30,7 +30,7 @@
#define kpToolSelectionEnvironment_H
-#include <kpToolEnvironment.h>
+#include "environments/tools/kpToolEnvironment.h"
class QMenu;
diff --git a/generic/kpSetOverrideCursorSaver.cpp b/generic/kpSetOverrideCursorSaver.cpp
index c695e89..0f7cc9f 100644
--- a/generic/kpSetOverrideCursorSaver.cpp
+++ b/generic/kpSetOverrideCursorSaver.cpp
@@ -26,7 +26,7 @@
*/
-#include <kpSetOverrideCursorSaver.h>
+#include "generic/kpSetOverrideCursorSaver.h"
#include <QApplication>
diff --git a/generic/kpWidgetMapper.cpp b/generic/kpWidgetMapper.cpp
index 25d5fb4..52b496d 100644
--- a/generic/kpWidgetMapper.cpp
+++ b/generic/kpWidgetMapper.cpp
@@ -26,7 +26,7 @@
*/
-#include <kpWidgetMapper.h>
+#include "kpWidgetMapper.h"
#include <qpoint.h>
#include <qrect.h>
diff --git a/generic/widgets/kpResizeSignallingLabel.cpp b/generic/widgets/kpResizeSignallingLabel.cpp
index dd7dbf6..afbc412 100644
--- a/generic/widgets/kpResizeSignallingLabel.cpp
+++ b/generic/widgets/kpResizeSignallingLabel.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_RESIZE_SIGNALLING_LABEL 0
-#include <kpResizeSignallingLabel.h>
+#include "generic/widgets/kpResizeSignallingLabel.h"
#include <qevent.h>
diff --git a/generic/widgets/kpSubWindow.cpp b/generic/widgets/kpSubWindow.cpp
index 667910d..330d138 100644
--- a/generic/widgets/kpSubWindow.cpp
+++ b/generic/widgets/kpSubWindow.cpp
@@ -26,7 +26,7 @@
*/
-#include <kpSubWindow.h>
+#include "kpSubWindow.h"
kpSubWindow::kpSubWindow (QWidget *parent)
diff --git a/imagelib/effects/kpEffectBalance.cpp b/imagelib/effects/kpEffectBalance.cpp
index 380ea2a..5606689 100644
--- a/imagelib/effects/kpEffectBalance.cpp
+++ b/imagelib/effects/kpEffectBalance.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_EFFECT_BALANCE 0
-#include <kpEffectBalance.h>
+#include "kpEffectBalance.h"
#include <math.h>
@@ -37,7 +37,7 @@
#include <kdebug.h>
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
#if DEBUG_KP_EFFECT_BALANCE
diff --git a/imagelib/effects/kpEffectBalance.h b/imagelib/effects/kpEffectBalance.h
index 6635864..d2f1911 100644
--- a/imagelib/effects/kpEffectBalance.h
+++ b/imagelib/effects/kpEffectBalance.h
@@ -30,7 +30,7 @@
#define kpEffectBalance_H
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
class kpEffectBalance
diff --git a/imagelib/effects/kpEffectBlurSharpen.cpp b/imagelib/effects/kpEffectBlurSharpen.cpp
index fa29f5b..06627de 100644
--- a/imagelib/effects/kpEffectBlurSharpen.cpp
+++ b/imagelib/effects/kpEffectBlurSharpen.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_EFFECT_BLUR_SHARPEN 0
-#include <kpEffectBlurSharpen.h>
+#include "kpEffectBlurSharpen.h"
#include <qimageblitz.h>
@@ -38,7 +38,7 @@
#include <kdebug.h>
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
#if DEBUG_KP_EFFECT_BLUR_SHARPEN
diff --git a/imagelib/effects/kpEffectBlurSharpen.h b/imagelib/effects/kpEffectBlurSharpen.h
index 60f1b89..25b92f2 100644
--- a/imagelib/effects/kpEffectBlurSharpen.h
+++ b/imagelib/effects/kpEffectBlurSharpen.h
@@ -30,7 +30,7 @@
#define kpEffectBlurSharpen_H
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
class kpEffectBlurSharpen
diff --git a/imagelib/effects/kpEffectEmboss.cpp b/imagelib/effects/kpEffectEmboss.cpp
index 0e5503a..f92ba57 100644
--- a/imagelib/effects/kpEffectEmboss.cpp
+++ b/imagelib/effects/kpEffectEmboss.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_EFFECT_EMBOSS 0
-#include <kpEffectEmboss.h>
+#include "kpEffectEmboss.h"
#include <qimageblitz.h>
@@ -37,7 +37,7 @@
#include <kdebug.h>
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
static QImage EmbossQImage (const QImage &qimage_, int strength)
diff --git a/imagelib/effects/kpEffectEmboss.h b/imagelib/effects/kpEffectEmboss.h
index 7b72ad6..6cc83ad 100644
--- a/imagelib/effects/kpEffectEmboss.h
+++ b/imagelib/effects/kpEffectEmboss.h
@@ -30,7 +30,7 @@
#define kpEffectEmboss_H
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
class kpEffectEmboss
diff --git a/imagelib/effects/kpEffectFlatten.cpp b/imagelib/effects/kpEffectFlatten.cpp
index 2e8ffbd..757c8f2 100644
--- a/imagelib/effects/kpEffectFlatten.cpp
+++ b/imagelib/effects/kpEffectFlatten.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_EFFECT_FLATTEN 0
-#include <kpEffectFlatten.h>
+#include "kpEffectFlatten.h"
#include <qimageblitz.h>
@@ -38,7 +38,7 @@
#include <kdebug.h>
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
// public static
diff --git a/imagelib/effects/kpEffectGrayscale.cpp b/imagelib/effects/kpEffectGrayscale.cpp
index 900c45f..6ea80fb 100644
--- a/imagelib/effects/kpEffectGrayscale.cpp
+++ b/imagelib/effects/kpEffectGrayscale.cpp
@@ -29,9 +29,9 @@
#define DEBUG_KP_PIXMAP_FX 0
-#include <kpEffectGrayscale.h>
+#include "kpEffectGrayscale.h"
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
static QRgb toGray (QRgb rgb)
diff --git a/imagelib/effects/kpEffectGrayscale.h b/imagelib/effects/kpEffectGrayscale.h
index 696c6ab..4f5b7a0 100644
--- a/imagelib/effects/kpEffectGrayscale.h
+++ b/imagelib/effects/kpEffectGrayscale.h
@@ -30,7 +30,7 @@
#define kpEffectGrayscale_H
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
//
diff --git a/imagelib/effects/kpEffectHSV.cpp b/imagelib/effects/kpEffectHSV.cpp
index 03377dd..228ce6c 100644
--- a/imagelib/effects/kpEffectHSV.cpp
+++ b/imagelib/effects/kpEffectHSV.cpp
@@ -27,7 +27,7 @@
// TODO: Clarence's code review
-#include <kpEffectHSV.h>
+#include "kpEffectHSV.h"
#include <math.h>
@@ -36,7 +36,7 @@
#include <kdebug.h>
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
static void ColorToHSV(unsigned int c, float* pHue, float* pSaturation, float* pValue)
diff --git a/imagelib/effects/kpEffectHSV.h b/imagelib/effects/kpEffectHSV.h
index d637190..26ceb8a 100644
--- a/imagelib/effects/kpEffectHSV.h
+++ b/imagelib/effects/kpEffectHSV.h
@@ -30,7 +30,7 @@
#define kpEffectHSV_H
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
class kpEffectHSV
diff --git a/imagelib/effects/kpEffectInvert.cpp b/imagelib/effects/kpEffectInvert.cpp
index c9abc88..340a148 100644
--- a/imagelib/effects/kpEffectInvert.cpp
+++ b/imagelib/effects/kpEffectInvert.cpp
@@ -29,14 +29,14 @@
#define DEBUG_KP_EFFECT_INVERT 0
-#include <kpEffectInvert.h>
+#include "kpEffectInvert.h"
#include <qimage.h>
#include <QImage>
#include <kdebug.h>
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
// public static
diff --git a/imagelib/effects/kpEffectReduceColors.cpp b/imagelib/effects/kpEffectReduceColors.cpp
index bfedb79..e612815 100644
--- a/imagelib/effects/kpEffectReduceColors.cpp
+++ b/imagelib/effects/kpEffectReduceColors.cpp
@@ -30,7 +30,7 @@
#define DEBUG_KP_EFFECT_REDUCE_COLORS 0
-#include <kpEffectReduceColors.h>
+#include "imagelib/effects/kpEffectReduceColors.h"
#include <kdebug.h>
diff --git a/imagelib/effects/kpEffectToneEnhance.cpp b/imagelib/effects/kpEffectToneEnhance.cpp
index 2a005cd..4d6e085 100644
--- a/imagelib/effects/kpEffectToneEnhance.cpp
+++ b/imagelib/effects/kpEffectToneEnhance.cpp
@@ -29,13 +29,13 @@
// TODO: Clarence's code review
-#include <kpEffectToneEnhance.h>
+#include "kpEffectToneEnhance.h"
#include <qimage.h>
#include <kdebug.h>
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
#define RED_WEIGHT 77
diff --git a/imagelib/effects/kpEffectToneEnhance.h b/imagelib/effects/kpEffectToneEnhance.h
index 6bda7d2..a2503f1 100644
--- a/imagelib/effects/kpEffectToneEnhance.h
+++ b/imagelib/effects/kpEffectToneEnhance.h
@@ -31,7 +31,7 @@
#define kpEffectToneEnhance_H
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
//
diff --git a/imagelib/kpColor.cpp b/imagelib/kpColor.cpp
index a4a18d0..d797675 100644
--- a/imagelib/kpColor.cpp
+++ b/imagelib/kpColor.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_COLOR 0
-#include <kpColor.h>
+#include "kpColor.h"
#include <qdatastream.h>
diff --git a/imagelib/kpColor_Constants.cpp b/imagelib/kpColor_Constants.cpp
index 4b51926..b029228 100644
--- a/imagelib/kpColor_Constants.cpp
+++ b/imagelib/kpColor_Constants.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_COLOR 0
-#include <kpColor.h>
+#include "kpColor.h"
static inline int RoundUp2 (int val)
diff --git a/imagelib/kpDocumentMetaInfo.cpp b/imagelib/kpDocumentMetaInfo.cpp
index 55fb55b..1ca5520 100644
--- a/imagelib/kpDocumentMetaInfo.cpp
+++ b/imagelib/kpDocumentMetaInfo.cpp
@@ -26,7 +26,7 @@
*/
-#include <kpDocumentMetaInfo.h>
+#include "kpDocumentMetaInfo.h"
#include <cmath>
#include <math.h>
@@ -36,7 +36,7 @@
#include <kdebug.h>
-#include <kpDefs.h>
+#include "kpDefs.h"
//
diff --git a/imagelib/kpDocumentMetaInfo.h b/imagelib/kpDocumentMetaInfo.h
index 671f5cc..eac697c 100644
--- a/imagelib/kpDocumentMetaInfo.h
+++ b/imagelib/kpDocumentMetaInfo.h
@@ -35,7 +35,7 @@
#include <qmap.h>
#include <qstring.h>
-#include <kpCommandSize.h>
+#include "commands/kpCommandSize.h"
class QPoint;
diff --git a/imagelib/kpFloodFill.cpp b/imagelib/kpFloodFill.cpp
index 115d03b..2aaecef 100644
--- a/imagelib/kpFloodFill.cpp
+++ b/imagelib/kpFloodFill.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_FLOOD_FILL 0
-#include <kpFloodFill.h>
+#include "kpFloodFill.h"
#include <QApplication>
#include <QImage>
@@ -39,11 +39,11 @@
#include <kdebug.h>
-#include <kpColor.h>
-#include <kpDefs.h>
-#include <kpImage.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
+#include "kpColor.h"
+#include "kpImage.h"
+#include "kpDefs.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
//---------------------------------------------------------------------
diff --git a/imagelib/kpFloodFill.h b/imagelib/kpFloodFill.h
index 195bcbf..adf0f82 100644
--- a/imagelib/kpFloodFill.h
+++ b/imagelib/kpFloodFill.h
@@ -30,8 +30,8 @@
#define KP_FLOOD_FILL_H
-#include <kpCommandSize.h>
-#include <kpImage.h>
+#include "kpImage.h"
+#include "commands/kpCommandSize.h"
class kpColor;
diff --git a/imagelib/kpPainter.cpp b/imagelib/kpPainter.cpp
index fba316f..c5b3d69 100644
--- a/imagelib/kpPainter.cpp
+++ b/imagelib/kpPainter.cpp
@@ -29,7 +29,12 @@
#define DEBUG_KP_PAINTER 0
-#include <kpPainter.h>
+#include "kpPainter.h"
+
+#include "kpImage.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
+#include "tools/flow/kpToolFlowBase.h"
#include <cstdio>
@@ -39,11 +44,6 @@
#include <kdebug.h>
#include <krandom.h>
-#include <kpImage.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
-#include <kpToolFlowBase.h>
-
//---------------------------------------------------------------------
// public static
diff --git a/imagelib/kpPainter.h b/imagelib/kpPainter.h
index fe9ea2f..5fb5100 100644
--- a/imagelib/kpPainter.h
+++ b/imagelib/kpPainter.h
@@ -30,8 +30,8 @@
#define KP_PAINTER_H
-#include <kpColor.h>
-#include <kpImage.h>
+#include "kpColor.h"
+#include "kpImage.h"
class QPolygon;
diff --git a/imagelib/transforms/kpTransformAutoCrop.cpp b/imagelib/transforms/kpTransformAutoCrop.cpp
index bee701a..10cf17c 100644
--- a/imagelib/transforms/kpTransformAutoCrop.cpp
+++ b/imagelib/transforms/kpTransformAutoCrop.cpp
@@ -44,29 +44,29 @@
#define DEBUG_KP_TOOL_AUTO_CROP 0
-#include <kpTransformAutoCrop.h>
-
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qpainter.h>
+#include "kpTransformAutoCrop.h"
+
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "layers/selections/image/kpRectangularImageSelection.h"
+#include "generic/kpSetOverrideCursorSaver.h"
+#include "tools/kpTool.h"
+#include "views/manager/kpViewManager.h"
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpAbstractImageSelection.h>
-#include <kpColorToolBar.h>
-#include <kpCommandEnvironment.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpRectangularImageSelection.h>
-#include <kpSetOverrideCursorSaver.h>
-#include <kpTool.h>
-#include <kpViewManager.h>
+#include <qapplication.h>
+#include <qbitmap.h>
+#include <qimage.h>
+#include <qpainter.h>
//---------------------------------------------------------------------
diff --git a/imagelib/transforms/kpTransformAutoCrop.h b/imagelib/transforms/kpTransformAutoCrop.h
index df2a93f..c0742f6 100644
--- a/imagelib/transforms/kpTransformAutoCrop.h
+++ b/imagelib/transforms/kpTransformAutoCrop.h
@@ -30,7 +30,7 @@
#define KP_TOOL_AUTO_CROP_H
-#include <kpNamedCommand.h>
+#include "commands/kpNamedCommand.h"
class QRect;
diff --git a/imagelib/transforms/kpTransformCrop.cpp b/imagelib/transforms/kpTransformCrop.cpp
index 2c9fb29..b837e07 100644
--- a/imagelib/transforms/kpTransformCrop.cpp
+++ b/imagelib/transforms/kpTransformCrop.cpp
@@ -29,17 +29,17 @@
#define DEBUG_KP_TOOL_CROP 0
-#include <kpTransformCrop.h>
-#include <kpTransformCropPrivate.h>
+#include "kpTransformCrop.h"
+#include "kpTransformCropPrivate.h"
-#include <KLocalizedString>
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "layers/selections/kpAbstractSelection.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/imagelib/transforms/kpTransformResizeScaleCommand.h"
-#include <kpAbstractImageSelection.h>
-#include <kpAbstractSelection.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpTextSelection.h>
-#include <kpTransformResizeScaleCommand.h>
+#include <KLocalizedString>
void kpTransformCrop (kpMainWindow *mainWindow)
diff --git a/imagelib/transforms/kpTransformCrop_ImageSelection.cpp b/imagelib/transforms/kpTransformCrop_ImageSelection.cpp
index abb2f68..107f61c 100644
--- a/imagelib/transforms/kpTransformCrop_ImageSelection.cpp
+++ b/imagelib/transforms/kpTransformCrop_ImageSelection.cpp
@@ -29,19 +29,19 @@
#define DEBUG_KP_TOOL_CROP 0
-#include <kpTransformCrop.h>
-#include <kpTransformCropPrivate.h>
-
-#include <kpAbstractImageSelection.h>
-#include <kpCommandEnvironment.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpImage.h>
-#include <kpMacroCommand.h>
-#include <kpMainWindow.h>
-#include <kpPixmapFX.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpViewManager.h>
+#include "kpTransformCrop.h"
+#include "kpTransformCropPrivate.h"
+
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpImage.h"
+#include "commands/kpMacroCommand.h"
+#include "mainWindow/kpMainWindow.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "views/manager/kpViewManager.h"
// See the "image selection" part of the kpTransformCrop() API Doc.
diff --git a/imagelib/transforms/kpTransformCrop_TextSelection.cpp b/imagelib/transforms/kpTransformCrop_TextSelection.cpp
index b4853bc..73162ad 100644
--- a/imagelib/transforms/kpTransformCrop_TextSelection.cpp
+++ b/imagelib/transforms/kpTransformCrop_TextSelection.cpp
@@ -28,13 +28,13 @@
#define DEBUG_KP_TOOL_CROP 0
-#include <kpTransformCrop.h>
-#include <kpTransformCropPrivate.h>
+#include "kpTransformCrop.h"
+#include "kpTransformCropPrivate.h"
-#include <kpEffectClearCommand.h>
-#include <kpMacroCommand.h>
-#include <kpMainWindow.h>
-#include <kpToolSelectionMoveCommand.h>
+#include "commands/imagelib/effects/kpEffectClearCommand.h"
+#include "commands/kpMacroCommand.h"
+#include "mainWindow/kpMainWindow.h"
+#include "commands/tools/selection/kpToolSelectionMoveCommand.h"
void kpTransformCrop_TextSelection (kpMainWindow *mainWindow,
diff --git a/kolourpaint.cpp b/kolourpaint.cpp
index f21dcbe..7680023 100644
--- a/kolourpaint.cpp
+++ b/kolourpaint.cpp
@@ -29,7 +29,7 @@
#include <kaboutdata.h>
#include <kdeversion.h>
-#include <kpMainWindow.h>
+#include "mainWindow/kpMainWindow.h"
#include <kolourpaintlicense.h>
#include <QApplication>
diff --git a/kpThumbnail.cpp b/kpThumbnail.cpp
index 7b57cd3..abcde02 100644
--- a/kpThumbnail.cpp
+++ b/kpThumbnail.cpp
@@ -29,19 +29,19 @@
#define DEBUG_KP_THUMBNAIL 0
-#include <kpThumbnail.h>
+#include "kpThumbnail.h"
-#include <QAction>
-#include <QLayout>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "views/kpThumbnailView.h"
+#include "tools/kpTool.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpThumbnailView.h>
-#include <kpTool.h>
+#include <QAction>
+#include <QLayout>
struct kpThumbnailPrivate
diff --git a/kpThumbnail.h b/kpThumbnail.h
index 2f0299e..1c38140 100644
--- a/kpThumbnail.h
+++ b/kpThumbnail.h
@@ -30,7 +30,7 @@
#define KP_THUMBNAIL_H
-#include <kpSubWindow.h>
+#include "generic/widgets/kpSubWindow.h"
class QMoveEvent;
diff --git a/kpViewScrollableContainer.cpp b/kpViewScrollableContainer.cpp
index 772fdbf..4f9f0da 100644
--- a/kpViewScrollableContainer.cpp
+++ b/kpViewScrollableContainer.cpp
@@ -27,7 +27,7 @@
#define DEBUG_KP_VIEW_SCROLLABLE_CONTAINER 0
-#include <kpViewScrollableContainer.h>
+#include "kpViewScrollableContainer.h"
#include <qbitmap.h>
#include <qcursor.h>
@@ -41,10 +41,10 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpDefs.h>
-#include <kpPixmapFX.h>
-#include <kpView.h>
-#include <kpWidgetMapper.h>
+#include "kpDefs.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "views/kpView.h"
+#include "generic/kpWidgetMapper.h"
//---------------------------------------------------------------------
diff --git a/layers/selections/image/kpAbstractImageSelection.cpp b/layers/selections/image/kpAbstractImageSelection.cpp
index 1c30ff5..1c25503 100644
--- a/layers/selections/image/kpAbstractImageSelection.cpp
+++ b/layers/selections/image/kpAbstractImageSelection.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_SELECTION 0
-#include <kpAbstractImageSelection.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
#include <QBitmap>
#include <QPainter>
diff --git a/layers/selections/image/kpAbstractImageSelection.h b/layers/selections/image/kpAbstractImageSelection.h
index 6753629..03ab741 100644
--- a/layers/selections/image/kpAbstractImageSelection.h
+++ b/layers/selections/image/kpAbstractImageSelection.h
@@ -30,10 +30,9 @@
#define kpAbstractImageSelection_H
-#include <kpAbstractSelection.h>
-
-#include <kpImage.h>
-#include <kpImageSelectionTransparency.h>
+#include "kpImageSelectionTransparency.h"
+#include "layers/selections/kpAbstractSelection.h"
+#include "imagelib/kpImage.h"
//
diff --git a/layers/selections/image/kpEllipticalImageSelection.cpp b/layers/selections/image/kpEllipticalImageSelection.cpp
index 18bd30c..6a8d35f 100644
--- a/layers/selections/image/kpEllipticalImageSelection.cpp
+++ b/layers/selections/image/kpEllipticalImageSelection.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_SELECTION 0
-#include <kpEllipticalImageSelection.h>
+#include "layers/selections/image/kpEllipticalImageSelection.h"
#include <QPainter>
#include <QRegion>
diff --git a/layers/selections/image/kpEllipticalImageSelection.h b/layers/selections/image/kpEllipticalImageSelection.h
index e52a6cb..ab5ffad 100644
--- a/layers/selections/image/kpEllipticalImageSelection.h
+++ b/layers/selections/image/kpEllipticalImageSelection.h
@@ -30,7 +30,7 @@
#define kpEllipticalImageSelection_H
-#include <kpAbstractImageSelection.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
class kpEllipticalImageSelection : public kpAbstractImageSelection
diff --git a/layers/selections/image/kpFreeFormImageSelection.cpp b/layers/selections/image/kpFreeFormImageSelection.cpp
index 3227a3b..9c26982 100644
--- a/layers/selections/image/kpFreeFormImageSelection.cpp
+++ b/layers/selections/image/kpFreeFormImageSelection.cpp
@@ -29,11 +29,11 @@
#define DEBUG_KP_SELECTION 0
-#include <kpFreeFormImageSelection.h>
+#include "layers/selections/image/kpFreeFormImageSelection.h"
#include <KDebug>
-#include <kpPainter.h>
+#include "imagelib/kpPainter.h"
struct kpFreeFormImageSelectionPrivate
diff --git a/layers/selections/image/kpFreeFormImageSelection.h b/layers/selections/image/kpFreeFormImageSelection.h
index c2751d1..9d8b379 100644
--- a/layers/selections/image/kpFreeFormImageSelection.h
+++ b/layers/selections/image/kpFreeFormImageSelection.h
@@ -30,7 +30,7 @@
#define kpFreeFormImageSelection_H
-#include <kpAbstractImageSelection.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
class kpFreeFormImageSelection : public kpAbstractImageSelection
diff --git a/layers/selections/image/kpImageSelectionTransparency.cpp b/layers/selections/image/kpImageSelectionTransparency.cpp
index 736de9b..8f2db2d 100644
--- a/layers/selections/image/kpImageSelectionTransparency.cpp
+++ b/layers/selections/image/kpImageSelectionTransparency.cpp
@@ -29,12 +29,12 @@
#define DEBUG_KP_SELECTION_TRANSPARENCY 0
-#include <kpImageSelectionTransparency.h>
+#include "layers/selections/image/kpImageSelectionTransparency.h"
#include <kdebug.h>
-#include <kpColor.h>
-#include <kpColorSimilarityHolder.h>
+#include "imagelib/kpColor.h"
+#include "widgets/colorSimilarity/kpColorSimilarityHolder.h"
//---------------------------------------------------------------------
diff --git a/layers/selections/image/kpImageSelectionTransparency.h b/layers/selections/image/kpImageSelectionTransparency.h
index b110b39..66ae7ab 100644
--- a/layers/selections/image/kpImageSelectionTransparency.h
+++ b/layers/selections/image/kpImageSelectionTransparency.h
@@ -30,7 +30,7 @@
#define KP_SELECTION_TRANSPARENCY_H
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
// This does not apply to the Text Tool. Use kpTextStyle for that.
diff --git a/layers/selections/image/kpRectangularImageSelection.cpp b/layers/selections/image/kpRectangularImageSelection.cpp
index 2651763..4760e1b 100644
--- a/layers/selections/image/kpRectangularImageSelection.cpp
+++ b/layers/selections/image/kpRectangularImageSelection.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_SELECTION 0
-#include <kpRectangularImageSelection.h>
+#include "layers/selections/image/kpRectangularImageSelection.h"
#include <QBitmap>
#include <QRegion>
diff --git a/layers/selections/image/kpRectangularImageSelection.h b/layers/selections/image/kpRectangularImageSelection.h
index b486bd8..0929c98 100644
--- a/layers/selections/image/kpRectangularImageSelection.h
+++ b/layers/selections/image/kpRectangularImageSelection.h
@@ -30,7 +30,7 @@
#define kpRectangularImageSelection_H
-#include <kpAbstractImageSelection.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
class kpRectangularImageSelection : public kpAbstractImageSelection
diff --git a/layers/selections/kpAbstractSelection.cpp b/layers/selections/kpAbstractSelection.cpp
index 10613df..54e11a7 100644
--- a/layers/selections/kpAbstractSelection.cpp
+++ b/layers/selections/kpAbstractSelection.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_SELECTION 0
-#include <kpAbstractSelection.h>
+#include "layers/selections/kpAbstractSelection.h"
#include <QPolygon>
#include <QRect>
diff --git a/layers/selections/kpAbstractSelection.h b/layers/selections/kpAbstractSelection.h
index 260dc60..61bac17 100644
--- a/layers/selections/kpAbstractSelection.h
+++ b/layers/selections/kpAbstractSelection.h
@@ -34,8 +34,8 @@
#include <QObject>
-#include <kpCommandSize.h>
-#include <kpPixmapFX.h>
+#include "commands/kpCommandSize.h"
+#include "pixmapfx/kpPixmapFX.h"
class QImage;
diff --git a/layers/selections/kpSelectionDrag.cpp b/layers/selections/kpSelectionDrag.cpp
index ffd06c2..540be1b 100644
--- a/layers/selections/kpSelectionDrag.cpp
+++ b/layers/selections/kpSelectionDrag.cpp
@@ -29,16 +29,16 @@
#define DEBUG_KP_SELECTION_DRAG 0
-#include <kpSelectionDrag.h>
+#include "kpSelectionDrag.h"
#include <qdatastream.h>
#include <QImage>
#include <kdebug.h>
-#include <kpAbstractImageSelection.h>
-#include <kpRectangularImageSelection.h>
-#include <kpSelectionFactory.h>
+#include "kpSelectionFactory.h"
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "layers/selections/image/kpRectangularImageSelection.h"
//---------------------------------------------------------------------
diff --git a/layers/selections/kpSelectionFactory.cpp b/layers/selections/kpSelectionFactory.cpp
index aa4a9de..45e2c3b 100644
--- a/layers/selections/kpSelectionFactory.cpp
+++ b/layers/selections/kpSelectionFactory.cpp
@@ -29,13 +29,13 @@
#define DEBUG_KP_SELECTION 0
-#include <kpSelectionFactory.h>
+#include "kpSelectionFactory.h"
#include <QDataStream>
-#include <kpRectangularImageSelection.h>
-#include <kpEllipticalImageSelection.h>
-#include <kpFreeFormImageSelection.h>
+#include "layers/selections/image/kpRectangularImageSelection.h"
+#include "layers/selections/image/kpEllipticalImageSelection.h"
+#include "layers/selections/image/kpFreeFormImageSelection.h"
//---------------------------------------------------------------------
diff --git a/layers/selections/kpSelectionFactory.h b/layers/selections/kpSelectionFactory.h
index 79c0023..b492c5b 100644
--- a/layers/selections/kpSelectionFactory.h
+++ b/layers/selections/kpSelectionFactory.h
@@ -30,7 +30,7 @@
#define kpSelectionFactory_H
-#include <kpPixmapFX.h>
+#include "pixmapfx/kpPixmapFX.h"
class QDataStream;
diff --git a/layers/selections/text/kpPreeditText.cpp b/layers/selections/text/kpPreeditText.cpp
index 4f6ae5b..a904561 100644
--- a/layers/selections/text/kpPreeditText.cpp
+++ b/layers/selections/text/kpPreeditText.cpp
@@ -25,7 +25,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kpPreeditText.h>
+#include "layers/selections/text/kpPreeditText.h"
//---------------------------------------------------------------------
diff --git a/layers/selections/text/kpTextSelection.cpp b/layers/selections/text/kpTextSelection.cpp
index 73e4f91..f6df6dd 100644
--- a/layers/selections/text/kpTextSelection.cpp
+++ b/layers/selections/text/kpTextSelection.cpp
@@ -30,16 +30,16 @@
#define DEBUG_KP_SELECTION 0
-#include <kpTextSelection.h>
-#include <kpTextSelectionPrivate.h>
+#include "kpTextSelection.h"
+#include "kpTextSelectionPrivate.h"
-#include <QFontMetrics>
-#include <QList>
+#include "kpDefs.h"
+#include "kpTextStyle.h"
#include <KDebug>
-#include <kpDefs.h>
-#include <kpTextStyle.h>
+#include <QFontMetrics>
+#include <QList>
// public
diff --git a/layers/selections/text/kpTextSelection.h b/layers/selections/text/kpTextSelection.h
index 49b6149..8a02e4a 100644
--- a/layers/selections/text/kpTextSelection.h
+++ b/layers/selections/text/kpTextSelection.h
@@ -30,10 +30,10 @@
#define kpTextSelection_H
-#include <kpAbstractSelection.h>
-#include <kpImage.h>
-#include <kpTextStyle.h>
-#include <kpPreeditText.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "imagelib/kpImage.h"
+#include "layers/selections/text/kpTextStyle.h"
+#include "layers/selections/text/kpPreeditText.h"
//
// A rectangular text box containing lines of text, rendered in a given text
diff --git a/layers/selections/text/kpTextSelectionPrivate.h b/layers/selections/text/kpTextSelectionPrivate.h
index 4739225..6f3cbed 100644
--- a/layers/selections/text/kpTextSelectionPrivate.h
+++ b/layers/selections/text/kpTextSelectionPrivate.h
@@ -32,9 +32,9 @@
#include <QList>
-#include <kpImage.h>
-#include <kpTextStyle.h>
-#include <kpPreeditText.h>
+#include "imagelib/kpImage.h"
+#include "layers/selections/text/kpTextStyle.h"
+#include "layers/selections/text/kpPreeditText.h"
struct kpTextSelectionPrivate
{
diff --git a/layers/selections/text/kpTextSelection_Cursor.cpp b/layers/selections/text/kpTextSelection_Cursor.cpp
index 0f32726..f0311a7 100644
--- a/layers/selections/text/kpTextSelection_Cursor.cpp
+++ b/layers/selections/text/kpTextSelection_Cursor.cpp
@@ -30,17 +30,17 @@
#define DEBUG_KP_SELECTION 0
-#include <kpTextSelection.h>
-#include <kpTextSelectionPrivate.h>
+#include "kpTextSelection.h"
+#include "kpTextSelectionPrivate.h"
-#include <QFontMetrics>
-#include <QList>
+#include "kpDefs.h"
+#include "kpTextStyle.h"
+#include "kpPreeditText.h"
#include <KDebug>
-#include <kpDefs.h>
-#include <kpTextStyle.h>
-#include <kpPreeditText.h>
+#include <QFontMetrics>
+#include <QList>
// public
diff --git a/layers/selections/text/kpTextSelection_Paint.cpp b/layers/selections/text/kpTextSelection_Paint.cpp
index cc29e60..d82dfda 100644
--- a/layers/selections/text/kpTextSelection_Paint.cpp
+++ b/layers/selections/text/kpTextSelection_Paint.cpp
@@ -32,8 +32,14 @@
#define DEBUG_KP_SELECTION 0
-#include <kpTextSelection.h>
-#include <kpTextSelectionPrivate.h>
+#include "kpTextSelection.h"
+#include "kpTextSelectionPrivate.h"
+
+#include "kpTextStyle.h"
+#include "kpPreeditText.h"
+#include "pixmapfx/kpPixmapFX.h"
+
+#include <KDebug>
#include <QBitmap>
#include <QFont>
@@ -41,12 +47,6 @@
#include <QPainter>
#include <QTextCharFormat>
-#include <KDebug>
-
-#include <kpPixmapFX.h>
-#include <kpTextStyle.h>
-#include <kpPreeditText.h>
-
//---------------------------------------------------------------------
void kpTextSelection::drawPreeditString(QPainter &painter, int &x, int y, const kpPreeditText &preeditText) const
diff --git a/layers/selections/text/kpTextStyle.cpp b/layers/selections/text/kpTextStyle.cpp
index ce0b0ec..0f0c07e 100644
--- a/layers/selections/text/kpTextStyle.cpp
+++ b/layers/selections/text/kpTextStyle.cpp
@@ -26,7 +26,7 @@
*/
-#include <kpTextStyle.h>
+#include "layers/selections/text/kpTextStyle.h"
#include <qdatastream.h>
#include <qfont.h>
diff --git a/layers/selections/text/kpTextStyle.h b/layers/selections/text/kpTextStyle.h
index f64e3d0..6eb8290 100644
--- a/layers/selections/text/kpTextStyle.h
+++ b/layers/selections/text/kpTextStyle.h
@@ -32,7 +32,7 @@
#include <qstring.h>
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
class QDataStream;
diff --git a/layers/tempImage/kpTempImage.cpp b/layers/tempImage/kpTempImage.cpp
index f9ea76c..dd665d9 100644
--- a/layers/tempImage/kpTempImage.cpp
+++ b/layers/tempImage/kpTempImage.cpp
@@ -26,10 +26,10 @@
*/
-#include <kpTempImage.h>
+#include "layers/tempImage/kpTempImage.h"
-#include <kpPixmapFX.h>
-#include <kpViewManager.h>
+#include "pixmapfx/kpPixmapFX.h"
+#include "views/manager/kpViewManager.h"
#include <QPainter>
diff --git a/layers/tempImage/kpTempImage.h b/layers/tempImage/kpTempImage.h
index bc70c06..4e8aa30 100644
--- a/layers/tempImage/kpTempImage.h
+++ b/layers/tempImage/kpTempImage.h
@@ -34,7 +34,7 @@
#include <qpoint.h>
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
class kpViewManager;
diff --git a/lgpl/generic/kpColorCollection.cpp b/lgpl/generic/kpColorCollection.cpp
index a7a760d..e21952b 100644
--- a/lgpl/generic/kpColorCollection.cpp
+++ b/lgpl/generic/kpColorCollection.cpp
@@ -28,22 +28,22 @@
#include "kpColorCollection.h"
-#include <QDir>
-#include <QFile>
-#include <QSaveFile>
-#include <QStandardPaths>
-#include <QTemporaryFile>
-#include <QTextStream>
+#include "kpUrlFormatter.h"
#include <kio/netaccess.h>
#include <KLocalizedString>
#include <KMessageBox>
#include <kdebug.h>
#include <kstringhandler.h>
-#include <QUrl>
#include <kdebug.h>
-#include <kpUrlFormatter.h>
+#include <QDir>
+#include <QFile>
+#include <QSaveFile>
+#include <QStandardPaths>
+#include <QTemporaryFile>
+#include <QTextStream>
+#include <QUrl>
struct ColorNode
{
diff --git a/lgpl/generic/kpUrlFormatter.cpp b/lgpl/generic/kpUrlFormatter.cpp
index cf8b1ea..3a5621d 100644
--- a/lgpl/generic/kpUrlFormatter.cpp
+++ b/lgpl/generic/kpUrlFormatter.cpp
@@ -26,7 +26,7 @@
*/
-#include <kpUrlFormatter.h>
+#include "kpUrlFormatter.h"
#include <KLocalizedString>
#include <QUrl>
diff --git a/lgpl/generic/widgets/kpColorCellsBase.cpp b/lgpl/generic/widgets/kpColorCellsBase.cpp
index 352ecdf..9364c40 100644
--- a/lgpl/generic/widgets/kpColorCellsBase.cpp
+++ b/lgpl/generic/widgets/kpColorCellsBase.cpp
@@ -23,7 +23,7 @@
#define DEBUG_KP_COLOR_CELLS_BASE 0
-#include <kpColorCellsBase.h>
+#include "kpColorCellsBase.h"
#include <QApplication>
#include <QDrag>
diff --git a/mainWindow/kpMainWindow.cpp b/mainWindow/kpMainWindow.cpp
index 085a53d..19b4b55 100644
--- a/mainWindow/kpMainWindow.cpp
+++ b/mainWindow/kpMainWindow.cpp
@@ -26,12 +26,26 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
-
-#include <qevent.h>
-#include <qmenu.h>
-#include <qtimer.h>
+#include "kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
+
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "environments/commands/kpCommandEnvironment.h"
+#include "widgets/kpColorCells.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "environments/document/kpDocumentEnvironment.h"
+#include "layers/selections/kpSelectionDrag.h"
+#include "kpThumbnail.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
+#include "generic/kpWidgetMapper.h"
+#include "views/kpZoomedThumbnailView.h"
+#include "views/kpZoomedView.h"
#include <kconfig.h>
#include <kconfiggroup.h>
@@ -39,23 +53,9 @@
#include <klocale.h>
#include <krecentfilesaction.h>
-#include <kpAbstractImageSelection.h>
-#include <kpCommandEnvironment.h>
-#include <kpColorCells.h>
-#include <kpColorToolBar.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpDocumentEnvironment.h>
-#include <kpSelectionDrag.h>
-#include <kpThumbnail.h>
-#include <kpTool.h>
-#include <kpToolToolBar.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
-#include <kpWidgetMapper.h>
-#include <kpZoomedThumbnailView.h>
-#include <kpZoomedView.h>
+#include <qevent.h>
+#include <qmenu.h>
+#include <qtimer.h>
#if DEBUG_KP_MAIN_WINDOW
#include <qdatetime.h>
diff --git a/mainWindow/kpMainWindow.h b/mainWindow/kpMainWindow.h
index f362dc0..91ff588 100644
--- a/mainWindow/kpMainWindow.h
+++ b/mainWindow/kpMainWindow.h
@@ -34,9 +34,9 @@
#include <kxmlguiwindow.h>
-#include <kpDefs.h>
-#include <kpPixmapFX.h>
-#include <kpImage.h>
+#include "kpDefs.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "imagelib/kpImage.h"
class QAction;
diff --git a/mainWindow/kpMainWindowPrivate.h b/mainWindow/kpMainWindowPrivate.h
index 589001b..db8b2a4 100644
--- a/mainWindow/kpMainWindowPrivate.h
+++ b/mainWindow/kpMainWindowPrivate.h
@@ -33,7 +33,7 @@
#define DEBUG_KP_MAIN_WINDOW 0
-#include <kpDocumentSaveOptions.h>
+#include "document/kpDocumentSaveOptions.h"
class QAction;
diff --git a/mainWindow/kpMainWindow_Colors.cpp b/mainWindow/kpMainWindow_Colors.cpp
index 844d0a2..485dfcf 100644
--- a/mainWindow/kpMainWindow_Colors.cpp
+++ b/mainWindow/kpMainWindow_Colors.cpp
@@ -25,22 +25,22 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
-#include <QAction>
+#include "widgets/kpColorCells.h"
+#include "lgpl/generic/kpColorCollection.h"
+#include "lgpl/generic/kpUrlFormatter.h"
+#include "widgets/toolbars/kpColorToolBar.h"
#include <KActionCollection>
-#include <QFileDialog>
#include <KMessageBox>
#include <KSelectAction>
#include <KStandardGuiItem>
#include <KDebug>
-#include <kpColorCells.h>
-#include <kpColorCollection.h>
-#include <kpColorToolBar.h>
-#include <kpUrlFormatter.h>
+#include <QFileDialog>
+#include <QAction>
//---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_Edit.cpp b/mainWindow/kpMainWindow_Edit.cpp
index f94d42a..e358b47 100644
--- a/mainWindow/kpMainWindow_Edit.cpp
+++ b/mainWindow/kpMainWindow_Edit.cpp
@@ -26,8 +26,8 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <qaction.h>
#include <qapplication.h>
@@ -47,30 +47,30 @@
#include <kactioncollection.h>
#include <kxmlguifactory.h>
-#include <kpAbstractImageSelection.h>
-#include <kpColorToolBar.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpDocumentMetaInfo.h>
-#include <kpDocumentSaveOptions.h>
-#include <kpImageSelectionTransparency.h>
-#include <kpMacroCommand.h>
-#include <kpPixmapFX.h>
-#include <kpRectangularImageSelection.h>
-#include <kpSelectionDrag.h>
-#include <kpSetOverrideCursorSaver.h>
-#include <kpTextSelection.h>
-#include <kpTool.h>
-#include <kpToolTextGiveContentCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionDestroyCommand.h>
-#include <kpToolTextEnterCommand.h>
-#include <kpToolTextInsertCommand.h>
-#include <kpTransformCrop.h>
-#include <kpTransformResizeScaleCommand.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
-#include <kpZoomedView.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpDocumentMetaInfo.h"
+#include "document/kpDocumentSaveOptions.h"
+#include "layers/selections/image/kpImageSelectionTransparency.h"
+#include "commands/kpMacroCommand.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "layers/selections/image/kpRectangularImageSelection.h"
+#include "layers/selections/kpSelectionDrag.h"
+#include "generic/kpSetOverrideCursorSaver.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "tools/kpTool.h"
+#include "commands/tools/selection/text/kpToolTextGiveContentCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "commands/tools/selection/kpToolSelectionDestroyCommand.h"
+#include "commands/tools/selection/text/kpToolTextEnterCommand.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
+#include "imagelib/transforms/kpTransformCrop.h"
+#include "commands/imagelib/transforms/kpTransformResizeScaleCommand.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
+#include "views/kpZoomedView.h"
//---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_File.cpp b/mainWindow/kpMainWindow_File.cpp
index 6dc4a0c..599fb6a 100644
--- a/mainWindow/kpMainWindow_File.cpp
+++ b/mainWindow/kpMainWindow_File.cpp
@@ -27,8 +27,8 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <qaction.h>
#include <qdatastream.h>
@@ -69,16 +69,16 @@
#include <kprintpreview.h>
#include <kurlcombobox.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpDocumentMetaInfoCommand.h>
-#include <kpDocumentMetaInfoDialog.h>
-#include <kpDocumentSaveOptionsWidget.h>
-#include <kpPixmapFX.h>
-#include <kpPrintDialogPage.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "commands/imagelib/kpDocumentMetaInfoCommand.h"
+#include "dialogs/imagelib/kpDocumentMetaInfoDialog.h"
+#include "widgets/kpDocumentSaveOptionsWidget.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "widgets/kpPrintDialogPage.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
#if HAVE_KSANE
#include "../scan/sanedialog.h"
diff --git a/mainWindow/kpMainWindow_Image.cpp b/mainWindow/kpMainWindow_Image.cpp
index ab106dc..db50dd0 100644
--- a/mainWindow/kpMainWindow_Image.cpp
+++ b/mainWindow/kpMainWindow_Image.cpp
@@ -26,13 +26,36 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
-
-#include <qaction.h>
-#include <qcolor.h>
-#include <qmenubar.h>
-#include <qsize.h>
+#include "mainWindow/kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
+
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "imagelib/kpColor.h"
+#include "kpDefs.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "commands/imagelib/effects/kpEffectInvertCommand.h"
+#include "commands/imagelib/effects/kpEffectReduceColorsCommand.h"
+#include "dialogs/imagelib/effects/kpEffectsDialog.h"
+#include "commands/imagelib/effects/kpEffectClearCommand.h"
+#include "commands/imagelib/effects/kpEffectGrayscaleCommand.h"
+#include "commands/kpMacroCommand.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h"
+#include "commands/tools/selection/text/kpToolTextGiveContentCommand.h"
+#include "imagelib/transforms/kpTransformAutoCrop.h"
+#include "imagelib/transforms/kpTransformCrop.h"
+#include "environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.h"
+#include "commands/imagelib/transforms/kpTransformFlipCommand.h"
+#include "commands/imagelib/transforms/kpTransformResizeScaleCommand.h"
+#include "dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h"
+#include "commands/imagelib/transforms/kpTransformRotateCommand.h"
+#include "dialogs/imagelib/transforms/kpTransformRotateDialog.h"
+#include "commands/imagelib/transforms/kpTransformSkewCommand.h"
+#include "dialogs/imagelib/transforms/kpTransformSkewDialog.h"
+#include "views/manager/kpViewManager.h"
#include <kactioncollection.h>
#include <kapplication.h>
@@ -43,33 +66,10 @@
#include <KToggleAction>
#include <kiconloader.h>
-#include <kpAbstractImageSelection.h>
-#include <kpColor.h>
-#include <kpDefs.h>
-#include <kpColorToolBar.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpEffectInvertCommand.h>
-#include <kpEffectReduceColorsCommand.h>
-#include <kpEffectsDialog.h>
-#include <kpEffectClearCommand.h>
-#include <kpEffectGrayscaleCommand.h>
-#include <kpMacroCommand.h>
-#include <kpTextSelection.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionPullFromDocumentCommand.h>
-#include <kpToolTextGiveContentCommand.h>
-#include <kpTransformAutoCrop.h>
-#include <kpTransformCrop.h>
-#include <kpTransformDialogEnvironment.h>
-#include <kpTransformFlipCommand.h>
-#include <kpTransformResizeScaleCommand.h>
-#include <kpTransformResizeScaleDialog.h>
-#include <kpTransformRotateCommand.h>
-#include <kpTransformRotateDialog.h>
-#include <kpTransformSkewCommand.h>
-#include <kpTransformSkewDialog.h>
-#include <kpViewManager.h>
+#include <qaction.h>
+#include <qcolor.h>
+#include <qmenubar.h>
+#include <qsize.h>
//---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_Settings.cpp b/mainWindow/kpMainWindow_Settings.cpp
index 00b916e..0a03d47 100644
--- a/mainWindow/kpMainWindow_Settings.cpp
+++ b/mainWindow/kpMainWindow_Settings.cpp
@@ -26,8 +26,8 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "mainWindow/kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <kactioncollection.h>
#include <kconfig.h>
@@ -38,10 +38,10 @@
#include <kstandardaction.h>
#include <ktogglefullscreenaction.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpToolAction.h>
-#include <kpToolToolBar.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "tools/kpToolAction.h"
+#include "widgets/toolbars/kpToolToolBar.h"
//---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_StatusBar.cpp b/mainWindow/kpMainWindow_StatusBar.cpp
index 78d3ce7..6e2e532 100644
--- a/mainWindow/kpMainWindow_StatusBar.cpp
+++ b/mainWindow/kpMainWindow_StatusBar.cpp
@@ -28,8 +28,8 @@
#define DEBUG_STATUS_BAR (DEBUG_KP_MAIN_WINDOW && 0)
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "mainWindow/kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <qlabel.h>
#include <qstatusbar.h>
@@ -39,12 +39,12 @@
#include <klocale.h>
#include <KSqueezedTextLabel>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpTool.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
-#include <kpZoomedView.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "tools/kpTool.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
+#include "views/kpZoomedView.h"
//---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_Text.cpp b/mainWindow/kpMainWindow_Text.cpp
index a103729..965a4a5 100644
--- a/mainWindow/kpMainWindow_Text.cpp
+++ b/mainWindow/kpMainWindow_Text.cpp
@@ -25,8 +25,8 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "mainWindow/kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <kactioncollection.h>
#include <kapplication.h>
@@ -40,13 +40,13 @@
#include <ktoggleaction.h>
#include <kiconloader.h>
-#include <kpColorToolBar.h>
-#include <kpDefs.h>
-#include <kpTextStyle.h>
-#include <kpToolText.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpZoomedView.h>
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "kpDefs.h"
+#include "layers/selections/text/kpTextStyle.h"
+#include "tools/selection/text/kpToolText.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpZoomedView.h"
// private
diff --git a/mainWindow/kpMainWindow_Tools.cpp b/mainWindow/kpMainWindow_Tools.cpp
index 549b741..aca3005 100644
--- a/mainWindow/kpMainWindow_Tools.cpp
+++ b/mainWindow/kpMainWindow_Tools.cpp
@@ -26,8 +26,8 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "mainWindow/kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <QActionGroup>
#include <qlist.h>
@@ -39,37 +39,37 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpColorToolBar.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpImageSelectionTransparency.h>
-#include <kpTool.h>
-#include <kpToolAction.h>
-#include <kpToolBrush.h>
-#include <kpToolColorEraser.h>
-#include <kpToolColorPicker.h>
-#include <kpToolCurve.h>
-#include <kpToolEllipticalSelection.h>
-#include <kpToolEllipse.h>
-#include <kpToolEraser.h>
-#include <kpToolFloodFill.h>
-#include <kpToolFreeFormSelection.h>
-#include <kpToolLine.h>
-#include <kpToolPen.h>
-#include <kpToolPolygon.h>
-#include <kpToolPolyline.h>
-#include <kpToolRectangle.h>
-#include <kpToolRectSelection.h>
-#include <kpToolRoundedRectangle.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolSpraycan.h>
-#include <kpToolText.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpToolZoom.h>
-#include <kpTransformResizeScaleCommand.h>
-#include <kpViewScrollableContainer.h>
-#include <kpZoomedView.h>
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "layers/selections/image/kpImageSelectionTransparency.h"
+#include "tools/kpTool.h"
+#include "tools/kpToolAction.h"
+#include "tools/flow/kpToolBrush.h"
+#include "tools/flow/kpToolColorEraser.h"
+#include "tools/kpToolColorPicker.h"
+#include "tools/polygonal/kpToolCurve.h"
+#include "tools/selection/image/kpToolEllipticalSelection.h"
+#include "tools/rectangular/kpToolEllipse.h"
+#include "tools/flow/kpToolEraser.h"
+#include "tools/kpToolFloodFill.h"
+#include "tools/selection/image/kpToolFreeFormSelection.h"
+#include "tools/polygonal/kpToolLine.h"
+#include "tools/flow/kpToolPen.h"
+#include "tools/polygonal/kpToolPolygon.h"
+#include "tools/polygonal/kpToolPolyline.h"
+#include "tools/rectangular/kpToolRectangle.h"
+#include "tools/selection/image/kpToolRectSelection.h"
+#include "tools/rectangular/kpToolRoundedRectangle.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "tools/flow/kpToolSpraycan.h"
+#include "tools/selection/text/kpToolText.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "tools/kpToolZoom.h"
+#include "commands/imagelib/transforms/kpTransformResizeScaleCommand.h"
+#include "kpViewScrollableContainer.h"
+#include "views/kpZoomedView.h"
//---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_View.cpp b/mainWindow/kpMainWindow_View.cpp
index 972d393..b89a240 100644
--- a/mainWindow/kpMainWindow_View.cpp
+++ b/mainWindow/kpMainWindow_View.cpp
@@ -26,8 +26,8 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "mainWindow/kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <qdatetime.h>
#include <qpainter.h>
@@ -43,17 +43,17 @@
#include <ktoggleaction.h>
#include <kactioncollection.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpThumbnail.h>
-#include <kpTool.h>
-#include <kpToolToolBar.h>
-#include <kpUnzoomedThumbnailView.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
-#include <kpWidgetMapper.h>
-#include <kpZoomedView.h>
-#include <kpZoomedThumbnailView.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "kpThumbnail.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "views/kpUnzoomedThumbnailView.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
+#include "generic/kpWidgetMapper.h"
+#include "views/kpZoomedView.h"
+#include "views/kpZoomedThumbnailView.h"
// private
diff --git a/mainWindow/kpMainWindow_View_Thumbnail.cpp b/mainWindow/kpMainWindow_View_Thumbnail.cpp
index 94e70e5..d8d04a1 100644
--- a/mainWindow/kpMainWindow_View_Thumbnail.cpp
+++ b/mainWindow/kpMainWindow_View_Thumbnail.cpp
@@ -26,8 +26,8 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "mainWindow/kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <qdatetime.h>
#include <qpainter.h>
@@ -43,17 +43,17 @@
#include <ktoggleaction.h>
#include <kactioncollection.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpThumbnail.h>
-#include <kpTool.h>
-#include <kpToolToolBar.h>
-#include <kpUnzoomedThumbnailView.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
-#include <kpWidgetMapper.h>
-#include <kpZoomedView.h>
-#include <kpZoomedThumbnailView.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "kpThumbnail.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "views/kpUnzoomedThumbnailView.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
+#include "generic/kpWidgetMapper.h"
+#include "views/kpZoomedView.h"
+#include "views/kpZoomedThumbnailView.h"
// private
diff --git a/mainWindow/kpMainWindow_View_Zoom.cpp b/mainWindow/kpMainWindow_View_Zoom.cpp
index 6739249..3ccfdb7 100644
--- a/mainWindow/kpMainWindow_View_Zoom.cpp
+++ b/mainWindow/kpMainWindow_View_Zoom.cpp
@@ -27,8 +27,8 @@
*/
-#include <kpMainWindow.h>
-#include <kpMainWindowPrivate.h>
+#include "mainWindow/kpMainWindow.h"
+#include "kpMainWindowPrivate.h"
#include <qdatetime.h>
#include <qpainter.h>
@@ -43,17 +43,17 @@
#include <ktoggleaction.h>
#include <kactioncollection.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpThumbnail.h>
-#include <kpTool.h>
-#include <kpToolToolBar.h>
-#include <kpUnzoomedThumbnailView.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
-#include <kpWidgetMapper.h>
-#include <kpZoomedView.h>
-#include <kpZoomedThumbnailView.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "kpThumbnail.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "views/kpUnzoomedThumbnailView.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
+#include "generic/kpWidgetMapper.h"
+#include "views/kpZoomedView.h"
+#include "views/kpZoomedThumbnailView.h"
static int ZoomLevelFromString (const QString &stringIn)
{
diff --git a/pixmapfx/kpPixmapFX.h b/pixmapfx/kpPixmapFX.h
index bbb1c0c..a5d4c06 100644
--- a/pixmapfx/kpPixmapFX.h
+++ b/pixmapfx/kpPixmapFX.h
@@ -38,7 +38,7 @@
#include <klocalizedstring.h>
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
class QColor;
diff --git a/pixmapfx/kpPixmapFX_DrawShapes.cpp b/pixmapfx/kpPixmapFX_DrawShapes.cpp
index 13aff76..ccaf580 100644
--- a/pixmapfx/kpPixmapFX_DrawShapes.cpp
+++ b/pixmapfx/kpPixmapFX_DrawShapes.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_PIXMAP_FX 0
-#include <kpPixmapFX.h>
+#include "kpPixmapFX.h"
#include <math.h>
@@ -41,9 +41,9 @@
#include <kdebug.h>
-#include <kpAbstractSelection.h>
-#include <kpColor.h>
-#include <kpDefs.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "imagelib/kpColor.h"
+#include "kpDefs.h"
//---------------------------------------------------------------------
diff --git a/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp b/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
index 58dfe27..94574c0 100644
--- a/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
+++ b/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_PIXMAP_FX 0
-#include <kpPixmapFX.h>
+#include "kpPixmapFX.h"
#include <math.h>
@@ -40,7 +40,7 @@
#include <kdebug.h>
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
//---------------------------------------------------------------------
diff --git a/pixmapfx/kpPixmapFX_Transforms.cpp b/pixmapfx/kpPixmapFX_Transforms.cpp
index 400f9f3..b0fdb3f 100644
--- a/pixmapfx/kpPixmapFX_Transforms.cpp
+++ b/pixmapfx/kpPixmapFX_Transforms.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_PIXMAP_FX 0
-#include <kpPixmapFX.h>
+#include "kpPixmapFX.h"
#include <math.h>
@@ -40,9 +40,9 @@
#include <kdebug.h>
-#include <kpAbstractSelection.h>
-#include <kpColor.h>
-#include <kpDefs.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "imagelib/kpColor.h"
+#include "kpDefs.h"
//---------------------------------------------------------------------
diff --git a/tools/flow/kpToolBrush.cpp b/tools/flow/kpToolBrush.cpp
index 5461216..d53b3f6 100644
--- a/tools/flow/kpToolBrush.cpp
+++ b/tools/flow/kpToolBrush.cpp
@@ -25,7 +25,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kpToolBrush.h>
+#include "kpToolBrush.h"
#include <klocale.h>
diff --git a/tools/flow/kpToolBrush.h b/tools/flow/kpToolBrush.h
index eedfbc8..aa83146 100644
--- a/tools/flow/kpToolBrush.h
+++ b/tools/flow/kpToolBrush.h
@@ -30,7 +30,7 @@
#define KP_TOOL_BRUSH_H
-#include <kpToolFlowPixmapBase.h>
+#include "kpToolFlowPixmapBase.h"
// Brush = draws pixmaps, "interpolates" by "sweeping" pixmaps along a line (interesting brushes)
diff --git a/tools/flow/kpToolColorEraser.cpp b/tools/flow/kpToolColorEraser.cpp
index 89f14dd..41e3c31 100644
--- a/tools/flow/kpToolColorEraser.cpp
+++ b/tools/flow/kpToolColorEraser.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TOOL_COLOR_ERASER 0
-#include <kpToolColorEraser.h>
+#include "kpToolColorEraser.h"
#include <qbitmap.h>
#include <qimage.h>
@@ -39,14 +39,14 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpMacroCommand.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpToolFlowCommand.h>
-#include <kpToolEnvironment.h>
+#include "imagelib/kpColor.h"
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "commands/kpMacroCommand.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "commands/tools/flow/kpToolFlowCommand.h"
+#include "environments/tools/kpToolEnvironment.h"
kpToolColorEraser::kpToolColorEraser (kpToolEnvironment *environ, QObject *parent)
diff --git a/tools/flow/kpToolColorEraser.h b/tools/flow/kpToolColorEraser.h
index f44eaf2..4fa3e9f 100644
--- a/tools/flow/kpToolColorEraser.h
+++ b/tools/flow/kpToolColorEraser.h
@@ -30,7 +30,7 @@
#define KP_TOOL_COLOR_ERASER_H
-#include <kpToolFlowBase.h>
+#include "kpToolFlowBase.h"
// Color Eraser = Brush that replaces/washes the foreground color with the background color
diff --git a/tools/flow/kpToolEraser.cpp b/tools/flow/kpToolEraser.cpp
index 2fe8245..fc53b6a 100644
--- a/tools/flow/kpToolEraser.cpp
+++ b/tools/flow/kpToolEraser.cpp
@@ -28,13 +28,13 @@
#define DEBUG_KP_TOOL_ERASER 0
-#include <kpToolEraser.h>
+#include "kpToolEraser.h"
-#include <klocale.h>
+#include "commands/kpCommandHistory.h"
+#include "commands/imagelib/effects/kpEffectClearCommand.h"
+#include "environments/tools/kpToolEnvironment.h"
-#include <kpCommandHistory.h>
-#include <kpEffectClearCommand.h>
-#include <kpToolEnvironment.h>
+#include <klocale.h>
//---------------------------------------------------------------------
diff --git a/tools/flow/kpToolEraser.h b/tools/flow/kpToolEraser.h
index 5f18792..321e3da 100644
--- a/tools/flow/kpToolEraser.h
+++ b/tools/flow/kpToolEraser.h
@@ -30,7 +30,7 @@
#define KP_TOOL_ERASER_H
-#include <kpToolFlowPixmapBase.h>
+#include "kpToolFlowPixmapBase.h"
// Eraser = Brush but with foreground & background colors swapped (a few square brushes)
diff --git a/tools/flow/kpToolFlowBase.cpp b/tools/flow/kpToolFlowBase.cpp
index f527617..e46863e 100644
--- a/tools/flow/kpToolFlowBase.cpp
+++ b/tools/flow/kpToolFlowBase.cpp
@@ -28,7 +28,7 @@
#define DEBUG_KP_TOOL_FLOW_BASE 0
-#include <kpToolFlowBase.h>
+#include "kpToolFlowBase.h"
#include <cstdlib>
@@ -38,21 +38,21 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpCommandHistory.h>
-#include <kpCursorProvider.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpImage.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpTempImage.h>
-#include <kpToolEnvironment.h>
-#include <kpToolFlowCommand.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetBrush.h>
-#include <kpToolWidgetEraserSize.h>
-#include <kpViewManager.h>
+#include "imagelib/kpColor.h"
+#include "commands/kpCommandHistory.h"
+#include "cursors/kpCursorProvider.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpImage.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "environments/tools/kpToolEnvironment.h"
+#include "commands/tools/flow/kpToolFlowCommand.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetBrush.h"
+#include "widgets/toolbars/options/kpToolWidgetEraserSize.h"
+#include "views/manager/kpViewManager.h"
//---------------------------------------------------------------------
diff --git a/tools/flow/kpToolFlowBase.h b/tools/flow/kpToolFlowBase.h
index 79d6350..e867ec5 100644
--- a/tools/flow/kpToolFlowBase.h
+++ b/tools/flow/kpToolFlowBase.h
@@ -32,8 +32,8 @@
#include <qrect.h>
-#include <kpTempImage.h>
-#include <kpTool.h>
+#include "layers/tempImage/kpTempImage.h"
+#include "tools/kpTool.h"
class QPoint;
diff --git a/tools/flow/kpToolFlowPixmapBase.cpp b/tools/flow/kpToolFlowPixmapBase.cpp
index 6c20f2e..126edad 100644
--- a/tools/flow/kpToolFlowPixmapBase.cpp
+++ b/tools/flow/kpToolFlowPixmapBase.cpp
@@ -26,15 +26,15 @@
*/
-#include <kpToolFlowPixmapBase.h>
+#include "kpToolFlowPixmapBase.h"
-#include <qbitmap.h>
+#include "imagelib/kpColor.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "commands/tools/flow/kpToolFlowCommand.h"
-#include <kpColor.h>
-#include <kpDocument.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpToolFlowCommand.h>
+#include <qbitmap.h>
//---------------------------------------------------------------------
diff --git a/tools/flow/kpToolFlowPixmapBase.h b/tools/flow/kpToolFlowPixmapBase.h
index a8743f0..e1f5ef0 100644
--- a/tools/flow/kpToolFlowPixmapBase.h
+++ b/tools/flow/kpToolFlowPixmapBase.h
@@ -32,7 +32,7 @@
#define KP_TOOL_FLOW_PIXMAP_BASE_H
-#include <kpToolFlowBase.h>
+#include "kpToolFlowBase.h"
/**
diff --git a/tools/flow/kpToolPen.cpp b/tools/flow/kpToolPen.cpp
index 9ed286f..4cb4cbf 100644
--- a/tools/flow/kpToolPen.cpp
+++ b/tools/flow/kpToolPen.cpp
@@ -26,19 +26,19 @@
*/
-#include <kpToolPen.h>
+#include "kpToolPen.h"
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qpainter.h>
+#include "imagelib/kpColor.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpImage.h"
+#include "imagelib/kpPainter.h"
+#include "commands/tools/flow/kpToolFlowCommand.h"
#include <klocale.h>
-#include <kpColor.h>
-#include <kpDocument.h>
-#include <kpImage.h>
-#include <kpPainter.h>
-#include <kpToolFlowCommand.h>
+#include <qapplication.h>
+#include <qbitmap.h>
+#include <qpainter.h>
struct kpToolPenPrivate
{
diff --git a/tools/flow/kpToolPen.h b/tools/flow/kpToolPen.h
index 1e22a98..ea4d1e3 100644
--- a/tools/flow/kpToolPen.h
+++ b/tools/flow/kpToolPen.h
@@ -30,7 +30,7 @@
#define KP_TOOL_PEN_H
-#include <kpToolFlowBase.h>
+#include "kpToolFlowBase.h"
// Pen = draws pixels, "interpolates" by "sweeping" pixels along a line (no brushes)
diff --git a/tools/flow/kpToolSpraycan.cpp b/tools/flow/kpToolSpraycan.cpp
index 67f4c4f..28cb869 100644
--- a/tools/flow/kpToolSpraycan.cpp
+++ b/tools/flow/kpToolSpraycan.cpp
@@ -28,9 +28,24 @@
#define DEBUG_KP_TOOL_SPRAYCAN 0
+#include "kpToolSpraycan.h"
+
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "environments/tools/kpToolEnvironment.h"
+#include "commands/tools/flow/kpToolFlowCommand.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetSpraycanSize.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
#include <cstdlib>
+#include <kdebug.h>
+#include <klocale.h>
+
#include <qbitmap.h>
#include <qpainter.h>
#include <qpen.h>
@@ -40,21 +55,6 @@
#include <qrect.h>
#include <qtimer.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpToolEnvironment.h>
-#include <kpToolFlowCommand.h>
-#include <kpToolSpraycan.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetSpraycanSize.h>
-#include <kpView.h>
-#include <kpViewManager.h>
-
//---------------------------------------------------------------------
kpToolSpraycan::kpToolSpraycan (kpToolEnvironment *environ, QObject *parent)
diff --git a/tools/flow/kpToolSpraycan.h b/tools/flow/kpToolSpraycan.h
index 142b974..6227972 100644
--- a/tools/flow/kpToolSpraycan.h
+++ b/tools/flow/kpToolSpraycan.h
@@ -30,7 +30,7 @@
#define KP_TOOL_SPRAYCAN_H
-#include <kpToolFlowBase.h>
+#include "kpToolFlowBase.h"
class QPoint;
diff --git a/tools/kpTool.cpp b/tools/kpTool.cpp
index a8e6b8d..2015409 100644
--- a/tools/kpTool.cpp
+++ b/tools/kpTool.cpp
@@ -30,8 +30,8 @@
#define DEBUG_KP_TOOL 0
-#include <kpTool.h>
-#include <kpToolPrivate.h>
+#include "kpTool.h"
+#include "kpToolPrivate.h"
#include <limits.h>
@@ -40,14 +40,14 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpColorToolBar.h>
-#include <kpDefs.h>
-#include <kpToolAction.h>
-#include <kpToolEnvironment.h>
-#include <kpToolToolBar.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "imagelib/kpColor.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "kpDefs.h"
+#include "tools/kpToolAction.h"
+#include "environments/tools/kpToolEnvironment.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
#undef environ // macro on win32
//---------------------------------------------------------------------
diff --git a/tools/kpTool.h b/tools/kpTool.h
index dc2c253..7d1d886 100644
--- a/tools/kpTool.h
+++ b/tools/kpTool.h
@@ -36,7 +36,7 @@
#include <qsize.h>
#include <qstring.h>
-#include <kpDefs.h>
+#include "kpDefs.h"
#ifdef Q_OS_WIN
#include <stdlib.h>
#undef environ // macro on win32
diff --git a/tools/kpToolAction.cpp b/tools/kpToolAction.cpp
index 3aff6d6..cd4ed11 100644
--- a/tools/kpToolAction.cpp
+++ b/tools/kpToolAction.cpp
@@ -25,9 +25,9 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kpToolAction.h>
+#include "tools/kpToolAction.h"
#include <kactioncollection.h>
-#include <kpTool.h>
+#include "tools/kpTool.h"
#include <kiconloader.h>
diff --git a/tools/kpToolColorPicker.cpp b/tools/kpToolColorPicker.cpp
index 34c6722..fd1728d 100644
--- a/tools/kpToolColorPicker.cpp
+++ b/tools/kpToolColorPicker.cpp
@@ -29,18 +29,18 @@
#define DEBUG_KP_TOOL_COLOR_PICKER 0
-#include <kpToolColorPicker.h>
+#include "kpToolColorPicker.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpColorToolBar.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpPixmapFX.h>
-#include <kpToolColorPickerCommand.h>
-#include <kpToolEnvironment.h>
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "commands/tools/kpToolColorPickerCommand.h"
+#include "environments/tools/kpToolEnvironment.h"
kpToolColorPicker::kpToolColorPicker (kpToolEnvironment *environ, QObject *parent)
diff --git a/tools/kpToolColorPicker.h b/tools/kpToolColorPicker.h
index 8075d22..0d417e2 100644
--- a/tools/kpToolColorPicker.h
+++ b/tools/kpToolColorPicker.h
@@ -30,8 +30,8 @@
#define KP_TOOL_COLOR_PICKER_H
-#include <kpColor.h>
-#include <kpTool.h>
+#include "imagelib/kpColor.h"
+#include "tools/kpTool.h"
class QPoint;
diff --git a/tools/kpToolFloodFill.cpp b/tools/kpToolFloodFill.cpp
index 6af171e..5fd11d0 100644
--- a/tools/kpToolFloodFill.cpp
+++ b/tools/kpToolFloodFill.cpp
@@ -29,18 +29,18 @@
#define DEBUG_KP_TOOL_FLOOD_FILL 0
-#include <kpToolFloodFill.h>
+#include "kpToolFloodFill.h"
-#include <qapplication.h>
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "environments/tools/kpToolEnvironment.h"
+#include "commands/tools/kpToolFloodFillCommand.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpToolEnvironment.h>
-#include <kpToolFloodFillCommand.h>
+#include <qapplication.h>
//---------------------------------------------------------------------
diff --git a/tools/kpToolFloodFill.h b/tools/kpToolFloodFill.h
index 49691e9..1f30047 100644
--- a/tools/kpToolFloodFill.h
+++ b/tools/kpToolFloodFill.h
@@ -30,7 +30,7 @@
#define KP_TOOL_FLOOD_FILL_H
-#include <kpTool.h>
+#include "tools/kpTool.h"
class kpToolFloodFill : public kpTool
diff --git a/tools/kpToolZoom.cpp b/tools/kpToolZoom.cpp
index 8d72eea..cbfa6f7 100644
--- a/tools/kpToolZoom.cpp
+++ b/tools/kpToolZoom.cpp
@@ -28,22 +28,22 @@
#define DEBUG_KP_TOOL_ZOOM 0
-#include <kpToolZoom.h>
+#include "kpToolZoom.h"
-#include <QWidget>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "generic/kpSetOverrideCursorSaver.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "environments/tools/kpToolEnvironment.h"
+#include "tools/kpToolAction.h"
+#include "views/manager/kpViewManager.h"
#include <kdebug.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpPixmapFX.h>
-#include <kpSetOverrideCursorSaver.h>
-#include <kpTempImage.h>
-#include <kpToolEnvironment.h>
-#include <kpToolAction.h>
-#include <kpViewManager.h>
+#include <QWidget>
//---------------------------------------------------------------------
diff --git a/tools/kpToolZoom.h b/tools/kpToolZoom.h
index 6d24c60..2f9e994 100644
--- a/tools/kpToolZoom.h
+++ b/tools/kpToolZoom.h
@@ -30,7 +30,7 @@
#define KP_TOOL_ZOOM_H
-#include <kpTool.h>
+#include "tools/kpTool.h"
class kpToolZoom : public kpTool
diff --git a/tools/kpTool_Drawing.cpp b/tools/kpTool_Drawing.cpp
index 101bbdb..e75a522 100644
--- a/tools/kpTool_Drawing.cpp
+++ b/tools/kpTool_Drawing.cpp
@@ -33,17 +33,17 @@
#define DEBUG_KP_TOOL 0
-#include <kpTool.h>
-#include <kpToolPrivate.h>
+#include "tools/kpTool.h"
+#include "kpToolPrivate.h"
#include <qapplication.h>
#include <kdebug.h>
-#include <kpToolEnvironment.h>
-#include <kpView.h>
-#include <kpViewManager.h>
-#include <kpPainter.h>
+#include "environments/tools/kpToolEnvironment.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
+#include "imagelib/kpPainter.h"
#undef environ // macro on win32
diff --git a/tools/kpTool_KeyboardEvents.cpp b/tools/kpTool_KeyboardEvents.cpp
index f81dcfa..bce5eea 100644
--- a/tools/kpTool_KeyboardEvents.cpp
+++ b/tools/kpTool_KeyboardEvents.cpp
@@ -34,8 +34,8 @@
// TODO: reduce number of includes
-#include <kpTool.h>
-#include <kpToolPrivate.h>
+#include "tools/kpTool.h"
+#include "kpToolPrivate.h"
#include <limits.h>
@@ -47,15 +47,15 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpColorToolBar.h>
-#include <kpDefs.h>
-#include <kpPixmapFX.h>
-#include <kpToolAction.h>
-#include <kpToolEnvironment.h>
-#include <kpToolToolBar.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "imagelib/kpColor.h"
+#include "widgets/toolbars/kpColorToolBar.h"
+#include "kpDefs.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpToolAction.h"
+#include "environments/tools/kpToolEnvironment.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
//---------------------------------------------------------------------
diff --git a/tools/kpTool_MouseEvents.cpp b/tools/kpTool_MouseEvents.cpp
index 83f106c..8bfb1d3 100644
--- a/tools/kpTool_MouseEvents.cpp
+++ b/tools/kpTool_MouseEvents.cpp
@@ -31,14 +31,14 @@
#define DEBUG_KP_TOOL 0
-#include <kpTool.h>
-#include <kpToolPrivate.h>
+#include "tools/kpTool.h"
+#include "kpToolPrivate.h"
#include <kdebug.h>
-#include <kpToolEnvironment.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "environments/tools/kpToolEnvironment.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
#include <QMouseEvent>
#include <QApplication>
diff --git a/tools/kpTool_OtherEvents.cpp b/tools/kpTool_OtherEvents.cpp
index 2ccd54e..ab98135 100644
--- a/tools/kpTool_OtherEvents.cpp
+++ b/tools/kpTool_OtherEvents.cpp
@@ -36,12 +36,12 @@
#define DEBUG_KP_TOOL 0
-#include <kpTool.h>
-#include <kpToolPrivate.h>
+#include "tools/kpTool.h"
+#include "kpToolPrivate.h"
#include <kdebug.h>
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
//---------------------------------------------------------------------
diff --git a/tools/kpTool_UserNotifications.cpp b/tools/kpTool_UserNotifications.cpp
index 2c65063..d0d0307 100644
--- a/tools/kpTool_UserNotifications.cpp
+++ b/tools/kpTool_UserNotifications.cpp
@@ -28,8 +28,8 @@
// Tools' statusbar updates.
//
-#include <kpTool.h>
-#include <kpToolPrivate.h>
+#include "tools/kpTool.h"
+#include "kpToolPrivate.h"
#include <klocale.h>
diff --git a/tools/kpTool_Utilities.cpp b/tools/kpTool_Utilities.cpp
index 21c5605..eaea895 100644
--- a/tools/kpTool_Utilities.cpp
+++ b/tools/kpTool_Utilities.cpp
@@ -33,8 +33,8 @@
#define DEBUG_KP_TOOL 0
-#include <kpTool.h>
-#include <kpToolPrivate.h>
+#include "tools/kpTool.h"
+#include "kpToolPrivate.h"
#include <qcursor.h>
#include <qpixmap.h>
@@ -42,11 +42,11 @@
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kpCommandSize.h>
-#include <kpDefs.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpView.h>
+#include "commands/kpCommandSize.h"
+#include "kpDefs.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "views/kpView.h"
//---------------------------------------------------------------------
diff --git a/tools/polygonal/kpToolCurve.cpp b/tools/polygonal/kpToolCurve.cpp
index 60b9a98..c3e102a 100644
--- a/tools/polygonal/kpToolCurve.cpp
+++ b/tools/polygonal/kpToolCurve.cpp
@@ -29,12 +29,12 @@
#define DEBUG_KP_TOOL_CURVE 0
-#include <kpToolCurve.h>
+#include "kpToolCurve.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpPainter.h>
+#include "imagelib/kpPainter.h"
static void DrawCurveShape (kpImage *image,
diff --git a/tools/polygonal/kpToolCurve.h b/tools/polygonal/kpToolCurve.h
index 892873b..e8d198a 100644
--- a/tools/polygonal/kpToolCurve.h
+++ b/tools/polygonal/kpToolCurve.h
@@ -30,7 +30,7 @@
#define KP_TOOL_CURVE_H
-#include <kpToolPolygonalBase.h>
+#include "kpToolPolygonalBase.h"
class kpToolCurve : public kpToolPolygonalBase
diff --git a/tools/polygonal/kpToolLine.cpp b/tools/polygonal/kpToolLine.cpp
index 0af550e..b40f9eb 100644
--- a/tools/polygonal/kpToolLine.cpp
+++ b/tools/polygonal/kpToolLine.cpp
@@ -29,13 +29,13 @@
#define DEBUG_KP_TOOL_LINE 0
-#include <kpToolLine.h>
+#include "kpToolLine.h"
+
+#include "kpToolPolyline.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpToolPolyline.h>
-
static void DrawLineShape (kpImage *image,
const QPolygon &points,
diff --git a/tools/polygonal/kpToolLine.h b/tools/polygonal/kpToolLine.h
index 435f373..43914a9 100644
--- a/tools/polygonal/kpToolLine.h
+++ b/tools/polygonal/kpToolLine.h
@@ -30,7 +30,7 @@
#define KP_TOOL_LINE_H
-#include <kpToolPolygonalBase.h>
+#include "kpToolPolygonalBase.h"
class kpToolLine : public kpToolPolygonalBase
diff --git a/tools/polygonal/kpToolPolygon.cpp b/tools/polygonal/kpToolPolygon.cpp
index 6a87ad2..bfee371 100644
--- a/tools/polygonal/kpToolPolygon.cpp
+++ b/tools/polygonal/kpToolPolygon.cpp
@@ -29,12 +29,12 @@
#define DEBUG_KP_TOOL_POLYGON 0
-#include <kpToolPolygon.h>
+#include "kpToolPolygon.h"
#include <klocale.h>
-#include <kpPainter.h>
-#include <kpToolToolBar.h>
+#include "imagelib/kpPainter.h"
+#include "widgets/toolbars/kpToolToolBar.h"
static void DrawPolygonShape (kpImage *image,
diff --git a/tools/polygonal/kpToolPolygon.h b/tools/polygonal/kpToolPolygon.h
index 939921c..6e7f186 100644
--- a/tools/polygonal/kpToolPolygon.h
+++ b/tools/polygonal/kpToolPolygon.h
@@ -30,7 +30,7 @@
#define KP_TOOL_POLYGON_H
-#include <kpToolPolygonalBase.h>
+#include "kpToolPolygonalBase.h"
class kpToolPolygon : public kpToolPolygonalBase
diff --git a/tools/polygonal/kpToolPolygonalBase.cpp b/tools/polygonal/kpToolPolygonalBase.cpp
index ee596af..e2f26d8 100644
--- a/tools/polygonal/kpToolPolygonalBase.cpp
+++ b/tools/polygonal/kpToolPolygonalBase.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TOOL_POLYGON 0
-#include <kpToolPolygonalBase.h>
+#include "kpToolPolygonalBase.h"
#include <float.h>
#include <math.h>
@@ -47,18 +47,18 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpDefs.h>
-#include <kpImage.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpTempImage.h>
-#include <kpToolEnvironment.h>
-#include <kpToolPolygonalCommand.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetLineWidth.h>
-#include <kpViewManager.h>
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "kpDefs.h"
+#include "imagelib/kpImage.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "environments/tools/kpToolEnvironment.h"
+#include "commands/tools/polygonal/kpToolPolygonalCommand.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetLineWidth.h"
+#include "views/manager/kpViewManager.h"
struct kpToolPolygonalBasePrivate
diff --git a/tools/polygonal/kpToolPolygonalBase.h b/tools/polygonal/kpToolPolygonalBase.h
index 4d64b1e..5c6214c 100644
--- a/tools/polygonal/kpToolPolygonalBase.h
+++ b/tools/polygonal/kpToolPolygonalBase.h
@@ -38,10 +38,10 @@
#include <qpolygon.h>
#include <qrect.h>
-#include <kpColor.h>
-#include <kpImage.h>
-#include <kpTool.h>
-#include <kpToolWidgetFillStyle.h>
+#include "imagelib/kpColor.h"
+#include "imagelib/kpImage.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/options/kpToolWidgetFillStyle.h"
class QPoint;
diff --git a/tools/polygonal/kpToolPolyline.cpp b/tools/polygonal/kpToolPolyline.cpp
index aa42e69..4da787c 100644
--- a/tools/polygonal/kpToolPolyline.cpp
+++ b/tools/polygonal/kpToolPolyline.cpp
@@ -29,12 +29,12 @@
#define DEBUG_KP_TOOL_POLYLINE 0
-#include <kpToolPolyline.h>
+#include "kpToolPolyline.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpPainter.h>
+#include "imagelib/kpPainter.h"
kpToolPolyline::kpToolPolyline (kpToolEnvironment *environ, QObject *parent)
diff --git a/tools/polygonal/kpToolPolyline.h b/tools/polygonal/kpToolPolyline.h
index feb9c69..0ba189a 100644
--- a/tools/polygonal/kpToolPolyline.h
+++ b/tools/polygonal/kpToolPolyline.h
@@ -30,7 +30,7 @@
#define KP_TOOL_POLYLINE_H
-#include <kpToolPolygonalBase.h>
+#include "kpToolPolygonalBase.h"
class kpToolPolyline : public kpToolPolygonalBase
diff --git a/tools/rectangular/kpToolEllipse.cpp b/tools/rectangular/kpToolEllipse.cpp
index d0f2282..f33a422 100644
--- a/tools/rectangular/kpToolEllipse.cpp
+++ b/tools/rectangular/kpToolEllipse.cpp
@@ -26,8 +26,9 @@
*/
-#include <kpToolEllipse.h>
-#include <kpPainter.h>
+#include "kpToolEllipse.h"
+
+#include "imagelib/kpPainter.h"
#include <klocale.h>
diff --git a/tools/rectangular/kpToolEllipse.h b/tools/rectangular/kpToolEllipse.h
index 970d161..97fd6cb 100644
--- a/tools/rectangular/kpToolEllipse.h
+++ b/tools/rectangular/kpToolEllipse.h
@@ -30,7 +30,7 @@
#define KP_TOOL_ELLIPSE_H
-#include <kpToolRectangularBase.h>
+#include "tools/rectangular/kpToolRectangularBase.h"
class kpToolEllipse : public kpToolRectangularBase
diff --git a/tools/rectangular/kpToolRectangle.cpp b/tools/rectangular/kpToolRectangle.cpp
index 3ccba85..c882026 100644
--- a/tools/rectangular/kpToolRectangle.cpp
+++ b/tools/rectangular/kpToolRectangle.cpp
@@ -26,8 +26,9 @@
*/
-#include <kpToolRectangle.h>
-#include <kpPainter.h>
+#include "kpToolRectangle.h"
+
+#include "imagelib/kpPainter.h"
#include <klocale.h>
diff --git a/tools/rectangular/kpToolRectangle.h b/tools/rectangular/kpToolRectangle.h
index 60a0608..6dab3f0 100644
--- a/tools/rectangular/kpToolRectangle.h
+++ b/tools/rectangular/kpToolRectangle.h
@@ -30,7 +30,7 @@
#define KP_TOOL_RECTANGLE_H
-#include <kpToolRectangularBase.h>
+#include "tools/rectangular/kpToolRectangularBase.h"
class kpToolRectangle : public kpToolRectangularBase
diff --git a/tools/rectangular/kpToolRectangularBase.cpp b/tools/rectangular/kpToolRectangularBase.cpp
index 790341d..cc899bb 100644
--- a/tools/rectangular/kpToolRectangularBase.cpp
+++ b/tools/rectangular/kpToolRectangularBase.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TOOL_RECTANGULAR_BASE 0
-#include <kpToolRectangularBase.h>
+#include "tools/rectangular/kpToolRectangularBase.h"
#include <qbitmap.h>
#include <qcursor.h>
@@ -40,20 +40,20 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpTempImage.h>
-#include <kpToolEnvironment.h>
-#include <kpToolRectangularCommand.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetFillStyle.h>
-#include <kpToolWidgetLineWidth.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "imagelib/kpColor.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "environments/tools/kpToolEnvironment.h"
+#include "commands/tools/rectangular/kpToolRectangularCommand.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetFillStyle.h"
+#include "widgets/toolbars/options/kpToolWidgetLineWidth.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
//---------------------------------------------------------------------
diff --git a/tools/rectangular/kpToolRectangularBase.h b/tools/rectangular/kpToolRectangularBase.h
index e748a46..7adb307 100644
--- a/tools/rectangular/kpToolRectangularBase.h
+++ b/tools/rectangular/kpToolRectangularBase.h
@@ -30,8 +30,8 @@
#define KP_TOOL_RECTANGULAR_BASE_H
-#include <kpImage.h>
-#include <kpTool.h>
+#include "imagelib/kpImage.h"
+#include "tools/kpTool.h"
class QPoint;
diff --git a/tools/rectangular/kpToolRoundedRectangle.cpp b/tools/rectangular/kpToolRoundedRectangle.cpp
index c9098a7..f5ba466 100644
--- a/tools/rectangular/kpToolRoundedRectangle.cpp
+++ b/tools/rectangular/kpToolRoundedRectangle.cpp
@@ -24,8 +24,9 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kpToolRoundedRectangle.h>
-#include <kpPainter.h>
+#include "kpToolRoundedRectangle.h"
+
+#include "imagelib/kpPainter.h"
#include <klocale.h>
diff --git a/tools/rectangular/kpToolRoundedRectangle.h b/tools/rectangular/kpToolRoundedRectangle.h
index 58b270d..22b4fe7 100644
--- a/tools/rectangular/kpToolRoundedRectangle.h
+++ b/tools/rectangular/kpToolRoundedRectangle.h
@@ -30,7 +30,7 @@
#define KP_TOOL_ROUNDED_RECTANGLE_H
-#include <kpToolRectangularBase.h>
+#include "tools/rectangular/kpToolRectangularBase.h"
class kpToolRoundedRectangle : public kpToolRectangularBase
diff --git a/tools/selection/image/kpAbstractImageSelectionTool.cpp b/tools/selection/image/kpAbstractImageSelectionTool.cpp
index 85301b6..8847e88 100644
--- a/tools/selection/image/kpAbstractImageSelectionTool.cpp
+++ b/tools/selection/image/kpAbstractImageSelectionTool.cpp
@@ -26,14 +26,14 @@
*/
-#include <kpAbstractImageSelectionTool.h>
+#include "kpAbstractImageSelectionTool.h"
#include <KLocalizedString>
-#include <kpAbstractImageSelection.h>
-#include <kpDocument.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolSelectionPullFromDocumentCommand.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "document/kpDocument.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h"
//---------------------------------------------------------------------
diff --git a/tools/selection/image/kpAbstractImageSelectionTool.h b/tools/selection/image/kpAbstractImageSelectionTool.h
index e729615..50cb847 100644
--- a/tools/selection/image/kpAbstractImageSelectionTool.h
+++ b/tools/selection/image/kpAbstractImageSelectionTool.h
@@ -30,7 +30,7 @@
#define kpAbstractImageSelectionTool_H
-#include <kpAbstractSelectionTool.h>
+#include "tools/selection/kpAbstractSelectionTool.h"
class kpImageSelectionTransparency;
diff --git a/tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp b/tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp
index e111949..2d54f11 100644
--- a/tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp
+++ b/tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp
@@ -29,7 +29,30 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpAbstractImageSelectionTool.h>
+#include "kpAbstractImageSelectionTool.h"
+
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "layers/selections/kpAbstractSelection.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "commands/kpMacroCommand.h"
+#include "generic/kpSetOverrideCursorSaver.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "commands/tools/selection/kpToolSelectionDestroyCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/kpToolSelectionMoveCommand.h"
+#include "commands/tools/selection/kpToolSelectionResizeScaleCommand.h"
+#include "commands/tools/selection/kpToolImageSelectionTransparencyCommand.h"
+#include "commands/tools/selection/text/kpToolTextGiveContentCommand.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
+
+#include <kdebug.h>
+#include <klocale.h>
// LOREFACTOR: Remove unneeded #include
#include <qapplication.h>
@@ -42,29 +65,6 @@
#include <qpolygon.h>
#include <qtimer.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpAbstractImageSelection.h>
-#include <kpAbstractSelection.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMacroCommand.h>
-#include <kpSetOverrideCursorSaver.h>
-#include <kpTextSelection.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionDestroyCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolSelectionMoveCommand.h>
-#include <kpToolSelectionResizeScaleCommand.h>
-#include <kpToolImageSelectionTransparencyCommand.h>
-#include <kpToolTextGiveContentCommand.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
-
// protected
bool kpAbstractImageSelectionTool::shouldChangeImageSelectionTransparency () const
diff --git a/tools/selection/image/kpToolEllipticalSelection.cpp b/tools/selection/image/kpToolEllipticalSelection.cpp
index 804d56a..a9a6a2e 100644
--- a/tools/selection/image/kpToolEllipticalSelection.cpp
+++ b/tools/selection/image/kpToolEllipticalSelection.cpp
@@ -28,14 +28,14 @@
#define DEBUG_KP_TOOL_ELLIPTICAL_SELECTION 0
-#include <kpToolEllipticalSelection.h>
+#include "kpToolEllipticalSelection.h"
#include <klocale.h>
#include <kdebug.h>
-#include <kpDocument.h>
-#include <kpEllipticalImageSelection.h>
-#include <kpToolSelectionEnvironment.h>
+#include "document/kpDocument.h"
+#include "layers/selections/image/kpEllipticalImageSelection.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
kpToolEllipticalSelection::kpToolEllipticalSelection (kpToolSelectionEnvironment *environ,
diff --git a/tools/selection/image/kpToolEllipticalSelection.h b/tools/selection/image/kpToolEllipticalSelection.h
index 583b411..5cdba75 100644
--- a/tools/selection/image/kpToolEllipticalSelection.h
+++ b/tools/selection/image/kpToolEllipticalSelection.h
@@ -30,7 +30,7 @@
#define KP_TOOL_ELLIPTICAL_SELECTION_H
-#include <kpAbstractImageSelectionTool.h>
+#include "kpAbstractImageSelectionTool.h"
class kpToolEllipticalSelection : public kpAbstractImageSelectionTool
diff --git a/tools/selection/image/kpToolFreeFormSelection.cpp b/tools/selection/image/kpToolFreeFormSelection.cpp
index 5ad5c96..86aabfe 100644
--- a/tools/selection/image/kpToolFreeFormSelection.cpp
+++ b/tools/selection/image/kpToolFreeFormSelection.cpp
@@ -29,14 +29,14 @@
#define DEBUG_KP_TOOL_FREE_FROM_SELECTION 0
-#include <kpToolFreeFormSelection.h>
+#include "kpToolFreeFormSelection.h"
#include <KDebug>
#include <KLocalizedString>
-#include <kpDocument.h>
-#include <kpFreeFormImageSelection.h>
-#include <kpToolSelectionEnvironment.h>
+#include "document/kpDocument.h"
+#include "layers/selections/image/kpFreeFormImageSelection.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
//---------------------------------------------------------------------
diff --git a/tools/selection/image/kpToolFreeFormSelection.h b/tools/selection/image/kpToolFreeFormSelection.h
index 7ad1a9d..40f9f02 100644
--- a/tools/selection/image/kpToolFreeFormSelection.h
+++ b/tools/selection/image/kpToolFreeFormSelection.h
@@ -30,7 +30,7 @@
#define KP_TOOL_FREE_FORM_SELECTION_H
-#include <kpAbstractImageSelectionTool.h>
+#include "kpAbstractImageSelectionTool.h"
class kpToolFreeFormSelection : public kpAbstractImageSelectionTool
diff --git a/tools/selection/image/kpToolRectSelection.cpp b/tools/selection/image/kpToolRectSelection.cpp
index ecbac4e..41ef554 100644
--- a/tools/selection/image/kpToolRectSelection.cpp
+++ b/tools/selection/image/kpToolRectSelection.cpp
@@ -27,14 +27,14 @@
#define DEBUG_KP_TOOL_RECT_SELECTION 0
-#include <kpToolRectSelection.h>
+#include "kpToolRectSelection.h"
#include <klocale.h>
#include <kdebug.h>
-#include <kpDocument.h>
-#include <kpRectangularImageSelection.h>
-#include <kpToolSelectionEnvironment.h>
+#include "document/kpDocument.h"
+#include "layers/selections/image/kpRectangularImageSelection.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
kpToolRectSelection::kpToolRectSelection (kpToolSelectionEnvironment *environ,
diff --git a/tools/selection/image/kpToolRectSelection.h b/tools/selection/image/kpToolRectSelection.h
index e55bf7f..60c697c 100644
--- a/tools/selection/image/kpToolRectSelection.h
+++ b/tools/selection/image/kpToolRectSelection.h
@@ -30,7 +30,7 @@
#define KP_TOOL_RECT_SELECTION_H
-#include <kpAbstractImageSelectionTool.h>
+#include "kpAbstractImageSelectionTool.h"
class kpToolRectSelection : public kpAbstractImageSelectionTool
diff --git a/tools/selection/kpAbstractSelectionTool.cpp b/tools/selection/kpAbstractSelectionTool.cpp
index 36338e3..f9aa0f1 100644
--- a/tools/selection/kpAbstractSelectionTool.cpp
+++ b/tools/selection/kpAbstractSelectionTool.cpp
@@ -29,8 +29,8 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpAbstractSelectionTool.h>
-#include <kpAbstractSelectionToolPrivate.h>
+#include "kpAbstractSelectionTool.h"
+#include "kpAbstractSelectionToolPrivate.h"
#include <qcursor.h>
#include <qmenu.h>
@@ -39,19 +39,19 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpAbstractSelection.h>
-#include <kpAbstractSelectionContentCommand.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMacroCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
-#include <kpPainter.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "commands/tools/selection/kpAbstractSelectionContentCommand.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "commands/kpMacroCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
+#include "imagelib/kpPainter.h"
//---------------------------------------------------------------------
diff --git a/tools/selection/kpAbstractSelectionTool.h b/tools/selection/kpAbstractSelectionTool.h
index 1f67016..8513c47 100644
--- a/tools/selection/kpAbstractSelectionTool.h
+++ b/tools/selection/kpAbstractSelectionTool.h
@@ -30,7 +30,7 @@
#define kpAbstractSelectionTool_H
-#include <kpTool.h>
+#include "tools/kpTool.h"
#include <QVariant>
diff --git a/tools/selection/kpAbstractSelectionToolPrivate.h b/tools/selection/kpAbstractSelectionToolPrivate.h
index 1eb52cf..f949240 100644
--- a/tools/selection/kpAbstractSelectionToolPrivate.h
+++ b/tools/selection/kpAbstractSelectionToolPrivate.h
@@ -29,11 +29,10 @@
#ifndef kpAbstractSelectionToolPrivate_H
#define kpAbstractSelectionToolPrivate_H
+#include "kpAbstractSelectionTool.h"
#include <QPoint>
-#include <kpAbstractSelectionTool.h>
-
class QTimer;
diff --git a/tools/selection/kpAbstractSelectionTool_Create.cpp b/tools/selection/kpAbstractSelectionTool_Create.cpp
index 32ca20b..6fc0aeb 100644
--- a/tools/selection/kpAbstractSelectionTool_Create.cpp
+++ b/tools/selection/kpAbstractSelectionTool_Create.cpp
@@ -29,8 +29,8 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpAbstractSelectionTool.h>
-#include <kpAbstractSelectionToolPrivate.h>
+#include "kpAbstractSelectionTool.h"
+#include "kpAbstractSelectionToolPrivate.h"
#include <qapplication.h>
#include <qbitmap.h>
@@ -45,22 +45,22 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpAbstractImageSelection.h>
-#include <kpAbstractSelection.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMacroCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionDestroyCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolSelectionMoveCommand.h>
-#include <kpToolSelectionResizeScaleCommand.h>
-#include <kpToolImageSelectionTransparencyCommand.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "layers/selections/kpAbstractSelection.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "commands/kpMacroCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "commands/tools/selection/kpToolSelectionDestroyCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/kpToolSelectionMoveCommand.h"
+#include "commands/tools/selection/kpToolSelectionResizeScaleCommand.h"
+#include "commands/tools/selection/kpToolImageSelectionTransparencyCommand.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
// private
diff --git a/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp b/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
index 038124c..347d913 100644
--- a/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
+++ b/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
@@ -29,12 +29,13 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpDocument.h>
-#include <kpAbstractSelectionTool.h>
-#include <kpAbstractSelectionToolPrivate.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolSelectionMoveCommand.h>
-#include <kpAbstractSelection.h>
+#include "kpAbstractSelectionTool.h"
+#include "kpAbstractSelectionToolPrivate.h"
+
+#include "document/kpDocument.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/kpToolSelectionMoveCommand.h"
+#include "layers/selections/kpAbstractSelection.h"
#include <qevent.h>
diff --git a/tools/selection/kpAbstractSelectionTool_Move.cpp b/tools/selection/kpAbstractSelectionTool_Move.cpp
index 65ee111..c2372c4 100644
--- a/tools/selection/kpAbstractSelectionTool_Move.cpp
+++ b/tools/selection/kpAbstractSelectionTool_Move.cpp
@@ -29,8 +29,8 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpAbstractSelectionTool.h>
-#include <kpAbstractSelectionToolPrivate.h>
+#include "kpAbstractSelectionTool.h"
+#include "kpAbstractSelectionToolPrivate.h"
#include <qevent.h>
#include <qmenu.h>
@@ -39,22 +39,22 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpAbstractImageSelection.h>
-#include <kpAbstractSelection.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMacroCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionDestroyCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolSelectionMoveCommand.h>
-#include <kpToolSelectionResizeScaleCommand.h>
-#include <kpToolImageSelectionTransparencyCommand.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "layers/selections/kpAbstractSelection.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "commands/kpMacroCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "commands/tools/selection/kpToolSelectionDestroyCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/kpToolSelectionMoveCommand.h"
+#include "commands/tools/selection/kpToolSelectionResizeScaleCommand.h"
+#include "commands/tools/selection/kpToolImageSelectionTransparencyCommand.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
//---------------------------------------------------------------------
diff --git a/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp b/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp
index 69e3f93..1fac0ac 100644
--- a/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp
+++ b/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp
@@ -29,8 +29,8 @@
#define DEBUG_KP_TOOL_SELECTION 0
-#include <kpAbstractSelectionTool.h>
-#include <kpAbstractSelectionToolPrivate.h>
+#include "kpAbstractSelectionTool.h"
+#include "kpAbstractSelectionToolPrivate.h"
#include <qapplication.h>
#include <qbitmap.h>
@@ -45,22 +45,22 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpAbstractImageSelection.h>
-#include <kpAbstractSelection.h>
-#include <kpCommandHistory.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMacroCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionDestroyCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolSelectionMoveCommand.h>
-#include <kpToolSelectionResizeScaleCommand.h>
-#include <kpToolImageSelectionTransparencyCommand.h>
-#include <kpToolToolBar.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "layers/selections/image/kpAbstractImageSelection.h"
+#include "layers/selections/kpAbstractSelection.h"
+#include "commands/kpCommandHistory.h"
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "commands/kpMacroCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "commands/tools/selection/kpToolSelectionDestroyCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/kpToolSelectionMoveCommand.h"
+#include "commands/tools/selection/kpToolSelectionResizeScaleCommand.h"
+#include "commands/tools/selection/kpToolImageSelectionTransparencyCommand.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
// private
diff --git a/tools/selection/text/kpToolText.cpp b/tools/selection/text/kpToolText.cpp
index e60af88..6a7116c 100644
--- a/tools/selection/text/kpToolText.cpp
+++ b/tools/selection/text/kpToolText.cpp
@@ -30,8 +30,8 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <qevent.h>
#include <qlist.h>
@@ -39,20 +39,20 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolTextBackspaceCommand.h>
-#include <kpToolTextChangeStyleCommand.h>
-#include <kpToolTextGiveContentCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolTextDeleteCommand.h>
-#include <kpToolTextEnterCommand.h>
-#include <kpToolTextInsertCommand.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/tools/selection/text/kpToolTextBackspaceCommand.h"
+#include "commands/tools/selection/text/kpToolTextChangeStyleCommand.h"
+#include "commands/tools/selection/text/kpToolTextGiveContentCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/text/kpToolTextDeleteCommand.h"
+#include "commands/tools/selection/text/kpToolTextEnterCommand.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
kpToolText::kpToolText (kpToolSelectionEnvironment *environ, QObject *parent)
diff --git a/tools/selection/text/kpToolText.h b/tools/selection/text/kpToolText.h
index 6b4fa5f..f7e49eb 100644
--- a/tools/selection/text/kpToolText.h
+++ b/tools/selection/text/kpToolText.h
@@ -30,7 +30,7 @@
#define KP_TOOL_TEXT_H
-#include <kpAbstractSelectionTool.h>
+#include "tools/selection/kpAbstractSelectionTool.h"
class QKeyEvent;
diff --git a/tools/selection/text/kpToolText_Commands.cpp b/tools/selection/text/kpToolText_Commands.cpp
index d87ab57..d875838 100644
--- a/tools/selection/text/kpToolText_Commands.cpp
+++ b/tools/selection/text/kpToolText_Commands.cpp
@@ -28,18 +28,18 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolTextBackspaceCommand.h>
-#include <kpToolTextDeleteCommand.h>
-#include <kpToolTextEnterCommand.h>
-#include <kpToolTextInsertCommand.h>
-#include <kpViewManager.h>
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/text/kpToolTextBackspaceCommand.h"
+#include "commands/tools/selection/text/kpToolTextDeleteCommand.h"
+#include "commands/tools/selection/text/kpToolTextEnterCommand.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
+#include "views/manager/kpViewManager.h"
// private
diff --git a/tools/selection/text/kpToolText_Create.cpp b/tools/selection/text/kpToolText_Create.cpp
index f617d6b..427c6d5 100644
--- a/tools/selection/text/kpToolText_Create.cpp
+++ b/tools/selection/text/kpToolText_Create.cpp
@@ -28,18 +28,18 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <QList>
#include <KLocalizedString>
#include <KDebug>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpViewManager.h>
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "views/manager/kpViewManager.h"
// protected virtual [kpAbstractSelectionTool]
diff --git a/tools/selection/text/kpToolText_CursorCalc.cpp b/tools/selection/text/kpToolText_CursorCalc.cpp
index aa63636..a6d16b0 100644
--- a/tools/selection/text/kpToolText_CursorCalc.cpp
+++ b/tools/selection/text/kpToolText_CursorCalc.cpp
@@ -28,7 +28,7 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
+#include "tools/selection/text/kpToolText.h"
#include <qevent.h>
#include <qlist.h>
@@ -36,18 +36,18 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolTextBackspaceCommand.h>
-#include <kpToolTextChangeStyleCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolTextDeleteCommand.h>
-#include <kpToolTextEnterCommand.h>
-#include <kpToolTextInsertCommand.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/tools/selection/text/kpToolTextBackspaceCommand.h"
+#include "commands/tools/selection/text/kpToolTextChangeStyleCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/text/kpToolTextDeleteCommand.h"
+#include "commands/tools/selection/text/kpToolTextEnterCommand.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
// protected static
diff --git a/tools/selection/text/kpToolText_InputMethodEvents.cpp b/tools/selection/text/kpToolText_InputMethodEvents.cpp
index d7f8b44..09bc698 100644
--- a/tools/selection/text/kpToolText_InputMethodEvents.cpp
+++ b/tools/selection/text/kpToolText_InputMethodEvents.cpp
@@ -30,18 +30,18 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
-#include <kpToolTextInsertCommand.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
#include <qevent.h>
#include <kdebug.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
//---------------------------------------------------------------------
diff --git a/tools/selection/text/kpToolText_KeyboardEvents.cpp b/tools/selection/text/kpToolText_KeyboardEvents.cpp
index 02eb883..7a0a101 100644
--- a/tools/selection/text/kpToolText_KeyboardEvents.cpp
+++ b/tools/selection/text/kpToolText_KeyboardEvents.cpp
@@ -28,8 +28,8 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <qevent.h>
#include <qlist.h>
@@ -37,19 +37,19 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolTextBackspaceCommand.h>
-#include <kpToolTextChangeStyleCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolTextDeleteCommand.h>
-#include <kpToolTextEnterCommand.h>
-#include <kpToolTextInsertCommand.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/tools/selection/text/kpToolTextBackspaceCommand.h"
+#include "commands/tools/selection/text/kpToolTextChangeStyleCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/text/kpToolTextDeleteCommand.h"
+#include "commands/tools/selection/text/kpToolTextEnterCommand.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
// protected virtual [base kpTool]
diff --git a/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp b/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
index e989ff6..7982246 100644
--- a/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
+++ b/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
@@ -28,8 +28,8 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <qevent.h>
#include <qlist.h>
@@ -37,19 +37,19 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolTextBackspaceCommand.h>
-#include <kpToolTextChangeStyleCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolTextDeleteCommand.h>
-#include <kpToolTextEnterCommand.h>
-#include <kpToolTextInsertCommand.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/tools/selection/text/kpToolTextBackspaceCommand.h"
+#include "commands/tools/selection/text/kpToolTextChangeStyleCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/text/kpToolTextDeleteCommand.h"
+#include "commands/tools/selection/text/kpToolTextEnterCommand.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
// protected
diff --git a/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp b/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
index 95ca256..d47491b 100644
--- a/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
+++ b/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
@@ -28,8 +28,8 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <qevent.h>
#include <qlist.h>
@@ -37,19 +37,19 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolTextBackspaceCommand.h>
-#include <kpToolTextChangeStyleCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolTextDeleteCommand.h>
-#include <kpToolTextEnterCommand.h>
-#include <kpToolTextInsertCommand.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/tools/selection/text/kpToolTextBackspaceCommand.h"
+#include "commands/tools/selection/text/kpToolTextChangeStyleCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/text/kpToolTextDeleteCommand.h"
+#include "commands/tools/selection/text/kpToolTextEnterCommand.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
//---------------------------------------------------------------------
diff --git a/tools/selection/text/kpToolText_Move.cpp b/tools/selection/text/kpToolText_Move.cpp
index faa7ec1..91f6149 100644
--- a/tools/selection/text/kpToolText_Move.cpp
+++ b/tools/selection/text/kpToolText_Move.cpp
@@ -28,12 +28,12 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <KLocalizedString>
-#include <kpViewManager.h>
+#include "views/manager/kpViewManager.h"
// protected virtual [kpAbstractSelectionTool]
diff --git a/tools/selection/text/kpToolText_ResizeScale.cpp b/tools/selection/text/kpToolText_ResizeScale.cpp
index ab59a5d..fb32255 100644
--- a/tools/selection/text/kpToolText_ResizeScale.cpp
+++ b/tools/selection/text/kpToolText_ResizeScale.cpp
@@ -28,12 +28,12 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <KLocalizedString>
-#include <kpViewManager.h>
+#include "views/manager/kpViewManager.h"
// protected virtual [kpAbstractSelectionTool]
diff --git a/tools/selection/text/kpToolText_SelectText.cpp b/tools/selection/text/kpToolText_SelectText.cpp
index aa292b4..397e723 100644
--- a/tools/selection/text/kpToolText_SelectText.cpp
+++ b/tools/selection/text/kpToolText_SelectText.cpp
@@ -28,15 +28,15 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <KDebug>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
// private
diff --git a/tools/selection/text/kpToolText_TextStyle.cpp b/tools/selection/text/kpToolText_TextStyle.cpp
index 0c6f880..1e441e3 100644
--- a/tools/selection/text/kpToolText_TextStyle.cpp
+++ b/tools/selection/text/kpToolText_TextStyle.cpp
@@ -28,8 +28,8 @@
#define DEBUG_KP_TOOL_TEXT 0
-#include <kpToolText.h>
-#include <kpToolTextPrivate.h>
+#include "tools/selection/text/kpToolText.h"
+#include "kpToolTextPrivate.h"
#include <qevent.h>
#include <qlist.h>
@@ -37,20 +37,20 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpCommandHistory.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpToolTextBackspaceCommand.h>
-#include <kpToolTextChangeStyleCommand.h>
-#include <kpToolTextGiveContentCommand.h>
-#include <kpToolSelectionCreateCommand.h>
-#include <kpToolSelectionEnvironment.h>
-#include <kpToolTextDeleteCommand.h>
-#include <kpToolTextEnterCommand.h>
-#include <kpToolTextInsertCommand.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "commands/kpCommandHistory.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "commands/tools/selection/text/kpToolTextBackspaceCommand.h"
+#include "commands/tools/selection/text/kpToolTextChangeStyleCommand.h"
+#include "commands/tools/selection/text/kpToolTextGiveContentCommand.h"
+#include "commands/tools/selection/kpToolSelectionCreateCommand.h"
+#include "environments/tools/selection/kpToolSelectionEnvironment.h"
+#include "commands/tools/selection/text/kpToolTextDeleteCommand.h"
+#include "commands/tools/selection/text/kpToolTextEnterCommand.h"
+#include "commands/tools/selection/text/kpToolTextInsertCommand.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
// protected
diff --git a/views/kpThumbnailView.cpp b/views/kpThumbnailView.cpp
index de01294..9407851 100644
--- a/views/kpThumbnailView.cpp
+++ b/views/kpThumbnailView.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_THUMBNAIL_VIEW 0
-#include <kpThumbnailView.h>
+#include "views/kpThumbnailView.h"
#include <kdebug.h>
diff --git a/views/kpThumbnailView.h b/views/kpThumbnailView.h
index 735a6e0..5281154 100644
--- a/views/kpThumbnailView.h
+++ b/views/kpThumbnailView.h
@@ -30,7 +30,7 @@
#define KP_THUMBNAIL_VIEW_H
-#include <kpView.h>
+#include "views/kpView.h"
/**
diff --git a/views/kpUnzoomedThumbnailView.cpp b/views/kpUnzoomedThumbnailView.cpp
index 180a9c5..b574c94 100644
--- a/views/kpUnzoomedThumbnailView.cpp
+++ b/views/kpUnzoomedThumbnailView.cpp
@@ -29,14 +29,14 @@
#define DEBUG_KP_UNZOOMED_THUMBNAIL_VIEW 0
-#include <kpUnzoomedThumbnailView.h>
+#include "views/kpUnzoomedThumbnailView.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpDocument.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
+#include "document/kpDocument.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
#include <QScrollBar>
diff --git a/views/kpUnzoomedThumbnailView.h b/views/kpUnzoomedThumbnailView.h
index 024bc72..09df269 100644
--- a/views/kpUnzoomedThumbnailView.h
+++ b/views/kpUnzoomedThumbnailView.h
@@ -30,7 +30,7 @@
#define KP_UNZOOMED_THUMBNAIL_VIEW_H
-#include <kpThumbnailView.h>
+#include "views/kpThumbnailView.h"
class kpViewScrollableContainer;
diff --git a/views/kpView.cpp b/views/kpView.cpp
index e11baad..ad95ca4 100644
--- a/views/kpView.cpp
+++ b/views/kpView.cpp
@@ -32,8 +32,8 @@
#define DEBUG_KP_VIEW_RENDERER ((DEBUG_KP_VIEW && 1) || 0)
-#include <kpView.h>
-#include <kpViewPrivate.h>
+#include "kpView.h"
+#include "kpViewPrivate.h"
#include <math.h>
#include <stdlib.h>
@@ -46,13 +46,13 @@
#include <KDebug>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpTextSelection.h>
-#include <kpTool.h>
-#include <kpToolToolBar.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "tools/kpTool.h"
+#include "widgets/toolbars/kpToolToolBar.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
//---------------------------------------------------------------------
diff --git a/views/kpView.h b/views/kpView.h
index 1e54bb5..0d24128 100644
--- a/views/kpView.h
+++ b/views/kpView.h
@@ -32,7 +32,7 @@
#include <qwidget.h>
-#include <kpDefs.h>
+#include "kpDefs.h"
class QDragEnterEvent;
diff --git a/views/kpView_Events.cpp b/views/kpView_Events.cpp
index 9532561..9a9d2df 100644
--- a/views/kpView_Events.cpp
+++ b/views/kpView_Events.cpp
@@ -32,8 +32,8 @@
#define DEBUG_KP_VIEW_RENDERER ((DEBUG_KP_VIEW && 1) || 0)
-#include <kpView.h>
-#include <kpViewPrivate.h>
+#include "views/kpView.h"
+#include "kpViewPrivate.h"
#if DEBUG_KP_VIEW
#include <KDebug>
@@ -42,7 +42,7 @@
#include <QKeyEvent>
#include <QMouseEvent>
-#include <kpTool.h>
+#include "tools/kpTool.h"
#include <kdebug.h>
diff --git a/views/kpView_Paint.cpp b/views/kpView_Paint.cpp
index c611704..a5d4f4d 100644
--- a/views/kpView_Paint.cpp
+++ b/views/kpView_Paint.cpp
@@ -30,8 +30,8 @@
#define DEBUG_KP_VIEW_RENDERER ((DEBUG_KP_VIEW && 1) || 0)
-#include <kpView.h>
-#include <kpViewPrivate.h>
+#include "views/kpView.h"
+#include "kpViewPrivate.h"
#include <QPainter>
#include <QPaintEvent>
@@ -40,13 +40,13 @@
#include <KDebug>
-#include <kpAbstractSelection.h>
-#include <kpColor.h>
-#include <kpDocument.h>
-#include <kpTempImage.h>
-#include <kpTextSelection.h>
-#include <kpViewManager.h>
-#include <kpViewScrollableContainer.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "imagelib/kpColor.h"
+#include "document/kpDocument.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "views/manager/kpViewManager.h"
+#include "kpViewScrollableContainer.h"
//---------------------------------------------------------------------
diff --git a/views/kpView_Selections.cpp b/views/kpView_Selections.cpp
index 4d3a90f..f12ceeb 100644
--- a/views/kpView_Selections.cpp
+++ b/views/kpView_Selections.cpp
@@ -30,12 +30,12 @@
#define DEBUG_KP_VIEW_RENDERER ((DEBUG_KP_VIEW && 1) || 0)
-#include <kpView.h>
-#include <kpViewPrivate.h>
+#include "views/kpView.h"
+#include "kpViewPrivate.h"
-#include <kpAbstractSelection.h>
-#include <kpTextSelection.h>
-#include <kpTool.h>
+#include "layers/selections/kpAbstractSelection.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "tools/kpTool.h"
// public
diff --git a/views/kpZoomedThumbnailView.cpp b/views/kpZoomedThumbnailView.cpp
index 1985317..e98518d 100644
--- a/views/kpZoomedThumbnailView.cpp
+++ b/views/kpZoomedThumbnailView.cpp
@@ -29,13 +29,13 @@
#define DEBUG_KP_ZOOMED_THUMBNAIL_VIEW 0
-#include <kpZoomedThumbnailView.h>
+#include "views/kpZoomedThumbnailView.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpDocument.h>
-#include <kpViewManager.h>
+#include "document/kpDocument.h"
+#include "views/manager/kpViewManager.h"
kpZoomedThumbnailView::kpZoomedThumbnailView (kpDocument *document,
diff --git a/views/kpZoomedThumbnailView.h b/views/kpZoomedThumbnailView.h
index 30f67bd..8f41806 100644
--- a/views/kpZoomedThumbnailView.h
+++ b/views/kpZoomedThumbnailView.h
@@ -30,7 +30,7 @@
#define KP_ZOOMED_THUMBNAIL_VIEW_H
-#include <kpThumbnailView.h>
+#include "kpThumbnailView.h"
/**
diff --git a/views/kpZoomedView.cpp b/views/kpZoomedView.cpp
index 14502ce..8a5cf5d 100644
--- a/views/kpZoomedView.cpp
+++ b/views/kpZoomedView.cpp
@@ -29,13 +29,13 @@
#define DEBUG_KP_ZOOMED_VIEW 0
-#include <kpZoomedView.h>
+#include "views/kpZoomedView.h"
#include <kdebug.h>
-#include <kpDocument.h>
-#include <kpView.h>
-#include <kpViewManager.h>
+#include "document/kpDocument.h"
+#include "views/kpView.h"
+#include "views/manager/kpViewManager.h"
kpZoomedView::kpZoomedView (kpDocument *document,
diff --git a/views/kpZoomedView.h b/views/kpZoomedView.h
index 4bd9b30..cce8bb0 100644
--- a/views/kpZoomedView.h
+++ b/views/kpZoomedView.h
@@ -30,7 +30,7 @@
#define KP_ZOOMED_VIEW_H
-#include <kpView.h>
+#include "views/kpView.h"
/**
diff --git a/views/manager/kpViewManager.cpp b/views/manager/kpViewManager.cpp
index 6beccc4..7671b1f 100644
--- a/views/manager/kpViewManager.cpp
+++ b/views/manager/kpViewManager.cpp
@@ -29,8 +29,8 @@
#define DEBUG_KP_VIEW_MANAGER 0
-#include <kpViewManager.h>
-#include <kpViewManagerPrivate.h>
+#include "views/manager/kpViewManager.h"
+#include "kpViewManagerPrivate.h"
#include <qapplication.h>
#include <qlist.h>
@@ -38,13 +38,13 @@
#include <kdebug.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpTempImage.h>
-#include <kpTextSelection.h>
-#include <kpTool.h>
-#include <kpView.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "tools/kpTool.h"
+#include "views/kpView.h"
//---------------------------------------------------------------------
diff --git a/views/manager/kpViewManager_TextCursor.cpp b/views/manager/kpViewManager_TextCursor.cpp
index 69b657c..ffd8f28 100644
--- a/views/manager/kpViewManager_TextCursor.cpp
+++ b/views/manager/kpViewManager_TextCursor.cpp
@@ -47,8 +47,8 @@
#define DEBUG_KP_VIEW_MANAGER 0
-#include <kpViewManager.h>
-#include <kpViewManagerPrivate.h>
+#include "kpViewManager.h"
+#include "kpViewManagerPrivate.h"
#include <qapplication.h>
#include <qlist.h>
@@ -57,13 +57,13 @@
#include <kdebug.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpTempImage.h>
-#include <kpTextSelection.h>
-#include <kpTool.h>
-#include <kpView.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "tools/kpTool.h"
+#include "views/kpView.h"
// public
diff --git a/views/manager/kpViewManager_ViewUpdates.cpp b/views/manager/kpViewManager_ViewUpdates.cpp
index 3504a45..c572bef 100644
--- a/views/manager/kpViewManager_ViewUpdates.cpp
+++ b/views/manager/kpViewManager_ViewUpdates.cpp
@@ -29,8 +29,8 @@
#define DEBUG_KP_VIEW_MANAGER 0
-#include <kpViewManager.h>
-#include <kpViewManagerPrivate.h>
+#include "views/manager/kpViewManager.h"
+#include "kpViewManagerPrivate.h"
#include <qapplication.h>
#include <qlist.h>
@@ -38,13 +38,13 @@
#include <kdebug.h>
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpMainWindow.h>
-#include <kpTempImage.h>
-#include <kpTextSelection.h>
-#include <kpTool.h>
-#include <kpView.h>
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "mainWindow/kpMainWindow.h"
+#include "layers/tempImage/kpTempImage.h"
+#include "layers/selections/text/kpTextSelection.h"
+#include "tools/kpTool.h"
+#include "views/kpView.h"
// public slot
diff --git a/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp b/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
index 32b472a..ca80199 100644
--- a/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
+++ b/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_COLOR_SIMILARITY_CUBE 0
-#include <kpColorSimilarityCubeRenderer.h>
+#include "kpColorSimilarityCubeRenderer.h"
#include <math.h>
@@ -38,8 +38,8 @@
#include <kdebug.h>
-#include <kpColorSimilarityHolder.h>
-#include <kpDefs.h>
+#include "widgets/colorSimilarity/kpColorSimilarityHolder.h"
+#include "kpDefs.h"
//---------------------------------------------------------------------
diff --git a/widgets/colorSimilarity/kpColorSimilarityFrame.cpp b/widgets/colorSimilarity/kpColorSimilarityFrame.cpp
index 727f02d..3d341f0 100644
--- a/widgets/colorSimilarity/kpColorSimilarityFrame.cpp
+++ b/widgets/colorSimilarity/kpColorSimilarityFrame.cpp
@@ -29,11 +29,11 @@
#define DEBUG_KP_COLOR_SIMILARITY_CUBE 0
-#include <kpColorSimilarityFrame.h>
+#include "kpColorSimilarityFrame.h"
-#include <kdebug.h>
+#include "kpColorSimilarityCubeRenderer.h"
-#include <kpColorSimilarityCubeRenderer.h>
+#include <kdebug.h>
//---------------------------------------------------------------------
diff --git a/widgets/colorSimilarity/kpColorSimilarityFrame.h b/widgets/colorSimilarity/kpColorSimilarityFrame.h
index cbeec8d..1e766d2 100644
--- a/widgets/colorSimilarity/kpColorSimilarityFrame.h
+++ b/widgets/colorSimilarity/kpColorSimilarityFrame.h
@@ -29,11 +29,10 @@
#ifndef kpColorSimilarityFrame_H
#define kpColorSimilarityFrame_H
+#include "kpColorSimilarityHolder.h"
#include <QWidget>
-#include <kpColorSimilarityHolder.h>
-
class kpColorSimilarityFrame : public QWidget, public kpColorSimilarityHolder
{
diff --git a/widgets/colorSimilarity/kpColorSimilarityHolder.cpp b/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
index c32051d..01f1b1a 100644
--- a/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
+++ b/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
@@ -29,7 +29,11 @@
#define DEBUG_KP_COLOR_SIMILARITY_CUBE 0
-#include <kpColorSimilarityHolder.h>
+#include "kpColorSimilarityHolder.h"
+
+#include "kpColorSimilarityCubeRenderer.h"
+#include "imagelib/kpColor.h"
+#include "kpDefs.h"
#include <math.h>
@@ -40,10 +44,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpColorSimilarityCubeRenderer.h>
-#include <kpDefs.h>
-
// public static
const double kpColorSimilarityHolder::ColorCubeDiagonalDistance =
diff --git a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp
index 8d3da5a..65692f2 100644
--- a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp
+++ b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM 0
-#include <kpColorSimilarityToolBarItem.h>
+#include "kpColorSimilarityToolBarItem.h"
#include <QTimer>
#include <QPixmap>
@@ -38,10 +38,10 @@
#include <KLocalizedString>
#include <KSharedConfig>
-#include <kpColor.h>
-#include <kpColorSimilarityDialog.h>
-#include <kpColorSimilarityCubeRenderer.h>
-#include <kpDefs.h>
+#include "imagelib/kpColor.h"
+#include "dialogs/kpColorSimilarityDialog.h"
+#include "kpColorSimilarityCubeRenderer.h"
+#include "kpDefs.h"
//---------------------------------------------------------------------
diff --git a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
index bf94f9e..5172975 100644
--- a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
+++ b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
@@ -30,7 +30,7 @@
#define kpColorSimilarityToolBarItem_H
-#include <kpColorSimilarityHolder.h>
+#include "widgets/colorSimilarity/kpColorSimilarityHolder.h"
#include <QToolButton>
diff --git a/widgets/imagelib/effects/kpEffectBalanceWidget.cpp b/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
index cd6deaf..daf7010 100644
--- a/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
@@ -28,7 +28,14 @@
#define DEBUG_KP_EFFECT_BALANCE 0
-#include <kpEffectBalanceWidget.h>
+#include "kpEffectBalanceWidget.h"
+
+#include "imagelib/effects/kpEffectBalance.h"
+#include "commands/imagelib/effects/kpEffectBalanceCommand.h"
+#include "pixmapfx/kpPixmapFX.h"
+
+#include <kdebug.h>
+#include <klocale.h>
#include <cmath>
#include <math.h>
@@ -40,14 +47,6 @@
#include <qpushbutton.h>
#include <QSpinBox>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpEffectBalance.h>
-#include <kpEffectBalanceCommand.h>
-#include <kpPixmapFX.h>
-
-
#if DEBUG_KP_EFFECT_BALANCE
#include <qdatetime.h>
#endif
diff --git a/widgets/imagelib/effects/kpEffectBalanceWidget.h b/widgets/imagelib/effects/kpEffectBalanceWidget.h
index c4152a7..d8c7054 100644
--- a/widgets/imagelib/effects/kpEffectBalanceWidget.h
+++ b/widgets/imagelib/effects/kpEffectBalanceWidget.h
@@ -31,8 +31,8 @@
#include <QSpinBox>
-#include <kpEffectWidgetBase.h>
-#include <kpImage.h>
+#include "kpEffectWidgetBase.h"
+#include "imagelib/kpImage.h"
class QLabel;
diff --git a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
index c507e26..297ed00 100644
--- a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
@@ -29,16 +29,16 @@
#define DEBUG_KP_EFFECT_BLUR_SHARPEN 0
-#include <kpEffectBlurSharpenWidget.h>
+#include "kpEffectBlurSharpenWidget.h"
-#include <qgridlayout.h>
-#include <qlabel.h>
-#include <QSpinBox>
+#include "commands/imagelib/effects/kpEffectBlurSharpenCommand.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpEffectBlurSharpenCommand.h>
+#include <qgridlayout.h>
+#include <qlabel.h>
+#include <QSpinBox>
kpEffectBlurSharpenWidget::kpEffectBlurSharpenWidget (bool actOnSelection,
diff --git a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
index 6a01e42..4e19d34 100644
--- a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
+++ b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
@@ -31,10 +31,10 @@
#include <QSpinBox>
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
-#include <kpEffectWidgetBase.h>
-#include <kpEffectBlurSharpen.h>
+#include "kpEffectWidgetBase.h"
+#include "imagelib/effects/kpEffectBlurSharpen.h"
class QLabel;
diff --git a/widgets/imagelib/effects/kpEffectEmbossWidget.cpp b/widgets/imagelib/effects/kpEffectEmbossWidget.cpp
index 4b594c9..efcfff6 100644
--- a/widgets/imagelib/effects/kpEffectEmbossWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectEmbossWidget.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_EFFECT_EMBOSS 0
-#include <kpEffectEmbossWidget.h>
+#include "kpEffectEmbossWidget.h"
#include <qcheckbox.h>
#include <qgridlayout.h>
@@ -37,8 +37,8 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpEffectEmboss.h>
-#include <kpEffectEmbossCommand.h>
+#include "imagelib/effects/kpEffectEmboss.h"
+#include "commands/imagelib/effects/kpEffectEmbossCommand.h"
kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection,
diff --git a/widgets/imagelib/effects/kpEffectEmbossWidget.h b/widgets/imagelib/effects/kpEffectEmbossWidget.h
index d00eede..b8870f3 100644
--- a/widgets/imagelib/effects/kpEffectEmbossWidget.h
+++ b/widgets/imagelib/effects/kpEffectEmbossWidget.h
@@ -30,8 +30,8 @@
#define kpEffectEmbossWidget_H
-#include <kpColor.h>
-#include <kpEffectWidgetBase.h>
+#include "imagelib/kpColor.h"
+#include "kpEffectWidgetBase.h"
class QCheckBox;
diff --git a/widgets/imagelib/effects/kpEffectFlattenWidget.cpp b/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
index 4180dc3..0a76645 100644
--- a/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
@@ -29,10 +29,11 @@
#define DEBUG_KP_EFFECT_FLATTEN 0
-#include <kpEffectFlattenWidget.h>
+#include "kpEffectFlattenWidget.h"
-#include <qcheckbox.h>
-#include <qlayout.h>
+#include "kpDefs.h"
+#include "imagelib/effects/kpEffectFlatten.h"
+#include "commands/imagelib/effects/kpEffectFlattenCommand.h"
#include <kcolorbutton.h>
#include <kconfig.h>
@@ -40,9 +41,8 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpDefs.h>
-#include <kpEffectFlatten.h>
-#include <kpEffectFlattenCommand.h>
+#include <qcheckbox.h>
+#include <qlayout.h>
// public static
diff --git a/widgets/imagelib/effects/kpEffectFlattenWidget.h b/widgets/imagelib/effects/kpEffectFlattenWidget.h
index 4fa29c5..d5fb869 100644
--- a/widgets/imagelib/effects/kpEffectFlattenWidget.h
+++ b/widgets/imagelib/effects/kpEffectFlattenWidget.h
@@ -32,7 +32,7 @@
#include <qcolor.h>
-#include <kpEffectWidgetBase.h>
+#include "kpEffectWidgetBase.h"
class QCheckBox;
diff --git a/widgets/imagelib/effects/kpEffectHSVWidget.cpp b/widgets/imagelib/effects/kpEffectHSVWidget.cpp
index 58cf998..a5cb233 100644
--- a/widgets/imagelib/effects/kpEffectHSVWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectHSVWidget.cpp
@@ -26,7 +26,7 @@
*/
-#include <kpEffectHSVWidget.h>
+#include "kpEffectHSVWidget.h"
#include <qgridlayout.h>
#include <qlabel.h>
@@ -35,8 +35,8 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpEffectHSV.h>
-#include <kpEffectHSVCommand.h>
+#include "imagelib/effects/kpEffectHSV.h"
+#include "commands/imagelib/effects/kpEffectHSVCommand.h"
kpEffectHSVWidget::kpEffectHSVWidget (bool actOnSelection, QWidget *parent)
diff --git a/widgets/imagelib/effects/kpEffectHSVWidget.h b/widgets/imagelib/effects/kpEffectHSVWidget.h
index bf2a028..205054e 100644
--- a/widgets/imagelib/effects/kpEffectHSVWidget.h
+++ b/widgets/imagelib/effects/kpEffectHSVWidget.h
@@ -30,7 +30,7 @@
#define kpEffectHSVWidget_H
-#include <kpEffectWidgetBase.h>
+#include "kpEffectWidgetBase.h"
class QDoubleSpinBox;
diff --git a/widgets/imagelib/effects/kpEffectInvertWidget.cpp b/widgets/imagelib/effects/kpEffectInvertWidget.cpp
index 7de27a4..67ee115 100644
--- a/widgets/imagelib/effects/kpEffectInvertWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectInvertWidget.cpp
@@ -29,19 +29,19 @@
#define DEBUG_KP_EFFECT_INVERT 0
-#include <kpEffectInvertWidget.h>
+#include "kpEffectInvertWidget.h"
-#include <qcheckbox.h>
-#include <qimage.h>
-#include <qlayout.h>
-#include <qpixmap.h>
+#include "imagelib/effects/kpEffectInvert.h"
+#include "commands/imagelib/effects/kpEffectInvertCommand.h"
+#include "pixmapfx/kpPixmapFX.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpEffectInvert.h>
-#include <kpEffectInvertCommand.h>
-#include <kpPixmapFX.h>
+#include <qcheckbox.h>
+#include <qimage.h>
+#include <qlayout.h>
+#include <qpixmap.h>
kpEffectInvertWidget::kpEffectInvertWidget (bool actOnSelection,
diff --git a/widgets/imagelib/effects/kpEffectInvertWidget.h b/widgets/imagelib/effects/kpEffectInvertWidget.h
index df18a12..40195f3 100644
--- a/widgets/imagelib/effects/kpEffectInvertWidget.h
+++ b/widgets/imagelib/effects/kpEffectInvertWidget.h
@@ -30,7 +30,7 @@
#define kpEffectInvertWidget_H
-#include <kpEffectWidgetBase.h>
+#include "kpEffectWidgetBase.h"
class QCheckBox;
diff --git a/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp b/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
index 642de2f..03da522 100644
--- a/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
@@ -29,7 +29,14 @@
#define DEBUG_KP_EFFECT_REDUCE_COLORS 0
-#include <kpEffectReduceColorsWidget.h>
+#include "kpEffectReduceColorsWidget.h"
+
+#include "imagelib/effects/kpEffectReduceColors.h"
+#include "commands/imagelib/effects/kpEffectReduceColorsCommand.h"
+#include "pixmapfx/kpPixmapFX.h"
+
+#include <kdebug.h>
+#include <klocale.h>
#include <qbitmap.h>
#include <qbuttongroup.h>
@@ -39,13 +46,6 @@
#include <qpixmap.h>
#include <qradiobutton.h>
-#include <kdebug.h>
-#include <klocale.h>
-
-#include <kpEffectReduceColors.h>
-#include <kpEffectReduceColorsCommand.h>
-#include <kpPixmapFX.h>
-
kpEffectReduceColorsWidget::kpEffectReduceColorsWidget (bool actOnSelection,
QWidget *parent)
diff --git a/widgets/imagelib/effects/kpEffectReduceColorsWidget.h b/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
index 02597dd..56776a7 100644
--- a/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
+++ b/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
@@ -30,7 +30,7 @@
#define kpEffectReduceColorsWidget_H
-#include <kpEffectWidgetBase.h>
+#include "kpEffectWidgetBase.h"
class QRadioButton;
diff --git a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp
index 15400b8..d1dc7a7 100644
--- a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp
@@ -27,7 +27,11 @@
*/
-#include <kpEffectToneEnhanceWidget.h>
+#include "kpEffectToneEnhanceWidget.h"
+
+#include "imagelib/effects/kpEffectToneEnhance.h"
+#include "commands/imagelib/effects/kpEffectToneEnhanceCommand.h"
+#include "pixmapfx/kpPixmapFX.h"
#include <QGridLayout>
#include <QLabel>
@@ -35,10 +39,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpEffectToneEnhance.h>
-#include <kpEffectToneEnhanceCommand.h>
-#include <kpPixmapFX.h>
-
kpEffectToneEnhanceWidget::kpEffectToneEnhanceWidget (bool actOnSelection,
QWidget *parent)
diff --git a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.h b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.h
index 08e70f2..ed126ad 100644
--- a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.h
+++ b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.h
@@ -31,7 +31,7 @@
#define kpEffectToneEnhanceWidget_H
-#include <kpEffectWidgetBase.h>
+#include "kpEffectWidgetBase.h"
#include <QDoubleSpinBox>
diff --git a/widgets/imagelib/effects/kpEffectWidgetBase.cpp b/widgets/imagelib/effects/kpEffectWidgetBase.cpp
index a65f080..ae0a0d6 100644
--- a/widgets/imagelib/effects/kpEffectWidgetBase.cpp
+++ b/widgets/imagelib/effects/kpEffectWidgetBase.cpp
@@ -26,7 +26,7 @@
*/
-#include <kpEffectWidgetBase.h>
+#include "kpEffectWidgetBase.h"
kpEffectWidgetBase::kpEffectWidgetBase (bool actOnSelection,
diff --git a/widgets/imagelib/effects/kpEffectWidgetBase.h b/widgets/imagelib/effects/kpEffectWidgetBase.h
index 9bd2b3e..710839c 100644
--- a/widgets/imagelib/effects/kpEffectWidgetBase.h
+++ b/widgets/imagelib/effects/kpEffectWidgetBase.h
@@ -32,7 +32,7 @@
#include <qwidget.h>
-#include <kpImage.h>
+#include "imagelib/kpImage.h"
class kpCommandEnvironment;
diff --git a/widgets/kpColorCells.cpp b/widgets/kpColorCells.cpp
index 1761771..9e8d54f 100644
--- a/widgets/kpColorCells.cpp
+++ b/widgets/kpColorCells.cpp
@@ -29,19 +29,19 @@
#define DEBUG_KP_COLOR_CELLS 0
-#include <kpColorCells.h>
+#include "widgets/kpColorCells.h"
-#include <QColorDialog>
-#include <QContextMenuEvent>
-#include <QMouseEvent>
-#include <QScrollBar>
+#include "imagelib/kpColor.h"
+#include "lgpl/generic/kpColorCollection.h"
+#include "widgets/kpDefaultColorCollection.h"
#include <KDebug>
#include <KLocalizedString>
-#include <kpColor.h>
-#include <kpColorCollection.h>
-#include <kpDefaultColorCollection.h>
+#include <QColorDialog>
+#include <QContextMenuEvent>
+#include <QMouseEvent>
+#include <QScrollBar>
//---------------------------------------------------------------------
//
diff --git a/widgets/kpColorCells.h b/widgets/kpColorCells.h
index 00f7ab7..43f8412 100644
--- a/widgets/kpColorCells.h
+++ b/widgets/kpColorCells.h
@@ -32,7 +32,7 @@
#include <QUrl>
-#include <kpColorCellsBase.h>
+#include "lgpl/generic/widgets/kpColorCellsBase.h"
class QDropEvent;
diff --git a/widgets/kpColorPalette.cpp b/widgets/kpColorPalette.cpp
index b91039c..335f58b 100644
--- a/widgets/kpColorPalette.cpp
+++ b/widgets/kpColorPalette.cpp
@@ -29,12 +29,12 @@
#define DEBUG_KP_COLOR_PALETTE 0
-#include <kpColorPalette.h>
+#include "kpColorPalette.h"
-#include <QBoxLayout>
+#include "kpColorCells.h"
+#include "kpTransparentColorCell.h"
-#include <kpColorCells.h>
-#include <kpTransparentColorCell.h>
+#include <QBoxLayout>
//---------------------------------------------------------------------
diff --git a/widgets/kpDefaultColorCollection.cpp b/widgets/kpDefaultColorCollection.cpp
index 2548710..66612e1 100644
--- a/widgets/kpDefaultColorCollection.cpp
+++ b/widgets/kpDefaultColorCollection.cpp
@@ -26,9 +26,9 @@
*/
-#include <kpDefaultColorCollection.h>
+#include "kpDefaultColorCollection.h"
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
kpDefaultColorCollection::kpDefaultColorCollection ()
diff --git a/widgets/kpDefaultColorCollection.h b/widgets/kpDefaultColorCollection.h
index d34704d..cfda1cd 100644
--- a/widgets/kpDefaultColorCollection.h
+++ b/widgets/kpDefaultColorCollection.h
@@ -30,7 +30,7 @@
#define kpDefaultColorCollection_H
-#include <kpColorCollection.h>
+#include "lgpl/generic/kpColorCollection.h"
//
diff --git a/widgets/kpDocumentSaveOptionsWidget.cpp b/widgets/kpDocumentSaveOptionsWidget.cpp
index 6b20446..428b044 100644
--- a/widgets/kpDocumentSaveOptionsWidget.cpp
+++ b/widgets/kpDocumentSaveOptionsWidget.cpp
@@ -28,7 +28,20 @@
#define DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET 0
-#include <kpDocumentSaveOptionsWidget.h>
+#include "widgets/kpDocumentSaveOptionsWidget.h"
+
+#include "kpDefs.h"
+#include "document/kpDocument.h"
+#include "dialogs/kpDocumentSaveOptionsPreviewDialog.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "generic/widgets/kpResizeSignallingLabel.h"
+#include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"
+#include "generic/kpWidgetMapper.h"
+
+#include <kconfig.h>
+#include <kdebug.h>
+#include <klocale.h>
+#include <kconfiggroup.h>
#include <qapplication.h>
#include <qboxlayout.h>
@@ -42,19 +55,6 @@
#include <qpushbutton.h>
#include <qtimer.h>
-#include <kconfig.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kconfiggroup.h>
-
-#include <kpDefs.h>
-#include <kpDocument.h>
-#include <kpDocumentSaveOptionsPreviewDialog.h>
-#include <kpPixmapFX.h>
-#include <kpResizeSignallingLabel.h>
-#include <kpTransformPreviewDialog.h>
-#include <kpWidgetMapper.h>
-
kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget (
const QImage &docPixmap,
diff --git a/widgets/kpDocumentSaveOptionsWidget.h b/widgets/kpDocumentSaveOptionsWidget.h
index c47928c..d917356 100644
--- a/widgets/kpDocumentSaveOptionsWidget.h
+++ b/widgets/kpDocumentSaveOptionsWidget.h
@@ -35,8 +35,8 @@
#include <qwidget.h>
#include <QDoubleSpinBox>
-#include <kpDocumentMetaInfo.h>
-#include <kpDocumentSaveOptions.h>
+#include "imagelib/kpDocumentMetaInfo.h"
+#include "document/kpDocumentSaveOptions.h"
class QComboBox;
diff --git a/widgets/kpDualColorButton.cpp b/widgets/kpDualColorButton.cpp
index d235de2..e6d6ee0 100644
--- a/widgets/kpDualColorButton.cpp
+++ b/widgets/kpDualColorButton.cpp
@@ -29,7 +29,13 @@
#define DEBUG_KP_DUAL_COLOR_BUTTON 0
-#include <kpDualColorButton.h>
+#include "kpDualColorButton.h"
+
+#include "views/kpView.h"
+
+#include <KColorMimeData>
+#include <KDebug>
+#include <KIconLoader>
#include <QApplication>
#include <QBitmap>
@@ -39,12 +45,6 @@
#include <QPainter>
#include <qdrawutil.h>
-#include <KColorMimeData>
-#include <KDebug>
-#include <KIconLoader>
-
-#include <kpView.h>
-
//---------------------------------------------------------------------
kpDualColorButton::kpDualColorButton (QWidget *parent)
diff --git a/widgets/kpDualColorButton.h b/widgets/kpDualColorButton.h
index 6500065..73441ef 100644
--- a/widgets/kpDualColorButton.h
+++ b/widgets/kpDualColorButton.h
@@ -32,7 +32,7 @@
#include <qframe.h>
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
class kpDualColorButton : public QFrame
diff --git a/widgets/kpPrintDialogPage.cpp b/widgets/kpPrintDialogPage.cpp
index f6bb977..2bd8699 100644
--- a/widgets/kpPrintDialogPage.cpp
+++ b/widgets/kpPrintDialogPage.cpp
@@ -30,7 +30,7 @@
#define DEBUG_KP_PRINT_DIALOG_PAGE 0
-#include <kpPrintDialogPage.h>
+#include "kpPrintDialogPage.h"
#include <QRadioButton>
#include <QVBoxLayout>
@@ -39,7 +39,7 @@
#include <KDebug>
#include <KLocalizedString>
-#include <kpDefs.h>
+#include "kpDefs.h"
struct kpPrintDialogPagePrivate
diff --git a/widgets/kpTransparentColorCell.cpp b/widgets/kpTransparentColorCell.cpp
index 35ef75e..7200dc7 100644
--- a/widgets/kpTransparentColorCell.cpp
+++ b/widgets/kpTransparentColorCell.cpp
@@ -29,16 +29,16 @@
#define DEBUG_KP_TRANSPARENT_COLOR_CELL 0
-#include <kpTransparentColorCell.h>
+#include "kpTransparentColorCell.h"
-#include <QContextMenuEvent>
-#include <QMouseEvent>
-#include <QPainter>
+#include "imagelib/kpColor.h"
#include <KIconLoader>
#include <KLocalizedString>
-#include <kpColor.h>
+#include <QContextMenuEvent>
+#include <QMouseEvent>
+#include <QPainter>
//---------------------------------------------------------------------
diff --git a/widgets/toolbars/kpColorToolBar.cpp b/widgets/toolbars/kpColorToolBar.cpp
index 9d0a0f5..63717b4 100644
--- a/widgets/toolbars/kpColorToolBar.cpp
+++ b/widgets/toolbars/kpColorToolBar.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_COLOR_TOOL_BAR 0
-#include <kpColorToolBar.h>
+#include "widgets/toolbars/kpColorToolBar.h"
#include <QBoxLayout>
#include <QDragEnterEvent>
@@ -39,12 +39,12 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpColorCells.h>
-#include <kpColorPalette.h>
-#include <kpColorSimilarityToolBarItem.h>
-#include <kpDefs.h>
-#include <kpDualColorButton.h>
-#include <kpUrlFormatter.h>
+#include "widgets/kpColorCells.h"
+#include "widgets/kpColorPalette.h"
+#include "widgets/colorSimilarity/kpColorSimilarityToolBarItem.h"
+#include "kpDefs.h"
+#include "widgets/kpDualColorButton.h"
+#include "lgpl/generic/kpUrlFormatter.h"
//---------------------------------------------------------------------
diff --git a/widgets/toolbars/kpColorToolBar.h b/widgets/toolbars/kpColorToolBar.h
index e36abf6..a4ae062 100644
--- a/widgets/toolbars/kpColorToolBar.h
+++ b/widgets/toolbars/kpColorToolBar.h
@@ -34,7 +34,7 @@
#include <qframe.h>
#include <qwidget.h>
-#include <kpColor.h>
+#include "imagelib/kpColor.h"
class QBoxLayout;
diff --git a/widgets/toolbars/kpToolToolBar.cpp b/widgets/toolbars/kpToolToolBar.cpp
index 2ac4d76..cb15e7d 100644
--- a/widgets/toolbars/kpToolToolBar.cpp
+++ b/widgets/toolbars/kpToolToolBar.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TOOL_TOOL_BAR 0
-#include <kpToolToolBar.h>
+#include "widgets/toolbars/kpToolToolBar.h"
#include <qboxlayout.h>
#include <qgridlayout.h>
@@ -39,15 +39,15 @@
#include <kdebug.h>
-#include <kpDefs.h>
-#include <kpTool.h>
-#include <kpToolAction.h>
-#include <kpToolWidgetBrush.h>
-#include <kpToolWidgetEraserSize.h>
-#include <kpToolWidgetFillStyle.h>
-#include <kpToolWidgetLineWidth.h>
-#include <kpToolWidgetOpaqueOrTransparent.h>
-#include <kpToolWidgetSpraycanSize.h>
+#include "kpDefs.h"
+#include "tools/kpTool.h"
+#include "tools/kpToolAction.h"
+#include "widgets/toolbars/options/kpToolWidgetBrush.h"
+#include "widgets/toolbars/options/kpToolWidgetEraserSize.h"
+#include "widgets/toolbars/options/kpToolWidgetFillStyle.h"
+#include "widgets/toolbars/options/kpToolWidgetLineWidth.h"
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
+#include "widgets/toolbars/options/kpToolWidgetSpraycanSize.h"
//---------------------------------------------------------------------
diff --git a/widgets/toolbars/options/kpToolWidgetBase.cpp b/widgets/toolbars/options/kpToolWidgetBase.cpp
index 99fc1ac..40ac30e 100644
--- a/widgets/toolbars/options/kpToolWidgetBase.cpp
+++ b/widgets/toolbars/options/kpToolWidgetBase.cpp
@@ -29,7 +29,14 @@
#define DEBUG_KP_TOOL_WIDGET_BASE 0
-#include <kpToolWidgetBase.h>
+#include "kpToolWidgetBase.h"
+
+#include "kpDefs.h"
+
+#include <kapplication.h>
+#include <kconfig.h>
+#include <kconfiggroup.h>
+#include <kdebug.h>
#include <qbitmap.h>
#include <qcolor.h>
@@ -40,13 +47,6 @@
#include <qpixmap.h>
#include <QToolTip>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kconfiggroup.h>
-#include <kdebug.h>
-
-#include <kpDefs.h>
-
//---------------------------------------------------------------------
diff --git a/widgets/toolbars/options/kpToolWidgetBrush.cpp b/widgets/toolbars/options/kpToolWidgetBrush.cpp
index 4ecf559..5d49be7 100644
--- a/widgets/toolbars/options/kpToolWidgetBrush.cpp
+++ b/widgets/toolbars/options/kpToolWidgetBrush.cpp
@@ -29,7 +29,7 @@
#define DEBUG_KP_TOOL_WIDGET_BRUSH 0
-#include <kpToolWidgetBrush.h>
+#include "widgets/toolbars/options/kpToolWidgetBrush.h"
#include <qpainter.h>
#include <qpixmap.h>
@@ -37,7 +37,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpDefs.h>
+#include "kpDefs.h"
//---------------------------------------------------------------------
diff --git a/widgets/toolbars/options/kpToolWidgetBrush.h b/widgets/toolbars/options/kpToolWidgetBrush.h
index 1ab6394..2df6e31 100644
--- a/widgets/toolbars/options/kpToolWidgetBrush.h
+++ b/widgets/toolbars/options/kpToolWidgetBrush.h
@@ -29,13 +29,12 @@
#ifndef KP_TOOL_WIDGET_BRUSH_H
#define KP_TOOL_WIDGET_BRUSH_H
+#include "kpToolWidgetBase.h"
+#include "imagelib/kpColor.h"
+#include "layers/tempImage/kpTempImage.h"
#include <qpixmap.h>
-#include <kpColor.h>
-#include <kpTempImage.h>
-#include <kpToolWidgetBase.h>
-
class kpToolWidgetBrush : public kpToolWidgetBase
{
diff --git a/widgets/toolbars/options/kpToolWidgetEraserSize.cpp b/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
index dfadef8..0e9e98b 100644
--- a/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
+++ b/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
@@ -29,19 +29,19 @@
#define DEBUG_KP_TOOL_WIDGET_ERASER_SIZE 0
-#include <kpToolWidgetEraserSize.h>
+#include "kpToolWidgetEraserSize.h"
-#include <qbitmap.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include "imagelib/kpColor.h"
+#include "imagelib/kpPainter.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kpColor.h>
-#include <kpPainter.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
+#include <qbitmap.h>
+#include <qpainter.h>
+#include <qpixmap.h>
static int EraserSizes [] = {2, 3, 5, 9, 17, 29};
diff --git a/widgets/toolbars/options/kpToolWidgetEraserSize.h b/widgets/toolbars/options/kpToolWidgetEraserSize.h
index df8f220..40d2baa 100644
--- a/widgets/toolbars/options/kpToolWidgetEraserSize.h
+++ b/widgets/toolbars/options/kpToolWidgetEraserSize.h
@@ -29,13 +29,12 @@
#ifndef KP_TOOL_WIDGET_ERASER_SIZE_H
#define KP_TOOL_WIDGET_ERASER_SIZE_H
+#include "kpToolWidgetBase.h"
+#include "imagelib/kpColor.h"
+#include "layers/tempImage/kpTempImage.h"
#include <qpixmap.h>
-#include <kpColor.h>
-#include <kpTempImage.h>
-#include <kpToolWidgetBase.h>
-
class kpColor;
diff --git a/widgets/toolbars/options/kpToolWidgetFillStyle.cpp b/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
index 0eca414..0c2f135 100644
--- a/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
+++ b/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
@@ -29,18 +29,18 @@
#define DEBUG_KP_TOOL_WIDGET_FILL_STYLE 0
-#include <kpToolWidgetFillStyle.h>
+#include "kpToolWidgetFillStyle.h"
-#include <qbrush.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include "imagelib/kpColor.h"
+#include "kpDefs.h"
+#include "pixmapfx/kpPixmapFX.h"
+#include "tools/kpTool.h"
#include <kdebug.h>
-#include <kpColor.h>
-#include <kpDefs.h>
-#include <kpPixmapFX.h>
-#include <kpTool.h>
+#include <qbrush.h>
+#include <qpainter.h>
+#include <qpixmap.h>
//---------------------------------------------------------------------
diff --git a/widgets/toolbars/options/kpToolWidgetFillStyle.h b/widgets/toolbars/options/kpToolWidgetFillStyle.h
index 3238d68..0987e26 100644
--- a/widgets/toolbars/options/kpToolWidgetFillStyle.h
+++ b/widgets/toolbars/options/kpToolWidgetFillStyle.h
@@ -30,7 +30,7 @@
#define KP_TOOL_WIDGET_FILL_STYLE_H
-#include <kpToolWidgetBase.h>
+#include "kpToolWidgetBase.h"
class QBrush;
diff --git a/widgets/toolbars/options/kpToolWidgetLineWidth.cpp b/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
index b356b75..85cfa34 100644
--- a/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
+++ b/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
@@ -26,16 +26,16 @@
*/
-#include <kpToolWidgetLineWidth.h>
+#include "widgets/toolbars/options/kpToolWidgetLineWidth.h"
-#include <qbitmap.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include "imagelib/kpColor.h"
+#include "pixmapfx/kpPixmapFX.h"
#include <klocale.h>
-#include <kpColor.h>
-#include <kpPixmapFX.h>
+#include <qbitmap.h>
+#include <qpainter.h>
+#include <qpixmap.h>
static int lineWidths [] = {1, 2, 3, 5, 8};
diff --git a/widgets/toolbars/options/kpToolWidgetLineWidth.h b/widgets/toolbars/options/kpToolWidgetLineWidth.h
index 14398b3..a5b9e11 100644
--- a/widgets/toolbars/options/kpToolWidgetLineWidth.h
+++ b/widgets/toolbars/options/kpToolWidgetLineWidth.h
@@ -30,7 +30,7 @@
#define KP_TOOL_WIDGET_LINE_WIDTH_H
-#include <kpToolWidgetBase.h>
+#include "kpToolWidgetBase.h"
class kpToolWidgetLineWidth : public kpToolWidgetBase
diff --git a/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp b/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp
index a05e638..dd9220f 100644
--- a/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp
+++ b/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp
@@ -28,7 +28,7 @@
#define DEBUG_KP_TOOL_WIDGET_OPAQUE_OR_TRANSPARENT 0
-#include <kpToolWidgetOpaqueOrTransparent.h>
+#include "widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h"
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h b/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h
index bca63f9..7b2c318 100644
--- a/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h
+++ b/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h
@@ -30,7 +30,7 @@
#define KP_TOOL_WIDGET_OPAQUE_OR_TRANSPARENT_H
-#include <kpToolWidgetBase.h>
+#include "kpToolWidgetBase.h"
class kpToolWidgetOpaqueOrTransparent : public kpToolWidgetBase
diff --git a/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp b/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
index 1f4f792..1b7fd73 100644
--- a/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
+++ b/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
@@ -29,18 +29,18 @@
#define DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE 0
-#include <kpToolWidgetSpraycanSize.h>
+#include "kpToolWidgetSpraycanSize.h"
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include "pixmapfx/kpPixmapFX.h"
#include <kdebug.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <kpPixmapFX.h>
+#include <qbitmap.h>
+#include <qimage.h>
+#include <qpainter.h>
+#include <qpixmap.h>
static int spraycanSizes [] = {9, 17, 29};
diff --git a/widgets/toolbars/options/kpToolWidgetSpraycanSize.h b/widgets/toolbars/options/kpToolWidgetSpraycanSize.h
index b604efb..f9de91b 100644
--- a/widgets/toolbars/options/kpToolWidgetSpraycanSize.h
+++ b/widgets/toolbars/options/kpToolWidgetSpraycanSize.h
@@ -30,7 +30,7 @@
#define KP_TOOL_WIDGET_SPRAYCAN_SIZE_H
-#include <kpToolWidgetBase.h>
+#include "kpToolWidgetBase.h"
class kpToolWidgetSpraycanSize : public kpToolWidgetBase