Fix/suppress some warnings #31

Merged

MicheleC merged 2 commits from fix/warnings into master

Fat-Zer commented

Collaborator

subj;

Fat-Zer added 2 commits

fddb921ac6 Suppress several warnings

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

0377a62496 fix an incorrect condition in ImageViewController::eventFilter()

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

Fat-Zer force-pushed fix/warnings from 0377a62496 to ad0516738d

SlavekB reviewed

src/gvcore/filethumbnailviewitem.cpp

													
				@ -327,2 +327,2 @@

					textW=textRect(false).width();

					textH=textRect(false).height();

					// textW=textRect(false).width();

					// textH=textRect(false).height();

SlavekB commented

Owner

Why comment instead of removal?

Fat-Zer commented

Poster

Collaborator

I wasn't reading too deep into the code. To the best of my assessment it seems the values are actually not needed, but in case I am wrong and that warning was actually indicating a bug, this may be at least a small hint in future, what could be wrong here.

Am I overthinking this?

MicheleC commented

Owner

I don't see any specific reasons to keep those as commented code. Removal seems fine to me.

Fat-Zer commented

Poster

Collaborator

removed

Fat-Zer marked this conversation as resolved

MicheleC reviewed

src/gvcore/mngformattype.cpp

													
				@ -318,3 +315,1 @@

				     && buffer[5]==10

				     && buffer[6]==26

				     && buffer[7]==10

				        ) || ( // PNG signature

MicheleC commented

Owner

Can I suggest we put the ) before the #ifdef and then close the PNG part before the #endif? Mixing parenthesis level with preprocessor code can lead to confusion and definitely will not help uncrustify-trinity when we come to formatting indentation of this part.

Can I suggest we put the `)` before the `#ifdef` and then close the PNG part before the `#endif`? Mixing parenthesis level with preprocessor code can lead to confusion and definitely will not help uncrustify-trinity when we come to formatting indentation of this part.

Fat-Zer commented

Poster

Collaborator

fixed

Fat-Zer marked this conversation as resolved

Fat-Zer force-pushed fix/warnings from ad0516738d to a8bf4dbf8a

MicheleC approved these changes

MicheleC left a comment

Owner

Looks good

MicheleC merged commit a8bf4dbf8a into master 12 months ago

MicheleC deleted branch fix/warnings

MicheleC added this to the R14.1.2 release milestone

Reviewers

MicheleC approved these changes

The pull request has been merged as a8bf4dbf8a.

No reviewers

No Milestone

No Assignees

3 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Loading…

There is no content yet.

Labels Milestones

Fix/suppress some warnings #31

Reviewers