summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-08-18 12:41:36 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-08-18 12:41:36 +0200
commit29a09425f6155fc4c48bece71bdf122e50d11ec1 (patch)
treec22e6e7ccf0be31594b863b5b56b6405a8555b91
parent1dfb78f6eabfcdb8ae8a0474c9d2d11ae6554ac3 (diff)
Fix warningslibvisio-0.0.5
-rw-r--r--configure.ac2
-rw-r--r--src/lib/VSDXContentCollector.cpp4
-rw-r--r--src/lib/VSDXGeometryList.h2
-rw-r--r--src/lib/VSDXStencils.h2
-rw-r--r--src/lib/VSDXStylesCollector.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index b4e46c2..cb2f30a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libv
AC_INIT([libvisio],[libvisio_version])
AC_CONFIG_MACRO_DIR([m4])
AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz dist-bzip2])
m4_define([AM_SILENT_RULES])
AC_LANG([C++])
diff --git a/src/lib/VSDXContentCollector.cpp b/src/lib/VSDXContentCollector.cpp
index 8f40c45..50c2a5a 100644
--- a/src/lib/VSDXContentCollector.cpp
+++ b/src/lib/VSDXContentCollector.cpp
@@ -1125,12 +1125,12 @@ void libvisio::VSDXContentCollector::collectCharFormat(unsigned /*id*/ , unsigne
m_shapeOutput->addEndTextObject();
}
-void libvisio::VSDXContentCollector::collectStyleSheet(unsigned id, unsigned level, unsigned parentLineStyle, unsigned parentFillStyle, unsigned parentTextStyle)
+void libvisio::VSDXContentCollector::collectStyleSheet(unsigned /* id */, unsigned level, unsigned /* parentLineStyle */, unsigned /* parentFillStyle */, unsigned /* parentTextStyle */)
{
_handleLevelChange(level);
}
-void libvisio::VSDXContentCollector::collectLineStyle(unsigned /* id */, unsigned level, double strokeWidth, Colour c, unsigned linePattern, unsigned lineCap)
+void libvisio::VSDXContentCollector::collectLineStyle(unsigned /* id */, unsigned level, double /* strokeWidth */, Colour /* c */, unsigned /* linePattern */, unsigned /* lineCap */)
{
_handleLevelChange(level);
}
diff --git a/src/lib/VSDXGeometryList.h b/src/lib/VSDXGeometryList.h
index 49dce48..4aa9080 100644
--- a/src/lib/VSDXGeometryList.h
+++ b/src/lib/VSDXGeometryList.h
@@ -53,7 +53,7 @@ public:
bool empty() const { return (!m_elements.size()); }
VSDXGeometryListElement * getElement(unsigned index);
std::vector<unsigned> getElementsOrder() const { return m_elementsOrder; }
- const unsigned count() const { return m_elements.size(); }
+ unsigned count() const { return m_elements.size(); }
private:
std::map<unsigned, VSDXGeometryListElement *> m_elements;
std::vector<unsigned> m_elementsOrder;
diff --git a/src/lib/VSDXStencils.h b/src/lib/VSDXStencils.h
index e16b824..29c46ff 100644
--- a/src/lib/VSDXStencils.h
+++ b/src/lib/VSDXStencils.h
@@ -68,7 +68,7 @@ class VSDXStencils
~VSDXStencils();
void addStencil(unsigned idx, const VSDXStencil &stencil);
const VSDXStencil *getStencil(unsigned idx) const;
- const unsigned count() const { return m_stencils.size(); }
+ unsigned count() const { return m_stencils.size(); }
private:
std::map<unsigned, VSDXStencil> m_stencils;
};
diff --git a/src/lib/VSDXStylesCollector.cpp b/src/lib/VSDXStylesCollector.cpp
index d752d6f..8a2a923 100644
--- a/src/lib/VSDXStylesCollector.cpp
+++ b/src/lib/VSDXStylesCollector.cpp
@@ -167,7 +167,7 @@ void libvisio::VSDXStylesCollector::collectPageProps(unsigned /* id */, unsigned
_handleLevelChange(level);
}
-void libvisio::VSDXStylesCollector::collectShape(unsigned id, unsigned level, unsigned /*masterPage*/, unsigned /*masterShape*/, unsigned lineStyle, unsigned fillStyle, unsigned textStyle)
+void libvisio::VSDXStylesCollector::collectShape(unsigned id, unsigned level, unsigned /*masterPage*/, unsigned /*masterShape*/, unsigned /* lineStyle */, unsigned /* fillStyle */, unsigned /* textStyle */)
{
_handleLevelChange(level);
m_currentShapeId = id;