PixelPaint: Move Tools to it's own subdirectory

The PixelPaint source directory was getting a bit large, let's move all
the Tools to it's own subdirectory. Also remove some unused includes.

Userland/Applications/PixelPaint/CMakeLists.txt

@@ -9,39 +9,39 @@ compile_gml(PixelPaintWindow.gml PixelPaintWindowGML.h pixel_paint_window_gml)
 compile_gml(EditGuideDialog.gml EditGuideDialogGML.h edit_guide_dialog_gml)
 
 set(SOURCES
-    BrushTool.cpp
-    BucketTool.cpp
-    CloneTool.cpp
     CreateNewImageDialog.cpp
     CreateNewLayerDialog.cpp
     EditGuideDialog.cpp
     EditGuideDialogGML.h
-    EllipseTool.cpp
-    EraseTool.cpp
-    GuideTool.cpp
     Image.cpp
     ImageEditor.cpp
     Layer.cpp
     LayerListWidget.cpp
     LayerPropertiesWidget.cpp
-    LineTool.cpp
     MainWidget.cpp
-    main.cpp
-    MoveTool.cpp
+    Mask.cpp
     PaletteWidget.cpp
-    PenTool.cpp
-    PickerTool.cpp
     PixelPaintWindowGML.h
     ProjectLoader.cpp
-    RectangleTool.cpp
-    RectangleSelectTool.cpp
-    Mask.cpp
     Selection.cpp
-    SprayTool.cpp
-    ToolboxWidget.cpp
     ToolPropertiesWidget.cpp
-    Tool.cpp
-    ZoomTool.cpp
+    ToolboxWidget.cpp
+    Tools/BrushTool.cpp
+    Tools/BucketTool.cpp
+    Tools/CloneTool.cpp
+    Tools/EllipseTool.cpp
+    Tools/EraseTool.cpp
+    Tools/GuideTool.cpp
+    Tools/LineTool.cpp
+    Tools/MoveTool.cpp
+    Tools/PenTool.cpp
+    Tools/PickerTool.cpp
+    Tools/RectangleSelectTool.cpp
+    Tools/RectangleTool.cpp
+    Tools/SprayTool.cpp
+    Tools/Tool.cpp
+    Tools/ZoomTool.cpp
+    main.cpp
     )
 
 serenity_app(PixelPaint ICON app-pixel-paint)

Userland/Applications/PixelPaint/ImageEditor.cpp

@@ -10,8 +10,8 @@
 #include "ImageEditor.h"
 #include "Image.h"
 #include "Layer.h"
-#include "MoveTool.h"
-#include "Tool.h"
+#include "Tools/MoveTool.h"
+#include "Tools/Tool.h"
 #include <LibConfig/Client.h>
 #include <LibGUI/Command.h>
 #include <LibGUI/Painter.h>

Userland/Applications/PixelPaint/MainWidget.h

@@ -14,9 +14,9 @@
 #include "LayerPropertiesWidget.h"
 #include "PaletteWidget.h"
 #include "ProjectLoader.h"
-#include "Tool.h"
 #include "ToolPropertiesWidget.h"
 #include "ToolboxWidget.h"
+#include "Tools/Tool.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/Forward.h>
 #include <LibGUI/Statusbar.h>

Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp

@@ -5,7 +5,7 @@
  */
 
 #include "ToolPropertiesWidget.h"
-#include "Tool.h"
+#include "Tools/Tool.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/GroupBox.h>
 

Userland/Applications/PixelPaint/ToolboxWidget.cpp

@@ -5,20 +5,20 @@
  */
 
 #include "ToolboxWidget.h"
-#include "BrushTool.h"
-#include "BucketTool.h"
-#include "CloneTool.h"
-#include "EllipseTool.h"
-#include "EraseTool.h"
-#include "GuideTool.h"
-#include "LineTool.h"
-#include "MoveTool.h"
-#include "PenTool.h"
-#include "PickerTool.h"
-#include "RectangleSelectTool.h"
-#include "RectangleTool.h"
-#include "SprayTool.h"
-#include "ZoomTool.h"
+#include "Tools/BrushTool.h"
+#include "Tools/BucketTool.h"
+#include "Tools/CloneTool.h"
+#include "Tools/EllipseTool.h"
+#include "Tools/EraseTool.h"
+#include "Tools/GuideTool.h"
+#include "Tools/LineTool.h"
+#include "Tools/MoveTool.h"
+#include "Tools/PenTool.h"
+#include "Tools/PickerTool.h"
+#include "Tools/RectangleSelectTool.h"
+#include "Tools/RectangleTool.h"
+#include "Tools/SprayTool.h"
+#include "Tools/ZoomTool.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Button.h>

Userland/Applications/PixelPaint/Tools/BrushTool.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "BrushTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>

Userland/Applications/PixelPaint/Tools/BucketTool.cpp

@@ -5,8 +5,8 @@
  */
 
 #include "BucketTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <AK/HashTable.h>
 #include <AK/Queue.h>
 #include <LibGUI/BoxLayout.h>

Userland/Applications/PixelPaint/Tools/CloneTool.cpp

@@ -5,8 +5,8 @@
  */
 
 #include "CloneTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>

Userland/Applications/PixelPaint/Tools/EllipseTool.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "EllipseTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>

Userland/Applications/PixelPaint/Tools/EraseTool.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "EraseTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/CheckBox.h>

Userland/Applications/PixelPaint/Tools/GuideTool.cpp

@@ -5,8 +5,7 @@
  */
 
 #include "GuideTool.h"
-#include "EditGuideDialog.h"
-#include "ImageEditor.h"
+#include "../EditGuideDialog.h"
 #include <LibGUI/Application.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>

Userland/Applications/PixelPaint/Tools/GuideTool.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Guide.h"
+#include "../Guide.h"
 #include "Tool.h"
 #include <AK/RefPtr.h>
 

Userland/Applications/PixelPaint/Tools/LineTool.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "LineTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <AK/Math.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>

Userland/Applications/PixelPaint/Tools/MoveTool.cpp

@@ -5,13 +5,12 @@
  */
 
 #include "MoveTool.h"
-#include "Image.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../Image.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Window.h>
-#include <LibGfx/Bitmap.h>
 
 namespace PixelPaint {
 

Userland/Applications/PixelPaint/Tools/PenTool.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "PenTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>

Userland/Applications/PixelPaint/Tools/PickerTool.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "PickerTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/CheckBox.h>
 

Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp

@@ -5,8 +5,8 @@
  */
 
 #include "RectangleSelectTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Button.h>
 #include <LibGUI/ComboBox.h>

Userland/Applications/PixelPaint/Tools/RectangleSelectTool.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Selection.h"
+#include "../Selection.h"
 #include "Tool.h"
 
 #include <AK/Vector.h>

Userland/Applications/PixelPaint/Tools/RectangleTool.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "RectangleTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>

Userland/Applications/PixelPaint/Tools/SprayTool.cpp

@@ -5,8 +5,8 @@
  */
 
 #include "SprayTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <AK/Math.h>
 #include <AK/Queue.h>
 #include <LibGUI/Action.h>

Userland/Applications/PixelPaint/Tools/Tool.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "Tool.h"
-#include "ImageEditor.h"
+#include "../ImageEditor.h"
 #include <LibGUI/Action.h>
 
 namespace PixelPaint {

Userland/Applications/PixelPaint/Tools/ZoomTool.cpp

@@ -5,7 +5,7 @@
  */
 
 #include "ZoomTool.h"
-#include "ImageEditor.h"
+#include "../ImageEditor.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/ValueSlider.h>