Details

Reviewers

ngraham

Group Reviewers

Gwenview

Commits

R260:90f081d22747: Replace some obsolete methods with non-obsolete ones

Summary

There are some deprecated methods in the code:

https://build.kde.org/job/Applications/job/gwenview/job/kf5-qt5%20FreeBSDQt5.13/4/warnings12Result/category.2119183113/

Test Plan

Run Gwenview, select an image.
Use Edit -> Crop to ensure that cropping is working as expected.
Press F11 to go to the full screen mode. The top panel should appear as expected.

Diff Detail

Repository

R260 Gwenview

Branch

master

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 14117
Build 14135: arc lint + arc unit

yurchor created this revision.Jul 18 2019, 11:14 AM

Restricted Application added a project: Gwenview. · View Herald TranscriptJul 18 2019, 11:14 AM

yurchor requested review of this revision.Jul 18 2019, 11:14 AM

Harbormaster completed remote builds in B14081: Diff 61969.Jul 18 2019, 11:14 AM

I vote against bumping Qt to 5.10 just because of a single obsolete method. Qt 5.9 is a LTS release, which is supported until May 2020. E.g. I'm using openSUSE Leap 15.1, which uses 5.9.7 . Also, QImage::sizeInBytes() is recommend for images bigger 2GiB, but I never had success to open images that big with Gwenview.

Revert Qt 5.9 -> 5.10 and byteCount() -> sizeInBytes() change.

Harbormaster completed remote builds in B14093: Diff 61992.Jul 18 2019, 5:28 PM

the description needs to be changed now

yurchor edited the summary of this revision. (Show Details)Jul 18 2019, 7:27 PM

meven added a subscriber: meven.Jul 19 2019, 7:27 AM

meven added inline comments.

lib/crop/croptool.cpp
274–275	Add const here
lib/imagescaler.cpp
134	Wrap d->mRegion in qAsConst(d->mRegion) https://www.kdab.com/goodbye-q_foreach/

Thanks.

Use constant iterators.

Harbormaster completed remote builds in B14117: Diff 62029.Jul 19 2019, 7:43 AM

ngraham added inline comments.Jul 19 2019, 5:36 PM

lib/crop/cropwidget.cpp
203	Might be better to use `QGuiApplication::screenAt()` and get the screen where the window is open, rather than assuming it's open on the primary screen (also, the concept of the primary screen does not exist on Wayland; not sure what `QGuiApplication::primaryScreen()` will return there)
lib/fullscreenbar.cpp
85	ditto

Thanks in advance for your answer.

lib/crop/cropwidget.cpp
203	This will introduce the dependency on Qt 5.10: https://doc.qt.io/qt-5/qguiapplication.html#screenAt How should I proceed?
lib/fullscreenbar.cpp
85	Same here.

Darn. Don't port those, then, and instead just add a TODO that says what we should do when we're going to bump the dep to a newer Qt version.

Revert screenGeometry() changes to keep Qt 5.9 dependency, add appropriate comments.

Harbormaster completed remote builds in B14153: Diff 62092.Jul 20 2019, 6:06 AM

yurchor marked 2 inline comments as done.Jul 20 2019, 6:08 AM

Thanks! Almost done...

lib/crop/cropwidget.cpp
32	Now we don't need this include anymore
lib/fullscreenbar.cpp
32	ditto

Remove QScreen includes.

Harbormaster completed remote builds in B14169: Diff 62119.Jul 20 2019, 2:08 PM

Thanks, shipit! 👍

This revision is now accepted and ready to land.Jul 20 2019, 2:09 PM

Closed by commit R260:90f081d22747: Replace some obsolete methods with non-obsolete ones (authored by yurchor). · Explain WhyJul 20 2019, 2:15 PM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			app/fullscreencontent.cpp (2 lines)
M			app/infocontextmanageritem.cpp (2 lines)
M			app/kipiinterface.cpp (2 lines)
M			lib/crop/croptool.cpp (4 lines)
M			lib/crop/cropwidget.cpp (3 lines)
M			lib/documentview/documentviewcontainer.cpp (2 lines)
M			lib/fullscreenbar.cpp (3 lines)
M			lib/imagescaler.cpp (2 lines)
M			lib/semanticinfo/tagitemdelegate.cpp (2 lines)
M			lib/slideshow.cpp (6 lines)
M			lib/thumbnailview/itemeditor.cpp (2 lines)
M			lib/thumbnailview/previewitemdelegate.cpp (4 lines)
M			lib/zoomwidget.cpp (2 lines)
M			tests/auto/recursivedirmodeltest.cpp (4 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	61969	1b47135		Jul 18 2019, 11:14 AM	★	★
Diff 2	61992	1b47135	Revert Qt 5.9 -> 5.10 and byteCount() -> sizeInBytes() change.	Jul 18 2019, 5:28 PM	★	★
Diff 3	62029	1b47135	Use constant iterators.	Jul 19 2019, 7:43 AM	★	★
Diff 4	62092	1b47135	Revert screenGeometry() changes to keep Qt 5.9 dependency, add appropriate…	Jul 20 2019, 6:06 AM	★	★
Diff 5	62119	1b47135	Remove QScreen includes.	Jul 20 2019, 2:08 PM	★	★
Diff 6	62120	1b47135	R260:90f081d22747556e87fd804c922094322ee03c3d	Jul 20 2019, 2:09 PM	★	★

Replace some obsolete methods with non-obsolete ones
ClosedPublic
Actions

Details

Diff Detail

Revision Contents
Changeset List

Diff 62029

app/fullscreencontent.cpp

app/infocontextmanageritem.cpp

app/kipiinterface.cpp

lib/crop/croptool.cpp

lib/crop/cropwidget.cpp

lib/documentview/documentviewcontainer.cpp

lib/fullscreenbar.cpp

lib/imagescaler.cpp

lib/semanticinfo/tagitemdelegate.cpp

lib/slideshow.cpp

lib/thumbnailview/itemeditor.cpp

lib/thumbnailview/previewitemdelegate.cpp

lib/zoomwidget.cpp

tests/auto/recursivedirmodeltest.cpp

Replace some obsolete methods with non-obsolete onesClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 62029

app/fullscreencontent.cpp

app/infocontextmanageritem.cpp

app/kipiinterface.cpp

lib/crop/croptool.cpp

lib/crop/cropwidget.cpp

lib/documentview/documentviewcontainer.cpp

lib/fullscreenbar.cpp

lib/imagescaler.cpp

lib/semanticinfo/tagitemdelegate.cpp

lib/slideshow.cpp

lib/thumbnailview/itemeditor.cpp

lib/thumbnailview/previewitemdelegate.cpp

lib/zoomwidget.cpp

tests/auto/recursivedirmodeltest.cpp

Replace some obsolete methods with non-obsolete ones
ClosedPublic
Actions

Revision Contents
Changeset List