Differential D3757 Diff 9238 src/common/KReportDesign.cpp

Changeset View

Standalone View

View Options

src/common/KReportDesign.cpp

Show All 24 Lines
25#include "KReportPluginManager.h" 25​#include "KReportPluginManager.h"
26#include "KReportPluginInterface.h" 26​#include "KReportPluginInterface.h"
27 27​
28#include <QDomDocument> 28​#include <QDomDocument>
29#include <QDomElement> 29​#include <QDomElement>
30#include <QPrinter> 30​#include <QPrinter>
31#include <QPrinterInfo> 31​#include <QPrinterInfo>
32 32​
33KReportDesignReadingStatus::KReportDesignReadingStatus() 33​class Q_DECL_HIDDEN KReportDesignReadingStatus::Private
staniekUnsubmitted
Done

+Q_DECL_HIDDEN

staniek: +Q_DECL_HIDDEN
34 : lineNumber(-1), columnNumber(-1) ​
35{ 34​{
35​public:
36​ QString errorMessage;
staniekUnsubmitted
Done

How about moving these docs to KReportDesign.h for the users?

staniek: How about moving these docs to KReportDesign.h for the users?
37​ QString errorDetails;
38​ int errorLineNumber = -1;
39​ int errorColumnNumber = -1;
40​};
41​
42​KReportDesignReadingStatus::KReportDesignReadingStatus() : d(new Private)
43​{
staniekUnsubmitted
Done

-> errorLineNumber

staniek: -> errorLineNumber
44​}
45​
46​KReportDesignReadingStatus::~KReportDesignReadingStatus()
staniekUnsubmitted
Done

-> errorColumnNumber

staniek: -> errorColumnNumber
47​{
48​ delete d;
36} 49​}
staniekUnsubmitted
Done

Minor, for the future: it's enough to use new Private without ()

staniek: Minor, for the future: it's enough to use `new Private` without `()`
37 50​
51​KReportDesignReadingStatus::KReportDesignReadingStatus(const KReportDesignReadingStatus& other) : d(new Private)
52​{
53​ setErrorMessage(other.errorMessage());
staniekUnsubmitted
Done

It's enough to call *this = other

staniek: It's enough to call `*this = other`
54​ setErrorDetails(other.errorDetails());
55​ setErrorLineNumber(other.errorLineNumber());
56​ setErrorColumnNumber(other.errorColumnNumber());
57​}
58​
59​KReportDesignReadingStatus KReportDesignReadingStatus::operator=(const KReportDesignReadingStatus &other)
60​{
61​ if (this != &other) {
62​ setErrorMessage(other.errorMessage());
63​ setErrorDetails(other.errorDetails());
64​ setErrorLineNumber(other.errorLineNumber());
65​ setErrorColumnNumber(other.errorColumnNumber());
66​ }
67​
68​ return *this;
69​}
70​
71​
38bool KReportDesignReadingStatus::isError() const 72​bool KReportDesignReadingStatus::isError() const
39{ 73​{
40 return lineNumber >= 0; 74​ return d->errorLineNumber >= 0;
staniekUnsubmitted
Done

missing && d->errorColumnNumber >= 0

staniek: missing `&& d->errorColumnNumber >= 0`
75​}
76​
77​int KReportDesignReadingStatus::errorColumnNumber() const
78​{
79​ return d->errorColumnNumber;
80​}
81​
82​QString KReportDesignReadingStatus::errorDetails() const
83​{
84​ return d->errorDetails;
85​}
86​
87​QString KReportDesignReadingStatus::errorMessage() const
88​{
89​ return d->errorMessage;
90​}
91​
92​
93​int KReportDesignReadingStatus::errorLineNumber() const
94​{
95​ return d->errorLineNumber;
96​}
97​
98​void KReportDesignReadingStatus::setErrorColumnNumber(int column)
99​{
100​ d->errorColumnNumber = column;
101​}
102​
103​void KReportDesignReadingStatus::setErrorDetails(const QString& details)
104​{
105​ d->errorDetails = details;
106​}
107​
108​void KReportDesignReadingStatus::setErrorLineNumber(int line)
109​{
110​ d->errorLineNumber = line;
111​}
112​
113​void KReportDesignReadingStatus::setErrorMessage(const QString& msg)
114​{
115​ d->errorMessage = msg;
41} 116​}
42 117​
43QDebug operator<<(QDebug dbg, const KReportDesignReadingStatus& status) 118​QDebug operator<<(QDebug dbg, const KReportDesignReadingStatus& status)
44{ 119​{
45 if (status.isError()) { 120​ if (status.isError()) {
46 dbg.nospace() << qPrintable( 121​ dbg.nospace() << qPrintable(
47 QString::fromLatin1("KReportDesignReadingStatus: errorMessage=\"%1\" " 122​ QString::fromLatin1("KReportDesignReadingStatus: errorMessage=\"%1\" "
48 "errorDetails=\"%2\" line=%3 column=%4") 123​ "errorDetails=\"%2\" line=%3 column=%4")
49 .arg(status.errorMessage).arg(status.errorDetails) 124​ .arg(status.errorMessage()).arg(status.errorDetails())
50 .arg(status.lineNumber).arg(status.columnNumber)); 125​ .arg(status.errorLineNumber()).arg(status.errorColumnNumber()));
51 } else { 126​ } else {
52 dbg.nospace() << "KReportDesignReadingStatus: OK"; 127​ dbg.nospace() << "KReportDesignReadingStatus: OK";
53 } 128​ }
54 return dbg.space(); 129​ return dbg.space();
55} 130​}
56 131​
57//----------------------------------- 132​//-----------------------------------
58 133​
59KReportDesign::KReportDesign() 134​KReportDesign::KReportDesign()
60 : d(new Private(this)) 135​ : d(new Private(this))
61{ 136​{
62} 137​}
63 138​
64KReportDesign::~KReportDesign() 139​KReportDesign::~KReportDesign()
65{ 140​{
66 delete d; 141​ delete d;
67} 142​}
68 143​
69bool KReportDesign::setContent(const QString &text, KReportDesignReadingStatus *status) 144​bool KReportDesign::setContent(const QString &text, KReportDesignReadingStatus *status)
70{ 145​{
71 QDomDocument doc; 146​ QDomDocument doc;
72 if (!doc.setContent(text, status ? &status->errorDetails : 0, status ? &status->lineNumber : 0, 147​ QString errorDetails;
73 status ? &status->columnNumber : 0)) 148​ int errorLine;
149​ int errorColumn;
150​
151​ if (!doc.setContent(text, &errorDetails, &errorLine, &errorColumn))
74 { 152​ {
75 if (status) { 153​ if (status) {
76 status->errorMessage = tr("Could not parse XML document."); 154​ status->setErrorMessage(tr("Could not parse XML document."));
155​ status->setErrorDetails(errorDetails);
156​ status->setErrorLineNumber(errorLine);
157​ status->setErrorColumnNumber(errorColumn);
77 } 158​ }
78 return false; 159​ return false;
79 } 160​ }
80 return d->processDocument(doc, status); 161​ return d->processDocument(doc, status);
staniekUnsubmitted
Done

Unrelated to the port but while we're at this: we're not setting message at all here or removing previous one. Note that the status object is supplied by the user so we don't know what it is.

Proposed solution: if d->processDocument(doc, status) fails, set error message to something like tr("Error in XML document.").

staniek: Unrelated to the port but while we're at this: we're not setting message at all here or…
81} 162​}
82 163​
staniekUnsubmitted
Not Done

if (status) { .. }

staniek: if (status) { .. }
83QString KReportDesign::toString(int indent) const 164​QString KReportDesign::toString(int indent) const
84{ 165​{
85 Q_UNUSED(indent); 166​ Q_UNUSED(indent);
86 //! @todo 167​ //! @todo
87 return QString(); 168​ return QString();
88} 169​}
89 170​
90QPageLayout KReportDesign::pageLayout() const 171​QPageLayout KReportDesign::pageLayout() const
Show All 19 Lines
110 191​
111KReportElement KReportDesign::createElement(const QString &typeName, QString *errorMessage) 192​KReportElement KReportDesign::createElement(const QString &typeName, QString *errorMessage)
112{ 193​{
113 QDomElement el; 194​ QDomElement el;
114 KReportDesignReadingStatus status; 195​ KReportDesignReadingStatus status;
115 KReportPluginInterface* plugin = d->findPlugin(typeName, el, &status); 196​ KReportPluginInterface* plugin = d->findPlugin(typeName, el, &status);
116 if (!plugin) { 197​ if (!plugin) {
117 if (errorMessage) { 198​ if (errorMessage) {
118 *errorMessage = status.errorMessage; 199​ *errorMessage = status.errorMessage();
119 } 200​ }
120 return KReportElement(); 201​ return KReportElement();
121 } 202​ }
122 return plugin->createElement(); 203​ return plugin->createElement();
123} 204​}
124 205​
125bool KReportDesign::hasSection(KReportSection::Type type) const 206​bool KReportDesign::hasSection(KReportSection::Type type) const
126{ 207​{
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines