Differential D25644

kitinerary: fix compilation with poppler >= 0.83
ClosedPublic
Actions

Authored by dfaure on Dec 1 2019, 1:54 AM.

Details

Reviewers
vkrause
aacid
Commits
R1003:dfa6ca840994: kitinerary: fix compilation with poppler >= 0.83
Summary

state->getPath() now returns a const GfxPath, and the methods
we are calling on it are indeed const now.

But they were not const before, so we can't just use const
unconditionally here, hence the version check and the #define.

Test Plan

Builds

Diff Detail

Repository
R1003 KItinerary: Travel Reservation handling library
Branch
release/19.12
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 19326
Build 19344: arc lint + arc unit
dfaure created this revision.Dec 1 2019, 1:54 AM
Restricted Application added a project: KDE PIM. · View Herald TranscriptDec 1 2019, 1:54 AM
Restricted Application added a subscriber: kde-pim. · View Herald Transcript
dfaure requested review of this revision.Dec 1 2019, 1:54 AM
dfaure added a comment.EditedDec 1 2019, 1:56 AM

Note that calligra/filters/karbon/pdf/PdfImport.cpp is broken by poppler 0.83 as well, in much more serious ways (std::unique_ptr<GlobalParams> stuff in addition to this const thing).

vkrause accepted this revision.Dec 1 2019, 6:55 AM
This revision is now accepted and ready to land.Dec 1 2019, 6:55 AM
dfaure closed this revision.Dec 1 2019, 12:15 PM
vkrause added a comment.Dec 1 2019, 2:37 PM

CI does not seem happy with this.

dfaure added a comment.Dec 1 2019, 2:47 PM

It would help if I wasn't a complete idiot :)

Fixed.

Revision Contents
Changeset List

PathPackages
Msrc/pdf/popplerutils.cpp (2 lines)
Msrc/pdf/popplerutils_p.h (6 lines)

Diff 70648

View Options

src/pdf/popplerutils.cpp

Loading...
View Options

src/pdf/popplerutils_p.h

Loading...