From 838f7f77dd6fbd45ae117f96fc8d58eac15edc24 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 1 Jun 2014 13:18:55 +0300 Subject: [PATCH] Clang's warnings. --HG-- branch : develop --- src/app/app.pro | 4 +--- src/app/container/vcontainer.h | 6 +++--- src/app/container/vmeasurement.cpp | 4 ++-- src/app/geometry/vdetail.h | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/app/app.pro b/src/app/app.pro index 762612a05..015e0064d 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -124,7 +124,7 @@ CONFIG(debug, debug|release){ -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ -isystem "/usr/include/qt5/QtCore" -isystem "/usr/include/qt5/QtXmlPatterns" \ --isystem "$${UI_DIR}" -isystem "$${MOC_DIR}" -isystem "$${RCC_DIR}" \ +-isystem "$${UI_DIR}" -isystem "$${OUT_PWD}/$${MOC_DIR}" -isystem "$${RCC_DIR}" \ -O0 \ -fparse-all-comments \ -Wabi \ @@ -228,8 +228,6 @@ CONFIG(debug, debug|release){ -Wdocumentation \ -Wdocumentation-deprecated-sync \ -Wdocumentation-html \ --Wdocumentation-pedantic \ --Wdocumentation-unknown-command \ -Wdollar-in-identifier-extension \ -Wduplicate-decl-specifier \ -Wduplicate-enum \ diff --git a/src/app/container/vcontainer.h b/src/app/container/vcontainer.h index 94ce7ded4..29ff7d00c 100644 --- a/src/app/container/vcontainer.h +++ b/src/app/container/vcontainer.h @@ -204,7 +204,7 @@ private: /** * @brief AddMeasurement add new measurement * @param name short measurement name - * @param row measurement + * @param m measurement */ inline void VContainer::AddMeasurement(const QString &name, const VMeasurement &m) { @@ -226,7 +226,7 @@ inline void VContainer::UpdateMeasurement(const QString &name, VMeasurement m) /** * @brief UpdateIncrement update increment table row by name * @param name name of row - * @param row row + * @param incr increment */ inline void VContainer::UpdateIncrement(const QString &name, VIncrement incr) { @@ -309,7 +309,7 @@ inline void VContainer::SetSizeName(const QString &name) //--------------------------------------------------------------------------------------------------------------------- /** * @brief SetGrowth set value of growth - * @param growth value of growth + * @param height value of height */ inline void VContainer::SetHeight(qreal height) { diff --git a/src/app/container/vmeasurement.cpp b/src/app/container/vmeasurement.cpp index 2697fdea6..8a3bbf32f 100644 --- a/src/app/container/vmeasurement.cpp +++ b/src/app/container/vmeasurement.cpp @@ -46,9 +46,9 @@ VMeasurement::VMeasurement() * @param description measurement full description * @param tagName measurement's tag name in file */ -VMeasurement::VMeasurement(const qreal &base, const qreal &ksize, const qreal &kgrowth, +VMeasurement::VMeasurement(const qreal &base, const qreal &ksize, const qreal &kheight, const QString &gui_text, const QString &description, const QString &tagName) - :base(base), ksize(ksize), kheight(kgrowth), gui_text(gui_text), description(description), _tagName(tagName) + :base(base), ksize(ksize), kheight(kheight), gui_text(gui_text), description(description), _tagName(tagName) {} //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/geometry/vdetail.h b/src/app/geometry/vdetail.h index bdd166dc8..373a50cbf 100644 --- a/src/app/geometry/vdetail.h +++ b/src/app/geometry/vdetail.h @@ -228,7 +228,7 @@ public: /** * @brief RemoveEdge return detail without edge with index. * @param index idex of edge. - * @return + * @return detail without edge with index. */ VDetail RemoveEdge(const quint32 &index) const; /**