Fix build without qt deprecation compatibility
AbandonedPublic

Authored by aheinecke on Feb 9 2016, 6:32 PM.

Details

Summary

Libkdepim pulls in QT_DISABLE_DEPRECATED_BEFORE Kleopatra
should be able to build without this.

Diff Detail

Repository
R43 KDE PIM
Lint
Lint Skipped
Unit
Unit Tests Skipped
aheinecke updated this revision to Diff 2255.Feb 9 2016, 6:32 PM
aheinecke retitled this revision from to Fix build without qt deprecation compatibility.
aheinecke updated this object.
aheinecke edited the test plan for this revision. (Show Details)
aheinecke added a reviewer: mlaurent.
Restricted Application added a project: KDE PIM. · View Herald TranscriptFeb 9 2016, 6:32 PM
Restricted Application added a subscriber: kde-pim. · View Herald Transcript

Sorry improper usage of Arcanist here. This was split in two patches in my repo but with Arc diff this apparently got squashed into one.
I'll try to fix.

aheinecke updated this revision to Diff 2256.Feb 9 2016, 6:37 PM
aheinecke updated this object.

This is the diff that only contains fixes for Qt deprecated features.

apol added a subscriber: apol.Feb 9 2016, 6:55 PM

Other than that, looks good! +1

kleopatra/commands/importcertificatescommand.cpp
203 ↗(On Diff #2256)

The original one filtered using isEmpty()

kleopatra/utils/auditlog.cpp
40 ↗(On Diff #2256)

You didn't include any QUrlQuery uses...?

aheinecke updated this revision to Diff 2259.Feb 9 2016, 7:30 PM
aheinecke marked an inline comment as done.

Update to filter for empty sources again in importmodel tooltip.

aheinecke marked an inline comment as done.Feb 9 2016, 7:35 PM
aheinecke added inline comments.
kleopatra/commands/importcertificatescommand.cpp
203

Thanks, you are right I misunderstood the code and thought this would only call Qt::escape if the string is not empty. So I checked that toHtmlEscaped can handle empty values.

Hurray for obfuscated code. Btw. this was the only place where transform_if is used in Kleopatra. Happy it's gone now ;-)

kleopatra/utils/auditlog.cpp
40 ↗(On Diff #2256)

No but in line 74 there is a use of it. That this worked previously is probably because of an implicit include that's changed by the compatibility setting.
Without this include it does not compile with an invalid use of incomplete type error.

mlaurent edited edge metadata.Feb 10 2016, 12:20 PM

seems ok for me

aheinecke marked 3 inline comments as done.Feb 10 2016, 3:19 PM