Commit 8b89acd3 authored by Stefano Bonicatti's avatar Stefano Bonicatti

Fix some warnings

QColor accepts only integers in the constructor.

psd_layer_effects_shadow_base is a class not a struct.

Commenting out unused code.
parent c99b3ef3
......@@ -24,7 +24,7 @@
#include "kis_layer_style_filter.h"
#include <kritaimage_export.h>
struct psd_layer_effects_shadow_base;
class psd_layer_effects_shadow_base;
class KRITAIMAGE_EXPORT KisLsDropShadowFilter : public KisLayerStyleFilter
......
......@@ -24,7 +24,7 @@
#include "kis_layer_style_filter.h"
#include <kritaimage_export.h>
struct psd_layer_effects_shadow_base;
class psd_layer_effects_shadow_base;
class KRITAIMAGE_EXPORT KisLsSatinFilter : public KisLayerStyleFilter
......
......@@ -23,7 +23,7 @@
struct psd_layer_effects_context;
struct psd_layer_effects_shadow_base;
class psd_layer_effects_shadow_base;
struct psd_layer_effects_overlay_base;
class KisLayerStyleFilterEnvironment;
class KoPattern;
......
......@@ -1077,12 +1077,13 @@ struct psd_layer_effects_pattern_overlay : public psd_layer_effects_overlay_base
// using psd_layer_effects_overlay_base::patternPhase;
private:
int m_scale;
// These are unused
/*int m_scale;
bool m_alignWithLayer;
KoPattern *m_pattern;
int m_horizontalPhase;
int m_verticalPhase;
int m_verticalPhase;*/
};
struct psd_layer_effects_stroke : public psd_layer_effects_overlay_base
......
......@@ -80,7 +80,7 @@ void KisAslLayerStyleSerializerTest::testReading()
CMP(outerGlow, effectEnabled, true);
CMP(outerGlow, blendMode, COMPOSITE_SCREEN);
CMP(outerGlow, color, QColor(255,255,189.997));
CMP(outerGlow, color, QColor(255, 255, 189));
CMP(outerGlow, opacity, 43);
CMP(outerGlow, spread, 23);
CMP(outerGlow, size, 109);
......@@ -95,7 +95,7 @@ void KisAslLayerStyleSerializerTest::testReading()
CMP(innerGlow, effectEnabled, true);
CMP(innerGlow, blendMode, COMPOSITE_SCREEN);
CMP(innerGlow, color, QColor(255,255,189.997));
CMP(innerGlow, color, QColor(255, 255, 189));
CMP(innerGlow, opacity, 55);
CMP(innerGlow, spread, 21);
CMP(innerGlow, size, 128);
......@@ -144,13 +144,13 @@ void KisAslLayerStyleSerializerTest::testReading()
CMP(stroke, size, 13);
CMP(stroke, fillType, psd_fill_solid_color);
CMP(stroke, position, psd_stroke_outside);
CMP(stroke, color, QColor(210.0, 33.7665, 87.6887));
CMP(stroke, color, QColor(210, 33, 87));
CMP(bevelAndEmboss, effectEnabled, true);
CMP(bevelAndEmboss, highlightBlendMode, COMPOSITE_SCREEN);
CMP(bevelAndEmboss, highlightOpacity, 75);
CMP(bevelAndEmboss, highlightColor, QColor(255.0, 255.0, 255.0));
CMP(bevelAndEmboss, highlightColor, QColor(255, 255, 255));
CMP(bevelAndEmboss, shadowBlendMode, COMPOSITE_MULT);
CMP(bevelAndEmboss, shadowOpacity, 75);
......
......@@ -58,7 +58,7 @@ class QDomDocument;
#if defined(_WIN32) || defined(_WIN64)
#include <KoPageLayout.h>
#else
class KoPageLayout;
struct KoPageLayout;
#endif
class KoVersionInfo
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment