creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-16 05:10:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
AshBastian
2020-01-09 00:52:17 +01:00
parent d774461b26
commit 8b1fd5c3f0
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Image/IntelliImage.h
View File

@@ -8,11 +8,8 @@
#include <QWidget> #include <QWidget>
#include <vector> #include <vector>
<<<<<<< src/Image/IntelliImage.h
#include "IntelliHelper/IntelliRenderSettings.h" #include "IntelliHelper/IntelliRenderSettings.h"
=======
#include "IntelliHelper/IntelliTriangulation.h" #include "IntelliHelper/IntelliTriangulation.h"
>>>>>>> src/Image/IntelliImage.h
class IntelliTool; class IntelliTool;

7
src/IntelliPhoto.pro
View File

@@ -21,12 +21,9 @@ SOURCES += \
Image/IntelliRasterImage.cpp \ Image/IntelliRasterImage.cpp \
Image/IntelliShapedImage.cpp \ Image/IntelliShapedImage.cpp \
IntelliHelper/IntelliColorPicker.cpp \ IntelliHelper/IntelliColorPicker.cpp \
<<<<<<< src/IntelliPhoto.pro
IntelliHelper/IntelliRenderSettings.cpp \ IntelliHelper/IntelliRenderSettings.cpp \
=======
IntelliHelper/IntelliToolsettings.cpp \ IntelliHelper/IntelliToolsettings.cpp \
IntelliHelper/IntelliTriangulation.cpp \ IntelliHelper/IntelliTriangulation.cpp \
>>>>>>> src/IntelliPhoto.pro
Layer/PaintingArea.cpp \ Layer/PaintingArea.cpp \
Tool/IntelliTool.cpp \ Tool/IntelliTool.cpp \
Tool/IntelliToolCircle.cpp \ Tool/IntelliToolCircle.cpp \
@@ -44,13 +41,9 @@ HEADERS += \
Image/IntelliRasterImage.h \ Image/IntelliRasterImage.h \
Image/IntelliShapedImage.h \ Image/IntelliShapedImage.h \
IntelliHelper/IntelliColorPicker.h \ IntelliHelper/IntelliColorPicker.h \
<<<<<<< src/IntelliPhoto.pro
IntelliHelper/IntelliHelper.h \
IntelliHelper/IntelliRenderSettings.h \ IntelliHelper/IntelliRenderSettings.h \
=======
IntelliHelper/IntelliToolsettings.h \ IntelliHelper/IntelliToolsettings.h \
IntelliHelper/IntelliTriangulation.h \ IntelliHelper/IntelliTriangulation.h \
>>>>>>> src/IntelliPhoto.pro
Layer/PaintingArea.h \ Layer/PaintingArea.h \
Tool/IntelliTool.h \ Tool/IntelliTool.h \
Tool/IntelliToolCircle.h \ Tool/IntelliToolCircle.h \

3
src/Layer/PaintingArea.h
View File

@@ -204,10 +204,7 @@ private:
int maxWidth; int maxWidth;
int maxHeight; int maxHeight;
<<<<<<< src/Layer/PaintingArea.h
IntelliRenderSettings renderSettings; IntelliRenderSettings renderSettings;
=======
>>>>>>> src/Layer/PaintingArea.h
IntelliTool* Tool; IntelliTool* Tool;
std::vector<LayerObject> layerBundle; std::vector<LayerObject> layerBundle;