fix some more compiler warnings

some of the changes are my own

upstream commits:
https://github.com/qtproject/qtsvg/commit/1ce9af6c1c32b20dedc33bd46cde5ee4b34a04c1

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h
index a68a2c6..12bf49f 100644 (file)
--- a/src/opengl/qglframebufferobject_p.h
+++ b/src/opengl/qglframebufferobject_p.h
@@ -123,7 +123,6 @@ public:
 private:
     QGLFramebufferObject* fbo;
     QGLFormat fboFormat;
-    bool wasBound;
     bool reqAlpha;
 };
 

diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
index c34a90c..ed61f7a 100644 (file)
--- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -102,7 +102,6 @@ public:
 protected Q_SLOTS:
     void changeSlave(QAction *);
 private:
-    void *unused;
     int current;
     QList<QInputContext *> slaves;
     QMenu *menu;

diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp
index d3923ac..f52224a 100644 (file)
--- a/src/scripttools/debugging/qscriptdebugger.cpp
+++ b/src/scripttools/debugging/qscriptdebugger.cpp
@@ -1021,7 +1021,7 @@ class SyncBreakpointsJob : public QScriptDebuggerCommandSchedulerJob
 public:
     SyncBreakpointsJob(QScriptDebuggerPrivate *debugger)
         : QScriptDebuggerCommandSchedulerJob(debugger),
-          m_debugger(debugger), m_index(-1) {}
+          m_debugger(debugger) {}
     void start()
     {
         QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
@@ -1044,7 +1044,6 @@ public:
 
 private:
     QScriptDebuggerPrivate *m_debugger;
-    int m_index;
     QList<QScriptContextInfo> m_infos;
 };
 

diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 0747c1a..6e6b696 100644 (file)
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -85,9 +85,8 @@ void QSvgFillStyleProperty::revert(QPainter *, QSvgExtraStates &)
 
 
 QSvgQualityStyle::QSvgQualityStyle(int color)
-    : m_colorRendering(color)
 {
-
+    Q_UNUSED(color);
 }
 void QSvgQualityStyle::apply(QPainter *, const QSvgNode *, QSvgExtraStates &)
 {
@@ -640,10 +639,11 @@ void QSvgStyle::revert(QPainter *p, QSvgExtraStates &states)
 
 QSvgAnimateTransform::QSvgAnimateTransform(int startMs, int endMs, int byMs )
     : QSvgStyleProperty(),
-      m_from(startMs), m_to(endMs), m_by(byMs),
+      m_from(startMs), m_to(endMs),
       m_type(Empty), m_additive(Replace), m_count(0), m_finished(false), m_transformApplied(false)
 {
     m_totalRunningTime = m_to - m_from;
+    Q_UNUSED(byMs);
 }
 
 void QSvgAnimateTransform::setArgs(TransformType type, Additive additive, const QVector<qreal> &args)
@@ -811,10 +811,11 @@ void QSvgAnimateTransform::setRepeatCount(qreal repeatCount)
 
 QSvgAnimateColor::QSvgAnimateColor(int startMs, int endMs, int byMs)
     : QSvgStyleProperty(),
-      m_from(startMs), m_to(endMs), m_by(byMs),
+      m_from(startMs), m_to(endMs),
       m_finished(false)
 {
     m_totalRunningTime = m_to - m_from;
+    Q_UNUSED(byMs);
 }
 
 void QSvgAnimateColor::setArgs(bool fill,

diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index d2418c6..dd8e152 100644 (file)
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -195,7 +195,7 @@ public:
 private:
     // color-render ing v      v       'auto' | 'optimizeSpeed' |
     //                                  'optimizeQuality' | 'inherit'
-    int m_colorRendering;
+    //int m_colorRendering;
 
     // shape-rendering v       v       'auto' | 'optimizeSpeed' | 'crispEdges' |
     //                                  'geometricPrecision' | 'inherit'
@@ -690,7 +690,7 @@ public:
 protected:
     void resolveMatrix(const QSvgNode *node);
 private:
-    qreal m_from, m_to, m_by;
+    qreal m_from, m_to;
     qreal m_totalRunningTime;
     TransformType m_type;
     Additive m_additive;
@@ -716,7 +716,7 @@ public:
     virtual void revert(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
 private:
-    qreal m_from, m_to, m_by;
+    qreal m_from, m_to;
     qreal m_totalRunningTime;
     QList<QColor> m_colors;
     QBrush m_oldBrush;

diff --git a/src/tools/lupdate/cpp.cpp b/src/tools/lupdate/cpp.cpp
index 238e656..b1c7b80 100644 (file)
--- a/src/tools/lupdate/cpp.cpp
+++ b/src/tools/lupdate/cpp.cpp
@@ -311,7 +311,6 @@ private:
     bool yyCodecIsUtf8;
     bool yyForceUtf8;
     QString yyWord;
-    qlonglong yyInteger;
     QStack<IfdefState> yyIfdefStack;
     int yyBracketDepth;
     int yyBraceDepth;