[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [krita] /: Fix a bunch of warnings
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2016-03-24 10:15:58
Message-ID: E1aj2J4-0005Jx-CZ () scm ! kde ! org
[Download RAW message or body]
Git commit 55ca690f8d0279a46008a05674e031b3c09715a1 by Boudewijn Rempt.
Committed on 24/03/2016 at 10:15.
Pushed by rempt into branch 'master'.
Fix a bunch of warnings
M +1 -1 libs/brush/kis_pipebrush_parasite.cpp
M +3 -1 libs/flake/KoPathShape.cpp
M +2 -0 libs/image/kis_signal_compressor.cpp
M +0 -3 libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp
M +3 -0 libs/image/tiles3/swap/kis_memory_window.cpp
M +0 -3 libs/image/tiles3/swap/kis_tile_compressor_2.cpp
M +1 -0 libs/pigment/KoCompositeColorTransformation.cpp
M +1 -0 libs/store/KoLZF.cpp
M +2 -2 libs/ui/canvas/kis_animation_player.cpp
M +2 -2 plugins/color/lcms2engine/colorspaces/gray_f16/GrayF16ColorSpace.cpp
M +0 -3 plugins/extensions/dockers/animation/onion_skins_docker.ui
M +4 -0 plugins/filters/gradientmap/gradientmap.cpp
M +4 -4 plugins/flake/textshape/dialogs/DockerStylesComboModel.cpp
M +1 -1 plugins/flake/textshape/dialogs/StylesModel.cpp
M +2 -2 plugins/impex/csv/csv_layer_record.cpp
M +4 -3 plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
http://commits.kde.org/krita/55ca690f8d0279a46008a05674e031b3c09715a1
diff --git a/libs/brush/kis_pipebrush_parasite.cpp \
b/libs/brush/kis_pipebrush_parasite.cpp index 1ff78d1..6cbaa0e 100644
--- a/libs/brush/kis_pipebrush_parasite.cpp
+++ b/libs/brush/kis_pipebrush_parasite.cpp
@@ -170,7 +170,7 @@ bool KisPipeBrushParasite::saveToDevice(QIODevice* dev) const
return true;
}
-bool loadFromDevice(QIODevice *dev)
+bool loadFromDevice(QIODevice */*dev*/)
{
// XXX: implement...
return true;;
diff --git a/libs/flake/KoPathShape.cpp b/libs/flake/KoPathShape.cpp
index 14c7572..395c2e2 100644
--- a/libs/flake/KoPathShape.cpp
+++ b/libs/flake/KoPathShape.cpp
@@ -51,11 +51,13 @@
#include <FlakeDebug.h>
#include <QPainter>
+// qIsNanPoint is only used in asserts
+#ifndef QT_NO_DEBUG
#include <qnumeric.h> // for qIsNaN
static bool qIsNaNPoint(const QPointF &p) {
return qIsNaN(p.x()) || qIsNaN(p.y());
}
-
+#endif
static const qreal DefaultMarkerWidth = 3.0;
KoPathShapePrivate::KoPathShapePrivate(KoPathShape *q)
diff --git a/libs/image/kis_signal_compressor.cpp \
b/libs/image/kis_signal_compressor.cpp index be8c14d..4daacf1 100644
--- a/libs/image/kis_signal_compressor.cpp
+++ b/libs/image/kis_signal_compressor.cpp
@@ -66,6 +66,8 @@ void KisSignalCompressor::start()
if (!m_timer.isActive()) {
m_timer.start();
}
+ case UNDEFINED:
+ ; // Should never happen, but do nothing
};
if (m_mode == POSTPONE || !m_timer.isActive()) {
diff --git a/libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp \
b/libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp index f1eb131..c5614b2 100644
--- a/libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp
+++ b/libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp
@@ -82,11 +82,8 @@ void KisLegacyTileCompressor::compressTileData(KisTileData \
*tileData, {
bytesWritten = 0;
const qint32 tileDataSize = TILE_DATA_SIZE(tileData->pixelSize());
-#ifdef NDEBUG
Q_UNUSED(bufferSize);
-#else
Q_ASSERT(bufferSize >= tileDataSize);
-#endif
memcpy(buffer, tileData->data(), tileDataSize);
bytesWritten += tileDataSize;
}
diff --git a/libs/image/tiles3/swap/kis_memory_window.cpp \
b/libs/image/tiles3/swap/kis_memory_window.cpp index 6a48f2f..5e36690 100644
--- a/libs/image/tiles3/swap/kis_memory_window.cpp
+++ b/libs/image/tiles3/swap/kis_memory_window.cpp
@@ -36,6 +36,9 @@ KisMemoryWindow::KisMemoryWindow(const QString &swapDir, quint64 \
writeWindowSize bool res = m_file.open();
Q_ASSERT(res);
Q_ASSERT(!m_file.fileName().isEmpty());
+ if (!res || m_file.fileName().isEmpty()) {
+ qWarning() << "Could not create or open swapfile";
+ }
}
KisMemoryWindow::~KisMemoryWindow()
diff --git a/libs/image/tiles3/swap/kis_tile_compressor_2.cpp \
b/libs/image/tiles3/swap/kis_tile_compressor_2.cpp index a1e3b90..d66d641 100644
--- a/libs/image/tiles3/swap/kis_tile_compressor_2.cpp
+++ b/libs/image/tiles3/swap/kis_tile_compressor_2.cpp
@@ -118,11 +118,8 @@ void KisTileCompressor2::compressTileData(KisTileData *tileData,
const qint32 tileDataSize = TILE_DATA_SIZE(pixelSize);
qint32 compressedBytes;
-#ifdef NDEBUG
Q_UNUSED(bufferSize);
-#else
Q_ASSERT(bufferSize >= tileDataSize + 1);
-#endif
prepareWorkBuffers(tileDataSize);
diff --git a/libs/pigment/KoCompositeColorTransformation.cpp \
b/libs/pigment/KoCompositeColorTransformation.cpp index d59b96c..24b0a6e 100644
--- a/libs/pigment/KoCompositeColorTransformation.cpp
+++ b/libs/pigment/KoCompositeColorTransformation.cpp
@@ -35,6 +35,7 @@ KoCompositeColorTransformation::KoCompositeColorTransformation(Mode \
mode) : m_d(new Private)
{
Q_ASSERT_X(mode == INPLACE, "KoCompositeColorTransformation", "BUFFERED mode is \
not implemented yet!"); + Q_UNUSED(mode)
}
KoCompositeColorTransformation::~KoCompositeColorTransformation()
diff --git a/libs/store/KoLZF.cpp b/libs/store/KoLZF.cpp
index 42b4a57..95e08f6 100644
--- a/libs/store/KoLZF.cpp
+++ b/libs/store/KoLZF.cpp
@@ -360,6 +360,7 @@ void decompress(const QByteArray& input, QByteArray& output)
} else {
unsigned int len = decompress(in_data, in_len, out_data, out_len);
Q_ASSERT(len == out_len);
+ Q_UNUSED(len)
}
}
diff --git a/libs/ui/canvas/kis_animation_player.cpp \
b/libs/ui/canvas/kis_animation_player.cpp index 0e8ec38..62a774b 100644
--- a/libs/ui/canvas/kis_animation_player.cpp
+++ b/libs/ui/canvas/kis_animation_player.cpp
@@ -106,8 +106,8 @@ public:
};
KisAnimationPlayer::KisAnimationPlayer(KisCanvas2 *canvas)
- : m_d(new Private(this)),
- QObject(canvas)
+ : QObject(canvas)
+ , m_d(new Private(this))
{
m_d->useFastFrameUpload = false;
m_d->playing = false;
diff --git a/plugins/color/lcms2engine/colorspaces/gray_f16/GrayF16ColorSpace.cpp \
b/plugins/color/lcms2engine/colorspaces/gray_f16/GrayF16ColorSpace.cpp index \
bf8ce9f..8a06deb 100644
--- a/plugins/color/lcms2engine/colorspaces/gray_f16/GrayF16ColorSpace.cpp
+++ b/plugins/color/lcms2engine/colorspaces/gray_f16/GrayF16ColorSpace.cpp
@@ -32,7 +32,7 @@ GrayF16ColorSpace::GrayF16ColorSpace(const QString &name, \
KoColorProfile *p) {
const IccColorProfile *icc_p = dynamic_cast<const IccColorProfile *>(p);
Q_ASSERT(icc_p);
-
+ Q_UNUSED(icc_p);
addChannel(new KoChannelInfo(i18n("Gray"), 0 * sizeof(half), 0, \
KoChannelInfo::COLOR, KoChannelInfo::FLOAT16, 2, Qt::gray));
addChannel(new KoChannelInfo(i18n("Alpha"), 1 * sizeof(half), 1, \
KoChannelInfo::ALPHA, KoChannelInfo::FLOAT16, 2));
@@ -86,4 +86,4 @@ QVector <double> GrayF16ColorSpace::fromYUV(qreal *y, qreal *, \
qreal *) const channelValues.fill(*y);
channelValues[1]=1.0;
return channelValues;
-}
\ No newline at end of file
+}
diff --git a/plugins/extensions/dockers/animation/onion_skins_docker.ui \
b/plugins/extensions/dockers/animation/onion_skins_docker.ui index bf23928..e232c23 \
100644
--- a/plugins/extensions/dockers/animation/onion_skins_docker.ui
+++ b/plugins/extensions/dockers/animation/onion_skins_docker.ui
@@ -111,10 +111,7 @@
</layout>
</item>
</layout>
- <zorder></zorder>
- <zorder></zorder>
<zorder>lblPrevColor</zorder>
- <zorder>horizontalSpacer</zorder>
<zorder>btnBackwardColor</zorder>
<zorder>btnForwardColor</zorder>
<zorder>lblNextColor</zorder>
diff --git a/plugins/filters/gradientmap/gradientmap.cpp \
b/plugins/filters/gradientmap/gradientmap.cpp index 29be5b7..37b01d4 100644
--- a/plugins/filters/gradientmap/gradientmap.cpp
+++ b/plugins/filters/gradientmap/gradientmap.cpp
@@ -31,6 +31,7 @@ K_PLUGIN_FACTORY_WITH_JSON(KritaGradientMapFactory, \
"kritagradientmap.json", reg \
KritaGradientMapConfigWidget::KritaGradientMapConfigWidget(QWidget *parent, \
KisPaintDeviceSP dev, Qt::WFlags f) : KisConfigWidget(parent, f)
{
+ Q_UNUSED(dev)
m_page = new WdgGradientMap(this);
QHBoxLayout *l = new QHBoxLayout(this);
Q_CHECK_PTR(l);
@@ -47,6 +48,7 @@ KritaGradientMapConfigWidget::~KritaGradientMapConfigWidget()
void KritaGradientMapConfigWidget::gradientResourceChanged(KoResource* gradient)
{
+ Q_UNUSED(gradient)
}
KritaGradientMapFilterConfiguration* KritaGradientMapConfigWidget::configuration() \
const @@ -69,10 +71,12 @@ void KritaGradientMapConfigWidget::setConfiguration(const \
KisPropertiesConfigura {
const KritaGradientMapFilterConfiguration* cfg = dynamic_cast<const \
KritaGradientMapFilterConfiguration* > (config); Q_ASSERT(cfg);
+ Q_UNUSED(cfg);
}
void KritaGradientMapConfigWidget::setView(KisViewManager *view)
{
+ Q_UNUSED(view)
}
//-----------------------------
diff --git a/plugins/flake/textshape/dialogs/DockerStylesComboModel.cpp \
b/plugins/flake/textshape/dialogs/DockerStylesComboModel.cpp index 8901aed..8085cd9 \
100644
--- a/plugins/flake/textshape/dialogs/DockerStylesComboModel.cpp
+++ b/plugins/flake/textshape/dialogs/DockerStylesComboModel.cpp
@@ -37,7 +37,7 @@ DockerStylesComboModel::DockerStylesComboModel(QObject *parent)
Qt::ItemFlags DockerStylesComboModel::flags(const QModelIndex &index) const
{
- if (index.internalId() == UsedStyleId || index.internalId() == UnusedStyleId) {
+ if (index.internalId() == (quintptr)UsedStyleId || index.internalId() == \
(quintptr)UnusedStyleId) { return (Qt::NoItemFlags);
}
return (Qt::ItemIsEnabled | Qt::ItemIsSelectable);
@@ -66,15 +66,15 @@ QVariant DockerStylesComboModel::data(const QModelIndex &index, \
int role) const
switch (role) {
case AbstractStylesModel::isTitleRole: {
- if (index.internalId() == UsedStyleId || index.internalId() == \
UnusedStyleId) { + if (index.internalId() == (quintptr)UsedStyleId || \
index.internalId() == (quintptr)UnusedStyleId) { return true;
}
}
case Qt::DisplayRole: {
- if (index.internalId() == UsedStyleId) {
+ if (index.internalId() == (quintptr)UsedStyleId) {
return i18n("Used Styles");
}
- if (index.internalId() == UnusedStyleId) {
+ if (index.internalId() == (quintptr)UnusedStyleId) {
return i18n("Unused Styles");
}
return QVariant();
diff --git a/plugins/flake/textshape/dialogs/StylesModel.cpp \
b/plugins/flake/textshape/dialogs/StylesModel.cpp index a7326a9..4572399 100644
--- a/plugins/flake/textshape/dialogs/StylesModel.cpp
+++ b/plugins/flake/textshape/dialogs/StylesModel.cpp
@@ -205,7 +205,7 @@ QImage StylesModel::stylePreview(int row, const QSize &size)
}
} else {
KoCharacterStyle *usedStyle = 0;
- if (index(row).internalId() == NoneStyleId) {
+ if (index(row).internalId() == (quintptr)NoneStyleId) {
usedStyle = static_cast<KoCharacterStyle *>(m_currentParagraphStyle);
if (!usedStyle) {
usedStyle = m_defaultCharacterStyle;
diff --git a/plugins/impex/csv/csv_layer_record.cpp \
b/plugins/impex/csv/csv_layer_record.cpp index bab29d8..5dce282 100644
--- a/plugins/impex/csv/csv_layer_record.cpp
+++ b/plugins/impex/csv/csv_layer_record.cpp
@@ -20,8 +20,8 @@
#include "csv_layer_record.h"
CSVLayerRecord::CSVLayerRecord()
- : channel(0)
- , layer(0)
+ : layer(0)
+ , channel(0)
, last("")
, frame(0)
{
diff --git a/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp \
b/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp index 1a2c80c..f9644b2 100644
--- a/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
+++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
@@ -142,15 +142,16 @@ KisSpacingInformation KisColorSmudgeOp::paintAt(const \
KisPaintInformation& info)
*/
m_dabCache->disableSubpixelPrecision();
}
-
+#if 0
//if precision
KoColor colorSpaceChanger = painter()->paintColor();
const KoColorSpace* preciseColorSpace = colorSpaceChanger.colorSpace();
- /*if (colorSpaceChanger.colorSpace()->colorDepthId().id() == "U8") {
+ if (colorSpaceChanger.colorSpace()->colorDepthId().id() == "U8") {
preciseColorSpace = \
KoColorSpaceRegistry::instance()->colorSpace(colorSpaceChanger.colorSpace()->colorModelId().id(), \
"U16", colorSpaceChanger.profile() ); \
colorSpaceChanger.convertTo(preciseColorSpace); }
- painter()->setPaintColor(colorSpaceChanger);*/
+ painter()->setPaintColor(colorSpaceChanger);
+#endif
// get the scaling factor calculated by the size option
qreal scale = m_sizeOption.apply(info);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic