diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index 78e69c912..f14d05114 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -83,7 +83,7 @@ VTextManager &VTextManager::operator=(const VTextManager &text) //--------------------------------------------------------------------------------------------------------------------- /** * @brief GetSpacing returns the vertical spacing between the lines - * @return + * @return spacing */ int VTextManager::GetSpacing() const { diff --git a/src/libs/vmisc/warnings.pri b/src/libs/vmisc/warnings.pri index f051b7d6c..c0fc4e5ea 100644 --- a/src/libs/vmisc/warnings.pri +++ b/src/libs/vmisc/warnings.pri @@ -37,7 +37,8 @@ unix { # -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and # want them in global list. Compromise decision delete them from local list. QMAKE_CXXFLAGS -= \ - -Wmissing-prototypes + -Wmissing-prototypes \ + -Wundefined-reinterpret-cast } *-icc-*{ diff --git a/src/libs/vobj/delaunay.cpp b/src/libs/vobj/delaunay.cpp index 15062a097..029b208d9 100644 --- a/src/libs/vobj/delaunay.cpp +++ b/src/libs/vobj/delaunay.cpp @@ -175,6 +175,7 @@ static void halfedge_free( halfedge_t* d ) /* * free all delaunay halfedges */ +void del_free_halfedges( delaunay_t *del ); void del_free_halfedges( delaunay_t *del ) { quint32 i; @@ -979,6 +980,7 @@ static void build_halfedge_face( delaunay_t *del, halfedge_t *d ) /* * build the faces for all the halfedge */ +void del_build_faces( delaunay_t *del ); void del_build_faces( delaunay_t *del ) { quint32 i; @@ -1035,7 +1037,7 @@ delaunay2d_t* delaunay2d_from(del_point2d_t *points, quint32 num_points) { quint32 fbuff_size = 0; quint32 j = 0; - del_divide_and_conquer( &del, 0, num_points - 1 ); + del_divide_and_conquer( &del, 0, static_cast(num_points - 1) ); del_build_faces( &del ); for( i = 0; i < del.num_faces; i++ )