Differential D3757 Diff 9231 src/common/KReportDesign_p.cpp

Changeset View

Standalone View

View Options

src/common/KReportDesign_p.cpp

Show First 20 Lines • Show All 104 Lines • ▼ Show 20 Line(s)
105{ 105​{
106 return s_global; 106​ return s_global;
107} 107​}
108 108​
109static void setStatus(KReportDesignReadingStatus *status, const QString& details, 109​static void setStatus(KReportDesignReadingStatus *status, const QString& details,
110 const QDomNode &node) 110​ const QDomNode &node)
111{ 111​{
112 if (status) { 112​ if (status) {
113 status->errorDetails = details; 113​ status->setErrorDetails(details);
114 status->lineNumber = node.lineNumber() == -1 ? 0 /* mark error */ : node.lineNumber(); 114​ status->setErrorLine(node.lineNumber() == -1 ? 0 /* mark error */ : node.lineNumber());
115 status->columnNumber = node.columnNumber() == -1 ? 0 /* mark error */ : node.columnNumber(); 115​ status->setErrorColumn(node.columnNumber() == -1 ? 0 /* mark error */ : node.columnNumber());
116 } 116​ }
117} 117​}
118 118​
119static bool checkElement(const QDomNode &node, KReportDesignReadingStatus *status) 119​static bool checkElement(const QDomNode &node, KReportDesignReadingStatus *status)
120{ 120​{
121 if (node.isElement()) { 121​ if (node.isElement()) {
122 return true; 122​ return true;
123 } 123​ }
▲ Show 20 Lines • Show All 323 Lines • ▼ Show 20 Line(s)446 if (!checkElement(node, status)) {
447 return false; 447​ return false;
448 } 448​ }
449 if (!processContentElementChild(node.toElement(), status)) { 449​ if (!processContentElementChild(node.toElement(), status)) {
450 return false; 450​ return false;
451 } 451​ }
452 } 452​ }
453 453​
454 if (status) { 454​ if (status) {
455 status->lineNumber = -1; 455​ status->setErrorLine(-1);
staniekUnsubmitted
Done

If we support KReportDesignReadingStatus::operator=() we could just do this here:

*status = KReportDesignReadingStatus();

And this would be more maintainable.

staniek: If we support KReportDesignReadingStatus::operator=() we could just do this here: *status =…
456 status->columnNumber = -1; 456​ status->setErrorColumn(-1);
457 status->errorMessage.clear(); 457​ status->setErrorMessage(QString());
458 status->errorDetails.clear(); 458​ status->setErrorDetails(QString());
459 } 459​ }
460 return true; 460​ return true;
461} 461​}