Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed gcc warnings.

Browse source
This commit is contained in:
leo 2016-05-02 18:22:38 +00:00
parent 1741a713d2
commit 4d9113c1d0
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/lc_category.cpp
View file

@ -117,8 +117,8 @@ bool lcLoadCategories(const QByteArray& Buffer, lcArray<lcLibraryCategory>& Cate
lcLibraryCategory& Category = Categories.Add();
Category.Name = Name.toLatin1();
Category.Keywords = Keywords.toLatin1();
Category.Name = Name.toLatin1().constData();
Category.Keywords = Keywords.toLatin1().constData();
}
return true;

2
common/lc_synth.cpp
View file

@ -56,7 +56,7 @@ void lcSynthInit()
}
lcSynthInfo::lcSynthInfo(lcSynthType Type, float Length, int NumSections, PieceInfo* Info)
: mType(Type), mLength(Length), mNumSections(NumSections), mPieceInfo(Info)
: mPieceInfo(Info), mType(Type), mLength(Length), mNumSections(NumSections)
{
float EdgeSectionLength;
float MidSectionLength;

4
common/view.cpp
View file

@ -702,7 +702,7 @@ void View::DrawSelectMoveOverlay()
if (AllowedTransforms & LC_OBJECT_TRANSFORM_MOVE_Y)
{
if ((mTrackTool == LC_TRACKTOOL_MOVE_Y) || (mTrackTool == LC_TRACKTOOL_MOVE_XY) || (mTrackTool == LC_TRACKTOOL_MOVE_YZ) && (AllowedTransforms & LC_OBJECT_TRANSFORM_MOVE_Y))
if (((mTrackTool == LC_TRACKTOOL_MOVE_Y) || (mTrackTool == LC_TRACKTOOL_MOVE_XY) || (mTrackTool == LC_TRACKTOOL_MOVE_YZ)) && (AllowedTransforms & LC_OBJECT_TRANSFORM_MOVE_Y))
{
mContext->SetColor(0.8f, 0.8f, 0.0f, 1.0f);
mContext->DrawIndexedPrimitives(GL_TRIANGLES, 36, GL_UNSIGNED_SHORT, 36 * 2);
@ -716,7 +716,7 @@ void View::DrawSelectMoveOverlay()
if (AllowedTransforms & LC_OBJECT_TRANSFORM_MOVE_Z)
{
if ((mTrackTool == LC_TRACKTOOL_MOVE_Z) || (mTrackTool == LC_TRACKTOOL_MOVE_XZ) || (mTrackTool == LC_TRACKTOOL_MOVE_YZ) && (AllowedTransforms & LC_OBJECT_TRANSFORM_MOVE_Z))
if (((mTrackTool == LC_TRACKTOOL_MOVE_Z) || (mTrackTool == LC_TRACKTOOL_MOVE_XZ) || (mTrackTool == LC_TRACKTOOL_MOVE_YZ)) && (AllowedTransforms & LC_OBJECT_TRANSFORM_MOVE_Z))
{
mContext->SetColor(0.8f, 0.8f, 0.0f, 1.0f);
mContext->DrawIndexedPrimitives(GL_TRIANGLES, 36, GL_UNSIGNED_SHORT, 72 * 2);