Differential D3891 Diff 9560 src/common/KReportElement.cpp

Changeset View

Standalone View

View Options

src/common/KReportElement.cpp

Show All 37 Lines37 QString::fromLatin1("KReportElement: name=\"%1\" rect=%2 z=%3 foregroundColor=%4 "
38 "backgroundColor=%5 backgroundOpacity=%6") 38​ "backgroundColor=%5 backgroundOpacity=%6")
39 .arg(element.name()).arg(QVariant(element.rect()).toString()) 39​ .arg(element.name()).arg(QVariant(element.rect()).toString())
40 .arg(element.z()).arg(QVariant(element.foregroundColor()).toString()) 40​ .arg(element.z()).arg(QVariant(element.foregroundColor()).toString())
41 .arg(QVariant(element.backgroundColor()).toString()) 41​ .arg(QVariant(element.backgroundColor()).toString())
42 .arg(element.backgroundOpacity())); 42​ .arg(element.backgroundOpacity()));
43 return dbg.space(); 43​ return dbg.space();
44} 44​}
45 45​
46KREPORT_EXPORT uint qHash(const KReportElement &element, uint seed) 46​KREPORT_EXPORT uint qHash(const KReportElement &element, uint seed) Q_DECL_NOTHROW
staniekUnsubmitted
Done

Just curious, what warning was here?

staniek: Just curious, what warning was here?
piggzAuthorUnsubmitted
Not Done

/home/piggz/src/kreport/src/common/KReportElement.cpp: In function ‘uint qHash(const KReportElement&, uint)’:
/home/piggz/src/kreport/src/common/KReportElement.cpp:46:21: warning: declaration of ‘uint qHash(const KReportElement&, uint)’ has a different exception specifier [-Wpedantic]
KREPORT_EXPORT uint qHash(const KReportElement &element, uint seed)

^~~~~

In file included from /home/piggz/src/kreport/src/common/KReportElement.cpp:20:0:
/home/piggz/src/kreport-build/src/KReportElement.h:229:21: note: from previous declaration ‘uint qHash(const KReportElement&, uint) noexcept’
KREPORT_EXPORT uint qHash(const KReportElement &element, uint seed = 0) Q_DECL_NOTHROW;

piggz: /home/piggz/src/kreport/src/common/KReportElement.cpp: In function ‘uint qHash(const…
staniekUnsubmitted
Not Done

Fixing it now... declaration in KReportElement.h had Q_DECL_NOTHROW, definition should have it too.

staniek: Fixing it now... declaration in KReportElement.h had Q_DECL_NOTHROW, definition should have it…
47{ 47​{
48 return qHash(element.name(), seed) 48​ return qHash(element.name(), seed)
49 ^ qHash(element.z(), seed) 49​ ^ qHash(element.z(), seed)
50 ^ qHash(element.rect().x(), seed) 50​ ^ qHash(element.rect().x(), seed)
51 ^ qHash(element.foregroundColor().name(), seed) 51​ ^ qHash(element.foregroundColor().name(), seed)
52 ^ qHash(element.backgroundColor().name(), seed) 52​ ^ qHash(element.backgroundColor().name(), seed)
53 ^ qHash(qRound64(element.backgroundOpacity() * 1000.0), seed); 53​ ^ qHash(qRound64(element.backgroundOpacity() * 1000.0), seed);
54} 54​}