Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24720 → Rev 24721

/trunk/Scribus/scribus/palettes/cxfcolorspecification.cpp
7,12 → 7,6
 
#include "cxfcolorspecification.h"
 
CxfColorSpecification::CxfColorSpecification()
{
m_hasMeasurementSpec = false;
m_hasTristimulusSpec = false;
}
 
bool CxfColorSpecification::isValid() const
{
bool valid = true;
/trunk/Scribus/scribus/palettes/cxfcolorspecification.h
18,7 → 18,7
class CxfColorSpecification
{
public:
CxfColorSpecification();
CxfColorSpecification() = default;
 
const QString& id() const { return m_id; }
37,8 → 37,8
protected:
QString m_id;
 
bool m_hasMeasurementSpec;
bool m_hasTristimulusSpec;
bool m_hasMeasurementSpec { false };
bool m_hasTristimulusSpec { false };
CxfMeasurementSpec m_measurementSpec;
CxfTristimulusSpec m_tristimulusSpec;
/trunk/Scribus/scribus/palettes/cxfdocument.cpp
107,7 → 107,7
if (childElem.tagName() != "Object")
continue;
 
CxfObject* object = new CxfObject(this);
auto* object = new CxfObject(this);
if (!object->parse(childElem))
{
delete object;
/trunk/Scribus/scribus/palettes/cxfdocument.h
28,7 → 28,7
 
int objectCount() const { return m_objects.count(); }
const CxfObject* objectAt(int index) const { return m_objects.at(index); }
const QList<CxfObject*>& objects() { return m_objects; }
const QList<CxfObject*>& objects() const { return m_objects; }
bool parse(const QString& fileName);
void reset();
/trunk/Scribus/scribus/palettes/cxfmeasurementspec.cpp
10,9 → 10,7
 
CxfMeasurementSpec::CxfMeasurementSpec()
{
m_measurementType = cxfMeasurementUnknown;
m_waveLengthStart = 0;
m_waveLengthIncrement = 0;
 
}
 
bool CxfMeasurementSpec::hasWavelengthRange() const
/trunk/Scribus/scribus/palettes/cxfmeasurementspec.h
33,9 → 33,9
static QVector<int> wavelengths(int start, int increment, int count);
protected:
CxfMeasurementType m_measurementType;
int m_waveLengthStart;
int m_waveLengthIncrement;
CxfMeasurementType m_measurementType { cxfMeasurementUnknown };
int m_waveLengthStart { 0 };
int m_waveLengthIncrement { 0 };
};
 
#endif
/trunk/Scribus/scribus/palettes/cxfobject.cpp
10,8 → 10,9
#include "cxfobject.h"
 
CxfObject::CxfObject(CxfDocument* cxfDoc)
: m_cxfDoc(cxfDoc)
{
m_cxfDoc = cxfDoc;
 
}
 
const CxfColor* CxfObject::color(CxfColorType type) const
/trunk/Scribus/scribus/palettes/cxfobject.h
34,7 → 34,7
bool parse(QDomElement& elem);
 
protected:
CxfDocument* m_cxfDoc;
CxfDocument* m_cxfDoc { nullptr };
QString m_id;
QString m_name;