Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25257 → Rev 25258

/branches/Version15x/Scribus/scribus/palettes/cxfcolorspecification.cpp
18,7 → 18,7
return valid;
}
 
bool CxfColorSpecification::parse(QDomElement& elem)
bool CxfColorSpecification::parse(const QDomElement& elem)
{
reset();
/branches/Version15x/Scribus/scribus/palettes/cxfcolorspecification.h
30,11 → 30,11
const CxfTristimulusSpec& tristimulusSpec() const { return m_tristimulusSpec; }
bool isValid() const;
bool parse(QDomElement& elem);
bool parse(const QDomElement& elem);
void reset();
protected:
private:
QString m_id;
 
bool m_hasMeasurementSpec { false };
44,6 → 44,6
CxfTristimulusSpec m_tristimulusSpec;
};
 
typedef QSharedPointer<CxfColorSpecification> CxfColorSpecificationShPtr;
using CxfColorSpecificationShPtr = QSharedPointer<CxfColorSpecification>;
 
#endif
/branches/Version15x/Scribus/scribus/palettes/cxfdocument.cpp
73,7 → 73,7
return (m_objects.count() > 0);
}
 
bool CxfDocument::parseColorSpecificationCollection(QDomElement& elem)
bool CxfDocument::parseColorSpecificationCollection(const QDomElement& elem)
{
QDomNodeList childNodes = elem.childNodes();
for (int i = 0; i < childNodes.count(); ++i)
94,7 → 94,7
return (m_colorSpecs.count() > 0);
}
 
bool CxfDocument::parseObjectCollection(QDomElement& elem)
bool CxfDocument::parseObjectCollection(const QDomElement& elem)
{
QDomNodeList childNodes = elem.childNodes();
for (int i = 0; i < childNodes.count(); ++i)
/branches/Version15x/Scribus/scribus/palettes/cxfdocument.h
33,12 → 33,12
bool parse(const QString& fileName);
void reset();
protected:
private:
QMap<QString, CxfColorSpecificationShPtr> m_colorSpecs;
QList<CxfObject*> m_objects;
bool parseColorSpecificationCollection(QDomElement& elem);
bool parseObjectCollection(QDomElement& elem);
bool parseColorSpecificationCollection(const QDomElement& elem);
bool parseObjectCollection(const QDomElement& elem);
};
 
#endif
/branches/Version15x/Scribus/scribus/palettes/cxfmeasurementspec.cpp
25,7 → 25,7
return m_measurementType != cxfMeasurementUnknown;
}
 
bool CxfMeasurementSpec::parse(QDomElement& elem)
bool CxfMeasurementSpec::parse(const QDomElement& elem)
{
bool convOk = false;
bool parsingError = false;
/branches/Version15x/Scribus/scribus/palettes/cxfmeasurementspec.h
19,7 → 19,7
CxfMeasurementSpec();
bool isValid() const;
bool parse(QDomElement& elem);
bool parse(const QDomElement& elem);
CxfMeasurementType measurementType() const { return m_measurementType; }
/branches/Version15x/Scribus/scribus/palettes/cxfobject.cpp
21,7 → 21,7
return colorPtr.data();
}
 
bool CxfObject::parse(QDomElement& elem)
bool CxfObject::parse(const QDomElement& elem)
{
m_id = elem.attribute("Id");
if (m_id.isEmpty())
42,7 → 42,7
return (m_colorMap.count() > 0);
}
 
void CxfObject::parseColorValues(QDomElement& elem)
void CxfObject::parseColorValues(const QDomElement& elem)
{
QDomNodeList childNodes = elem.childNodes();
for (int i = 0; i < childNodes.count(); ++i)
105,7 → 105,7
}
}
 
void CxfObject::parseDeviceColorValues(QDomElement& elem)
void CxfObject::parseDeviceColorValues(const QDomElement& elem)
{
QDomNodeList childNodes = elem.childNodes();
for (int i = 0; i < childNodes.count(); ++i)
/branches/Version15x/Scribus/scribus/palettes/cxfobject.h
31,9 → 31,9
bool hasColor(CxfColorType type) const { return m_colorMap.contains(type); }
const CxfColor* color(CxfColorType type) const;
bool parse(QDomElement& elem);
bool parse(const QDomElement& elem);
 
protected:
private:
CxfDocument* m_cxfDoc { nullptr };
QString m_id;
40,8 → 40,8
QString m_name;
QMap<CxfColorType, CxfColorShPtr> m_colorMap;
 
void parseColorValues(QDomElement& elem);
void parseDeviceColorValues(QDomElement& elem);
void parseColorValues(const QDomElement& elem);
void parseDeviceColorValues(const QDomElement& elem);
};
 
#endif
/branches/Version15x/Scribus/scribus/palettes/cxftristimulusspec.cpp
33,7 → 33,7
return supported;
}
 
bool CxfTristimulusSpec::parse(QDomElement& elem)
bool CxfTristimulusSpec::parse(const QDomElement& elem)
{
bool parsingError = false;
reset();
/branches/Version15x/Scribus/scribus/palettes/cxftristimulusspec.h
24,7 → 24,7
bool isValid() const;
bool isSupported() const;
bool parse(QDomElement& elem);
bool parse(const QDomElement& elem);
void reset();
protected: