r21816 by craig - Rename Style class to avoid conflict on OSX
scribus-commit
scribus-commit at lists.scribus.net
Sat Mar 11 19:52:14 UTC 2017
Author: craig
Date: Sat Mar 11 19:52:13 2017
New Revision: 21816
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21816
Log:
Rename Style class to avoid conflict on OSX
Modified:
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/style.h
trunk/Scribus/scribus/styles/cellstyle.cpp
trunk/Scribus/scribus/styles/cellstyle.h
trunk/Scribus/scribus/styles/charstyle.cpp
trunk/Scribus/scribus/styles/charstyle.h
trunk/Scribus/scribus/styles/linestyle.cpp
trunk/Scribus/scribus/styles/linestyle.h
trunk/Scribus/scribus/styles/paragraphstyle.cpp
trunk/Scribus/scribus/styles/paragraphstyle.h
trunk/Scribus/scribus/styles/style.cpp
trunk/Scribus/scribus/styles/style.h
trunk/Scribus/scribus/styles/stylecontext.h
trunk/Scribus/scribus/styles/stylecontextproxy.cpp
trunk/Scribus/scribus/styles/stylecontextproxy.h
trunk/Scribus/scribus/styles/styleset.h
trunk/Scribus/scribus/styles/tablestyle.cpp
trunk/Scribus/scribus/styles/tablestyle.h
trunk/Scribus/scribus/ui/smcellstyle.cpp
trunk/Scribus/scribus/ui/smtablestyle.cpp
trunk/Scribus/scribus/ui/smtextstyles.cpp
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sat Mar 11 19:52:13 2017
@@ -7832,7 +7832,7 @@
void ScribusDoc::itemSelection_SetNamedCharStyle(const QString& name, Selection* customSelection)
{
CharStyle newStyle;
- newStyle.setParent(name.isEmpty()? Style::INHERIT_PARENT : name);
+ newStyle.setParent(name.isEmpty()? BaseStyle::INHERIT_PARENT : name);
itemSelection_ApplyCharStyle(newStyle, customSelection, "NAMED_STYLE");
}
@@ -7841,7 +7841,7 @@
void ScribusDoc::itemSelection_SetNamedParagraphStyle(const QString& name, Selection* customSelection)
{
ParagraphStyle newStyle;
- newStyle.setParent(name.isEmpty()? Style::INHERIT_PARENT : name);
+ newStyle.setParent(name.isEmpty()? BaseStyle::INHERIT_PARENT : name);
itemSelection_ApplyParagraphStyle(newStyle, customSelection, true);
}
Modified: trunk/Scribus/scribus/style.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/style.h
==============================================================================
--- trunk/Scribus/scribus/style.h (original)
+++ trunk/Scribus/scribus/style.h Sat Mar 11 19:52:13 2017
@@ -34,7 +34,7 @@
* the stored m_contextversion against the StyleContext's version and updates all
* attributes if they are different.
*/
-class SCRIBUS_API Style : public SaxIO {
+class SCRIBUS_API BaseStyle : public SaxIO {
protected:
bool m_isDefaultStyle;
QString m_name;
@@ -45,11 +45,11 @@
public:
// static const short NOVALUE = -16000;
- Style(): m_isDefaultStyle(false), m_name(""), m_context(NULL), m_contextversion(-1), m_parent(""), m_shortcut() {}
+ BaseStyle(): m_isDefaultStyle(false), m_name(""), m_context(NULL), m_contextversion(-1), m_parent(""), m_shortcut() {}
- Style(StyleContext* b, QString n): m_isDefaultStyle(false), m_name(n), m_context(b), m_contextversion(-1), m_parent(""), m_shortcut() {}
+ BaseStyle(StyleContext* b, QString n): m_isDefaultStyle(false), m_name(n), m_context(b), m_contextversion(-1), m_parent(""), m_shortcut() {}
- Style& operator=(const Style& o)
+ BaseStyle& operator=(const BaseStyle& o)
{ //assert(typeinfo() == o.typeinfo());
m_isDefaultStyle = o.m_isDefaultStyle;
m_name = o.m_name;
@@ -60,10 +60,10 @@
return *this;
}
- Style(const Style& o) : SaxIO(), m_isDefaultStyle(o.m_isDefaultStyle),m_name(o.m_name),
+ BaseStyle(const BaseStyle& o) : SaxIO(), m_isDefaultStyle(o.m_isDefaultStyle),m_name(o.m_name),
m_context(o.m_context), m_contextversion(o.m_contextversion), m_parent(o.m_parent), m_shortcut(o.m_shortcut) {}
- virtual ~Style() {}
+ virtual ~BaseStyle() {}
// this is an abstract class, so:
@@ -94,7 +94,7 @@
QString parent() const { return m_parent; }
void setParent(const QString& p);
bool hasParent() const { return ! m_parent.isEmpty(); }
- const Style* parentStyle() const;
+ const BaseStyle* parentStyle() const;
bool canInherit(const QString& parentName) const;
@@ -110,11 +110,11 @@
virtual void update(const StyleContext* b = NULL);
/**
- Checks if this Style needs an update
+ Checks if this BaseStyle needs an update
*/
inline void validate() const {
if (m_context && m_contextversion != m_context->version()) {
- const_cast<Style*>(this)->update(m_context);
+ const_cast<BaseStyle*>(this)->update(m_context);
assert( m_context->checkConsistency() );
}
}
@@ -127,14 +127,14 @@
have the same parent, and agree on all attributes which are not inherited.
The StyleContext, the name and any inherited attrinutes may be different.
*/
- virtual bool equiv(const Style& other) const = 0;
+ virtual bool equiv(const BaseStyle& other) const = 0;
/**
returns true if both Styles are equivalent and have the same name.
Since the context is not tested, this does *not* ensure they will return
the same values for all attributes.
*/
- virtual bool operator==(const Style& other) const { return name() == other.name() && equiv(other); }
- virtual bool operator!=(const Style& other) const { return ! ( (*this) == other ); }
+ virtual bool operator==(const BaseStyle& other) const { return name() == other.name() && equiv(other); }
+ virtual bool operator!=(const BaseStyle& other) const { return ! ( (*this) == other ); }
/**
resets all attributes to their defaults and makes them inherited.
@@ -144,7 +144,7 @@
/**
if other has a parent, replace this parent with the other ones
*/
- void applyStyle(const Style& other) {
+ void applyStyle(const BaseStyle& other) {
if (other.hasParent())
setParent( other.parent() == INHERIT_PARENT? "" :other.parent());
m_contextversion = -1;
@@ -152,7 +152,7 @@
/**
if other has the same parent, remove this parent
*/
- void eraseStyle(const Style& other) {
+ void eraseStyle(const BaseStyle& other) {
if (other.parent() == parent())
setParent("");
m_contextversion = -1;
Modified: trunk/Scribus/scribus/styles/cellstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/cellstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/cellstyle.cpp (original)
+++ trunk/Scribus/scribus/styles/cellstyle.cpp Sat Mar 11 19:52:13 2017
@@ -24,7 +24,7 @@
return parentStyle()->displayName() + "+";
}
-bool CellStyle::equiv(const Style& other) const
+bool CellStyle::equiv(const BaseStyle& other) const
{
other.validate();
const CellStyle *p_other = dynamic_cast<const CellStyle*> (&other);
@@ -50,7 +50,7 @@
void CellStyle::update(const StyleContext* context)
{
- Style::update(context);
+ BaseStyle::update(context);
const CellStyle* parent = dynamic_cast<const CellStyle*>(parentStyle());
if (parent) {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
@@ -64,7 +64,7 @@
void CellStyle::getNamedResources(ResourceCollection& lists) const
{
- for (const Style* style = parentStyle(); style != NULL; style = style->parentStyle())
+ for (const BaseStyle* style = parentStyle(); style != NULL; style = style->parentStyle())
lists.collectCellStyle(style->name());
lists.collectColor(fillColor());
// TODO: Collect border colors.
Modified: trunk/Scribus/scribus/styles/cellstyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/cellstyle.h
==============================================================================
--- trunk/Scribus/scribus/styles/cellstyle.h (original)
+++ trunk/Scribus/scribus/styles/cellstyle.h Sat Mar 11 19:52:13 2017
@@ -29,18 +29,18 @@
/**
* The CellStyle class represents a style for a table cell.
*/
-class SCRIBUS_API CellStyle : public Style {
+class SCRIBUS_API CellStyle : public BaseStyle {
public:
/**
* Constructs a new cell style with all attributes inherited.
*/
- CellStyle() : Style(), cellStyleProxy(this) {
+ CellStyle() : BaseStyle(), cellStyleProxy(this) {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = attr_DEFAULT; \
inh_##attr_NAME = true;
#include "cellstyle.attrdefs.cxx"
#undef ATTRDEF
- };
+ }
/**
* Constructs a new cell style with values and inheritance states of the
@@ -78,7 +78,7 @@
*
* @param other the other cell style.
*/
- bool equiv(const Style& other) const;
+ bool equiv(const BaseStyle& other) const;
/**
* Resets all non-inherited attributes in this style to their default values.
@@ -170,7 +170,7 @@
inline CellStyle& CellStyle::operator=(const CellStyle& other)
{
- static_cast<Style&>(*this) = static_cast<const Style&>(other);
+ static_cast<BaseStyle&>(*this) = static_cast<const BaseStyle&>(other);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = other.m_##attr_NAME; \
inh_##attr_NAME = other.inh_##attr_NAME;
@@ -180,7 +180,7 @@
return *this;
}
-inline CellStyle::CellStyle(const CellStyle& other) : Style(other), cellStyleProxy(this)
+inline CellStyle::CellStyle(const CellStyle& other) : BaseStyle(other), cellStyleProxy(this)
{
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = other.m_##attr_NAME; \
Modified: trunk/Scribus/scribus/styles/charstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/charstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/charstyle.cpp (original)
+++ trunk/Scribus/scribus/styles/charstyle.cpp Sat Mar 11 19:52:13 2017
@@ -114,12 +114,12 @@
void CharStyle::applyCharStyle(const CharStyle & other)
{
- if (other.hasParent() && (other.parent() != Style::INHERIT_PARENT))
+ if (other.hasParent() && (other.parent() != BaseStyle::INHERIT_PARENT))
{
setStyle(other);
return;
}
- Style::applyStyle(other);
+ BaseStyle::applyStyle(other);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
if (! other.inh_##attr_NAME) \
set##attr_NAME(other.m_##attr_NAME);
@@ -131,7 +131,7 @@
void CharStyle::eraseCharStyle(const CharStyle & other)
{
other.validate();
- Style::eraseStyle(other);
+ BaseStyle::eraseStyle(other);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
if (!inh_##attr_NAME && m_##attr_NAME == other.m_##attr_NAME) \
reset##attr_NAME();
@@ -150,7 +150,7 @@
updateFeatures();
}
-bool CharStyle::equiv(const Style & other) const
+bool CharStyle::equiv(const BaseStyle & other) const
{
other.validate();
const CharStyle * oth = reinterpret_cast<const CharStyle*> ( & other );
@@ -226,7 +226,7 @@
void CharStyle::update(const StyleContext* context)
{
- Style::update(context);
+ BaseStyle::update(context);
const CharStyle * oth = dynamic_cast<const CharStyle*> ( parentStyle() );
if (oth) {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
@@ -395,7 +395,7 @@
void CharStyle::getNamedResources(ResourceCollection& lists) const
{
- for (const Style* sty = parentStyle(); sty != NULL; sty = sty->parentStyle())
+ for (const BaseStyle* sty = parentStyle(); sty != NULL; sty = sty->parentStyle())
lists.collectCharStyle(sty->name());
lists.collectColor(fillColor());
lists.collectFontfeatures(fontFeatures());
@@ -476,7 +476,7 @@
void CharStyle::saxx(SaxHandler& handler, const Xml_string& elemtag) const
{
Xml_attr att;
- Style::saxxAttributes(att);
+ BaseStyle::saxxAttributes(att);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
if (!inh_##attr_NAME) \
att.insert(# attr_NAME, toXMLString(m_##attr_NAME));
@@ -515,7 +515,7 @@
Xml_string stylePrefix(Digester::concat(prefixPattern, elemtag));
ruleset.addRule(stylePrefix, Factory<CharStyle>());
ruleset.addRule(stylePrefix, IdRef<CharStyle>());
- Style::desaxeRules<CharStyle>(prefixPattern, ruleset, elemtag);
+ BaseStyle::desaxeRules<CharStyle>(prefixPattern, ruleset, elemtag);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
ruleset.addRule(stylePrefix, SetAttributeWithConversion<CharStyle, attr_TYPE> ( & CharStyle::set##attr_NAME, # attr_NAME, &parse<attr_TYPE> ));
#include "charstyle.attrdefs.cxx"
Modified: trunk/Scribus/scribus/styles/charstyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/charstyle.h
==============================================================================
--- trunk/Scribus/scribus/styles/charstyle.h (original)
+++ trunk/Scribus/scribus/styles/charstyle.h Sat Mar 11 19:52:13 2017
@@ -77,7 +77,7 @@
bool operator!= (const StyleFlagValue right) const;
};
-class SCRIBUS_API CharStyle : public Style {
+class SCRIBUS_API CharStyle : public BaseStyle {
public:
static const QString INHERIT;
@@ -93,7 +93,7 @@
static const QString ALLCAPS;
static const QString SMALLCAPS;
- CharStyle() : Style() {
+ CharStyle() : BaseStyle() {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
m_##attr_NAME = attr_DEFAULT; \
inh_##attr_NAME = true;
@@ -102,7 +102,7 @@
m_isDefaultStyle=false;
}
- CharStyle(const ScFace& font, int size, StyleFlag style = ScStyle_Default) : Style() {
+ CharStyle(const ScFace& font, int size, StyleFlag style = ScStyle_Default) : BaseStyle() {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
m_##attr_NAME = attr_DEFAULT; \
inh_##attr_NAME = true;
@@ -136,7 +136,7 @@
Used for font effects */
void updateFeatures();
- bool equiv(const Style& other) const;
+ bool equiv(const BaseStyle& other) const;
bool equivForShaping(const CharStyle &other) const;
void applyCharStyle(const CharStyle & other);
@@ -207,7 +207,7 @@
inline CharStyle & CharStyle::operator=(const CharStyle & other)
{
- static_cast<Style&>(*this) = static_cast<const Style&>(other);
+ static_cast<BaseStyle&>(*this) = static_cast<const BaseStyle&>(other);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
m_##attr_NAME = other.m_##attr_NAME; \
inh_##attr_NAME = other.inh_##attr_NAME;
@@ -219,7 +219,7 @@
return *this;
}
-inline CharStyle::CharStyle(const CharStyle & other) : Style(other)
+inline CharStyle::CharStyle(const CharStyle & other) : BaseStyle(other)
{
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT, attr_BREAKSHAPING) \
m_##attr_NAME = other.m_##attr_NAME; \
Modified: trunk/Scribus/scribus/styles/linestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/linestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/linestyle.cpp (original)
+++ trunk/Scribus/scribus/styles/linestyle.cpp Sat Mar 11 19:52:13 2017
@@ -21,7 +21,7 @@
void LineStyle::applyLineStyle(const LineStyle & other)
{
- Style::applyStyle(other);
+ BaseStyle::applyStyle(other);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
if (! other.inh_##attr_NAME) \
set##attr_NAME(other.m_##attr_NAME);
@@ -33,7 +33,7 @@
void LineStyle::eraseLineStyle(const LineStyle & other)
{
other.validate();
- Style::eraseStyle(other);
+ BaseStyle::eraseStyle(other);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
if (!inh_##attr_NAME && m_##attr_NAME == other.m_##attr_NAME) \
reset##attr_NAME();
@@ -41,7 +41,7 @@
#undef ATTRDEF
}
-bool LineStyle::equiv(const Style & other) const
+bool LineStyle::equiv(const BaseStyle & other) const
{
other.validate();
const LineStyle * oth = dynamic_cast<const LineStyle*> ( & other );
@@ -101,7 +101,7 @@
void LineStyle::update(const StyleContext* context)
{
- Style::update(context);
+ BaseStyle::update(context);
const LineStyle * oth = dynamic_cast<const LineStyle*> ( parentStyle() );
if (oth) {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
@@ -129,7 +129,7 @@
QList<LineStyle>::const_iterator it, itend = m_Sublines.constEnd();
lists.collectColor(color());
- for (const Style* sty = parentStyle(); sty != NULL; sty = sty->parentStyle())
+ for (const BaseStyle* sty = parentStyle(); sty != NULL; sty = sty->parentStyle())
lists.collectLineStyle(sty->name());
for (it = m_Sublines.begin(); it != itend; ++it)
(*it).getNamedResources(lists);
@@ -197,7 +197,7 @@
void LineStyle::saxx(SaxHandler& handler, const Xml_string& elemtag) const
{
Xml_attr att;
- Style::saxxAttributes(att);
+ BaseStyle::saxxAttributes(att);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
if (!inh_##attr_NAME && strcmp(# attr_NAME, "Sublines") != 0 ) \
att.insert(# attr_NAME, toXMLString(m_##attr_NAME));
@@ -255,14 +255,14 @@
Xml_string stylePrefix(Digester::concat(prefixPattern, elemtag));
ruleset.addRule(stylePrefix, Factory<LineStyle>());
ruleset.addRule(stylePrefix, IdRef<LineStyle>());
- Style::desaxeRules<LineStyle>(prefixPattern, ruleset, elemtag);
+ BaseStyle::desaxeRules<LineStyle>(prefixPattern, ruleset, elemtag);
// "**" doesnt work yet - av
// Xml_string stylePrefixRec(Digester::concat(stylePrefix, "**"));
const Xml_string& stylePrefixRec(stylePrefix);
Xml_string subPrefix(Digester::concat(stylePrefixRec, "subline"));
ruleset.addRule(subPrefix, Factory<LineStyle>());
- Style::desaxeRules<LineStyle>(stylePrefixRec, ruleset, "subline");
+ BaseStyle::desaxeRules<LineStyle>(stylePrefixRec, ruleset, "subline");
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
if ( strcmp(# attr_NAME, "Sublines") != 0 ) { \
Modified: trunk/Scribus/scribus/styles/linestyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/linestyle.h
==============================================================================
--- trunk/Scribus/scribus/styles/linestyle.h (original)
+++ trunk/Scribus/scribus/styles/linestyle.h Sat Mar 11 19:52:13 2017
@@ -21,19 +21,19 @@
#include "style.h"
#include "styles/stylecontextproxy.h"
-class SCRIBUS_API LineStyle : public Style {
+class SCRIBUS_API LineStyle : public BaseStyle {
public:
- LineStyle() : Style(), lineStyleProxy(this) {
+ LineStyle() : BaseStyle(), lineStyleProxy(this) {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = attr_DEFAULT; \
inh_##attr_NAME = true;
#include "linestyle.attrdefs.cxx"
#undef ATTRDEF
- };
+ }
- LineStyle(qreal width, const QString& color, qreal shade=100) : Style(), lineStyleProxy(this) {
+ LineStyle(qreal width, const QString& color, qreal shade=100) : BaseStyle(), lineStyleProxy(this) {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = attr_DEFAULT; \
inh_##attr_NAME = true;
@@ -61,7 +61,7 @@
void update(const StyleContext * b);
- bool equiv(const Style& other) const;
+ bool equiv(const BaseStyle& other) const;
void applyLineStyle(const LineStyle & other);
void eraseLineStyle(const LineStyle & other);
@@ -128,7 +128,7 @@
inline LineStyle & LineStyle::operator=(const LineStyle & other)
{
- static_cast<Style&>(*this) = static_cast<const Style&>(other);
+ static_cast<BaseStyle&>(*this) = static_cast<const BaseStyle&>(other);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = other.m_##attr_NAME; \
inh_##attr_NAME = other.inh_##attr_NAME;
@@ -138,7 +138,7 @@
return *this;
}
-inline LineStyle::LineStyle(const LineStyle & other) : Style(other), lineStyleProxy(this)
+inline LineStyle::LineStyle(const LineStyle & other) : BaseStyle(other), lineStyleProxy(this)
{
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = other.m_##attr_NAME; \
Modified: trunk/Scribus/scribus/styles/paragraphstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/paragraphstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/paragraphstyle.cpp (original)
+++ trunk/Scribus/scribus/styles/paragraphstyle.cpp Sat Mar 11 19:52:13 2017
@@ -27,7 +27,7 @@
return isequiv(tabPosition, other.tabPosition) && tabType==other.tabType && tabFillChar == other.tabFillChar;
}
-ParagraphStyle::ParagraphStyle() : Style(), m_cstyleContext(NULL), m_cstyleContextIsInh(true), m_cstyle()
+ParagraphStyle::ParagraphStyle() : BaseStyle(), m_cstyleContext(NULL), m_cstyleContextIsInh(true), m_cstyle()
{
setParent("");
m_cstyleContext.setDefaultStyle( &m_cstyle );
@@ -42,7 +42,7 @@
}
-ParagraphStyle::ParagraphStyle(const ParagraphStyle& other) : Style(other), m_cstyleContext(NULL), m_cstyleContextIsInh(other.m_cstyleContextIsInh), m_cstyle(other.charStyle())
+ParagraphStyle::ParagraphStyle(const ParagraphStyle& other) : BaseStyle(other), m_cstyleContext(NULL), m_cstyleContextIsInh(other.m_cstyleContextIsInh), m_cstyle(other.charStyle())
{
if (m_cstyleContextIsInh)
m_cstyle.setContext(NULL);
@@ -78,7 +78,7 @@
}
-bool ParagraphStyle::equiv(const Style& other) const
+bool ParagraphStyle::equiv(const BaseStyle& other) const
{
other.validate();
const ParagraphStyle* oth = reinterpret_cast<const ParagraphStyle*> ( & other );
@@ -113,7 +113,7 @@
ParagraphStyle& ParagraphStyle::operator=(const ParagraphStyle& other)
{
- static_cast<Style&>(*this) = static_cast<const Style&>(other);
+ static_cast<BaseStyle&>(*this) = static_cast<const BaseStyle&>(other);
other.validate();
m_cstyle = other.charStyle();
@@ -142,7 +142,7 @@
void ParagraphStyle::setContext(const StyleContext* context)
{
- Style::setContext(context);
+ BaseStyle::setContext(context);
// qDebug() << QString("ParagraphStyle::setContext(%1) parent=%2").arg((unsigned long int)context).arg((unsigned long int)oth);
repairImplicitCharStyleInheritance();
}
@@ -164,7 +164,7 @@
void ParagraphStyle::update(const StyleContext* context)
{
- Style::update(context);
+ BaseStyle::update(context);
assert ( &m_cstyleContext != m_cstyle.context());
repairImplicitCharStyleInheritance();
@@ -187,12 +187,12 @@
void ParagraphStyle::applyStyle(const ParagraphStyle& other)
{
- if (other.hasParent() && (other.parent() != Style::INHERIT_PARENT))
+ if (other.hasParent() && (other.parent() != BaseStyle::INHERIT_PARENT))
{
setStyle(other);
return;
}
- Style::applyStyle(other);
+ BaseStyle::applyStyle(other);
m_cstyle.applyCharStyle(other.charStyle());
m_cstyleContext.invalidate();
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
@@ -206,7 +206,7 @@
void ParagraphStyle::eraseStyle(const ParagraphStyle& other)
{
other.validate();
- Style::eraseStyle(other);
+ BaseStyle::eraseStyle(other);
m_cstyle.eraseCharStyle(other.charStyle());
m_cstyleContext.invalidate();
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
@@ -233,7 +233,7 @@
void ParagraphStyle::getNamedResources(ResourceCollection& lists) const
{
- for (const Style *sty = parentStyle(); sty != NULL; sty = sty->parentStyle())
+ for (const BaseStyle *sty = parentStyle(); sty != NULL; sty = sty->parentStyle())
lists.collectStyle(sty->name());
charStyle().getNamedResources(lists);
@@ -281,7 +281,7 @@
void ParagraphStyle::saxx(SaxHandler& handler, const Xml_string& elemtag) const
{
Xml_attr att;
- Style::saxxAttributes(att);
+ BaseStyle::saxxAttributes(att);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
if (!inh_##attr_NAME && strcmp(# attr_NAME, "TabValues") != 0) \
att.insert(# attr_NAME, toXMLString(m_##attr_NAME));
@@ -386,7 +386,7 @@
Xml_string stylePrefix(Digester::concat(prefixPattern, elemtag));
ruleset.addRule(stylePrefix, Factory<ParagraphStyle>());
ruleset.addRule(stylePrefix, IdRef<ParagraphStyle>());
- Style::desaxeRules<ParagraphStyle>(prefixPattern, ruleset, elemtag);
+ BaseStyle::desaxeRules<ParagraphStyle>(prefixPattern, ruleset, elemtag);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
if ( strcmp(# attr_NAME, "TabValues") != 0) \
ruleset.addRule(stylePrefix, SetAttributeWithConversion<ParagraphStyle, attr_TYPE> ( & ParagraphStyle::set##attr_NAME, # attr_NAME, &parse<attr_TYPE> ));
Modified: trunk/Scribus/scribus/styles/paragraphstyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/paragraphstyle.h
==============================================================================
--- trunk/Scribus/scribus/styles/paragraphstyle.h (original)
+++ trunk/Scribus/scribus/styles/paragraphstyle.h Sat Mar 11 19:52:13 2017
@@ -24,7 +24,7 @@
class ResourceCollection;
-class SCRIBUS_API ParagraphStyle : public Style
+class SCRIBUS_API ParagraphStyle : public BaseStyle
{
public:
enum LineSpacingMode {
@@ -88,7 +88,7 @@
void setContext(const StyleContext* context);
void update(const StyleContext*);
- bool equiv(const Style& other) const;
+ bool equiv(const BaseStyle& other) const;
void applyStyle(const ParagraphStyle& other);
void eraseStyle(const ParagraphStyle& other);
Modified: trunk/Scribus/scribus/styles/style.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/style.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/style.cpp (original)
+++ trunk/Scribus/scribus/styles/style.cpp Sat Mar 11 19:52:13 2017
@@ -20,9 +20,9 @@
#include "desaxe/simple_actions.h"
#include "desaxe/saxiohelper.h"
-const QString Style::INHERIT_PARENT = "\n";
+const QString BaseStyle::INHERIT_PARENT = "\n";
-void Style::setContext(const StyleContext* context)
+void BaseStyle::setContext(const StyleContext* context)
{
if (m_context != context) {
m_context = context;
@@ -32,14 +32,14 @@
//qDebug() << QString("setContext of %2 context %1").arg(reinterpret_cast<uint>(m_context),16).arg(reinterpret_cast<uint>(this),16);
}
-void Style::setDefaultStyle(bool ids)
+void BaseStyle::setDefaultStyle(bool ids)
{
if (ids && hasParent())
setParent(QString(""));
m_isDefaultStyle = ids;
}
-void Style::setParent(const QString& p)
+void BaseStyle::setParent(const QString& p)
{
if (m_isDefaultStyle && !p.isEmpty())
{
@@ -51,7 +51,7 @@
m_parent = p.isEmpty()? "" : p;
}
-void Style::update(const StyleContext* b)
+void BaseStyle::update(const StyleContext* b)
{
if (b)
m_context = b;
@@ -59,29 +59,29 @@
m_contextversion = m_context->version();
}
-const Style* Style::parentStyle() const
+const BaseStyle* BaseStyle::parentStyle() const
{
//qDebug() << QString("follow %1").arg(reinterpret_cast<uint>(m_context),16);
if (m_isDefaultStyle)
return NULL;
- const Style * par = m_context ? m_context->resolve(m_parent) : NULL;
+ const BaseStyle * par = m_context ? m_context->resolve(m_parent) : NULL;
if (par == this) return NULL; else return par;
}
-bool Style::canInherit(const QString& parentName) const
+bool BaseStyle::canInherit(const QString& parentName) const
{
if (m_name.isEmpty() || parentName.isEmpty())
return true;
if (!m_context || (m_name == parentName))
return false;
- const Style* parentStyle = m_context->resolve(parentName);
+ const BaseStyle* parentStyle = m_context->resolve(parentName);
if (!parentStyle)
return false;
bool loop = false, parentLoop = false;
- const Style* pStyle = parentStyle;
+ const BaseStyle* pStyle = parentStyle;
while (pStyle)
{
if (pStyle->hasParent() && (pStyle->parent() == m_name))
@@ -95,7 +95,7 @@
return (!parentLoop);
}
-void Style::saxxAttributes(Xml_attr& attr) const
+void BaseStyle::saxxAttributes(Xml_attr& attr) const
{
if (!name().isEmpty())
attr["name"] = name();
Modified: trunk/Scribus/scribus/styles/style.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/style.h
==============================================================================
--- trunk/Scribus/scribus/styles/style.h (original)
+++ trunk/Scribus/scribus/styles/style.h Sat Mar 11 19:52:13 2017
@@ -13,7 +13,7 @@
template<class SUBSTYLE>
inline
-void Style::desaxeRules(const Xml_string& prefixPattern, desaxe::Digester& ruleset, Xml_string elemtag)
+void BaseStyle::desaxeRules(const Xml_string& prefixPattern, desaxe::Digester& ruleset, Xml_string elemtag)
{
static QString emptyString;
Xml_string stylePrefix(Digester::concat(prefixPattern,elemtag));
Modified: trunk/Scribus/scribus/styles/stylecontext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/stylecontext.h
==============================================================================
--- trunk/Scribus/scribus/styles/stylecontext.h (original)
+++ trunk/Scribus/scribus/styles/stylecontext.h Sat Mar 11 19:52:13 2017
@@ -23,7 +23,7 @@
#include "scribusapi.h"
#include "observable.h"
-class Style;
+class BaseStyle;
/**
@@ -60,7 +60,7 @@
virtual bool contextContained(const StyleContext* context) const { return context == this; }
virtual bool checkConsistency() const { return true; }
- virtual const Style* resolve(const QString& name) const = 0;
+ virtual const BaseStyle* resolve(const QString& name) const = 0;
virtual ~StyleContext()
{
// qDebug(QString("destr. %1").arg(reinterpret_cast<uint>(this),16));
Modified: trunk/Scribus/scribus/styles/stylecontextproxy.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/stylecontextproxy.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/stylecontextproxy.cpp (original)
+++ trunk/Scribus/scribus/styles/stylecontextproxy.cpp Sat Mar 11 19:52:13 2017
@@ -18,7 +18,7 @@
#include "style.h"
#include "stylecontextproxy.h"
-const Style* StyleContextProxy::resolve(const QString& name) const
+const BaseStyle* StyleContextProxy::resolve(const QString& name) const
{
const StyleContext* context = m_default->context();
// if (!name.isEmpty())
Modified: trunk/Scribus/scribus/styles/stylecontextproxy.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/stylecontextproxy.h
==============================================================================
--- trunk/Scribus/scribus/styles/stylecontextproxy.h (original)
+++ trunk/Scribus/scribus/styles/stylecontextproxy.h Sat Mar 11 19:52:13 2017
@@ -33,9 +33,9 @@
class StyleContextProxy: public StyleContext
{
public:
- const Style* resolve(const QString& name) const;
+ const BaseStyle* resolve(const QString& name) const;
- StyleContextProxy(const Style* style)
+ StyleContextProxy(const BaseStyle* style)
: StyleContext(), m_default(style) {
}
@@ -50,9 +50,9 @@
return *this;
}
- const Style* defaultStyle() const { return m_default; }
+ const BaseStyle* defaultStyle() const { return m_default; }
- void setDefaultStyle(const Style* def) {
+ void setDefaultStyle(const BaseStyle* def) {
assert(def);
m_default = def;
invalidate();
@@ -72,7 +72,7 @@
}
private:
- const Style* m_default;
+ const BaseStyle* m_default;
};
#endif
Modified: trunk/Scribus/scribus/styles/styleset.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/styleset.h
==============================================================================
--- trunk/Scribus/scribus/styles/styleset.h (original)
+++ trunk/Scribus/scribus/styles/styleset.h Sat Mar 11 19:52:13 2017
@@ -32,7 +32,7 @@
inline int find(const QString& name) const;
- inline const Style* resolve(const QString& name) const;
+ inline const BaseStyle* resolve(const QString& name) const;
int count() const {
return styles.count();
@@ -139,7 +139,7 @@
}
template<class STYLE>
-inline const Style* StyleSet<STYLE>::resolve(const QString& name) const
+inline const BaseStyle* StyleSet<STYLE>::resolve(const QString& name) const
{
if (name.isEmpty())
return m_default;
Modified: trunk/Scribus/scribus/styles/tablestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/tablestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/tablestyle.cpp (original)
+++ trunk/Scribus/scribus/styles/tablestyle.cpp Sat Mar 11 19:52:13 2017
@@ -23,7 +23,7 @@
return parentStyle()->displayName() + "+";
}
-bool TableStyle::equiv(const Style& other) const
+bool TableStyle::equiv(const BaseStyle& other) const
{
other.validate();
const TableStyle *p_other = dynamic_cast<const TableStyle*> (&other);
@@ -49,7 +49,7 @@
void TableStyle::update(const StyleContext* context)
{
- Style::update(context);
+ BaseStyle::update(context);
const TableStyle* parent = dynamic_cast<const TableStyle*>(parentStyle());
if (parent) {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
@@ -63,7 +63,7 @@
void TableStyle::getNamedResources(ResourceCollection& lists) const
{
- for (const Style* style = parentStyle(); style != NULL; style = style->parentStyle())
+ for (const BaseStyle* style = parentStyle(); style != NULL; style = style->parentStyle())
lists.collectCellStyle(style->name());
lists.collectColor(fillColor());
// TODO: Collect colors of borders.
Modified: trunk/Scribus/scribus/styles/tablestyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/styles/tablestyle.h
==============================================================================
--- trunk/Scribus/scribus/styles/tablestyle.h (original)
+++ trunk/Scribus/scribus/styles/tablestyle.h Sat Mar 11 19:52:13 2017
@@ -27,18 +27,18 @@
/**
* The TableStyle class represents a style for a table.
*/
-class SCRIBUS_API TableStyle : public Style {
+class SCRIBUS_API TableStyle : public BaseStyle {
public:
/**
* Constructs a new table style with all attributes inherited.
*/
- TableStyle() : Style(), tableStyleProxy(this) {
+ TableStyle() : BaseStyle(), tableStyleProxy(this) {
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = attr_DEFAULT; \
inh_##attr_NAME = true;
#include "tablestyle.attrdefs.cxx"
#undef ATTRDEF
- };
+ }
/**
* Constructs a new table style with values and inheritance states of the
@@ -76,7 +76,7 @@
*
* @param other the other table style.
*/
- bool equiv(const Style& other) const;
+ bool equiv(const BaseStyle& other) const;
/**
* Resets all non-inherited attributes in this style to their default values.
@@ -165,7 +165,7 @@
inline TableStyle& TableStyle::operator=(const TableStyle& other)
{
- static_cast<Style&>(*this) = static_cast<const Style&>(other);
+ static_cast<BaseStyle&>(*this) = static_cast<const BaseStyle&>(other);
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = other.m_##attr_NAME; \
inh_##attr_NAME = other.inh_##attr_NAME;
@@ -175,7 +175,7 @@
return *this;
}
-inline TableStyle::TableStyle(const TableStyle& other) : Style(other), tableStyleProxy(this)
+inline TableStyle::TableStyle(const TableStyle& other) : BaseStyle(other), tableStyleProxy(this)
{
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \
m_##attr_NAME = other.m_##attr_NAME; \
Modified: trunk/Scribus/scribus/ui/smcellstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/ui/smcellstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstyle.cpp (original)
+++ trunk/Scribus/scribus/ui/smcellstyle.cpp Sat Mar 11 19:52:13 2017
@@ -89,7 +89,7 @@
if (m_cachedStyles[i].hasParent())
{
- const Style* parentStyle = m_cachedStyles[i].parentStyle();
+ const BaseStyle* parentStyle = m_cachedStyles[i].parentStyle();
if (parentStyle)
parentName = parentStyle->displayName();
}
@@ -497,14 +497,14 @@
Q_ASSERT(!parent.isNull());
bool loop = false, parentLoop = false;
- const Style* parentStyle = (!parent.isEmpty()) ? m_cachedStyles.resolve(parent) : NULL;
+ const BaseStyle* parentStyle = (!parent.isEmpty()) ? m_cachedStyles.resolve(parent) : NULL;
QStringList sel;
for (int i = 0; i < m_selection.count(); ++i)
{
loop = false;
// Check if setting parent won't create a loop
- const Style* pStyle = parentStyle;
+ const BaseStyle* pStyle = parentStyle;
while (pStyle)
{
if (pStyle->hasParent() && (pStyle->parent() == m_selection[i]->name()))
Modified: trunk/Scribus/scribus/ui/smtablestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/ui/smtablestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestyle.cpp (original)
+++ trunk/Scribus/scribus/ui/smtablestyle.cpp Sat Mar 11 19:52:13 2017
@@ -85,7 +85,7 @@
if (m_cachedStyles[i].hasParent())
{
- const Style* parentStyle = m_cachedStyles[i].parentStyle();
+ const BaseStyle* parentStyle = m_cachedStyles[i].parentStyle();
if (parentStyle)
parentName = parentStyle->displayName();
}
@@ -495,14 +495,14 @@
Q_ASSERT(!parent.isNull());
bool loop = false, parentLoop = false;
- const Style* parentStyle = (!parent.isEmpty()) ? m_cachedStyles.resolve(parent) : NULL;
+ const BaseStyle* parentStyle = (!parent.isEmpty()) ? m_cachedStyles.resolve(parent) : NULL;
QStringList sel;
for (int i = 0; i < m_selection.count(); ++i)
{
loop = false;
// Check if setting parent won't create a loop
- const Style* pStyle = parentStyle;
+ const BaseStyle* pStyle = parentStyle;
while (pStyle)
{
if (pStyle->hasParent() && (pStyle->parent() == m_selection[i]->name()))
Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21816&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp (original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp Sat Mar 11 19:52:13 2017
@@ -113,7 +113,7 @@
if (m_tmpStyles[i].hasParent())
{
- const Style* parentStyle = m_tmpStyles[i].parentStyle();
+ const BaseStyle* parentStyle = m_tmpStyles[i].parentStyle();
if (parentStyle)
parentName = parentStyle->displayName();
}
@@ -1954,14 +1954,14 @@
Q_ASSERT(!parent.isNull());
bool loop = false, parentLoop = false;
- const Style* parentStyle = (!parent.isEmpty()) ? m_tmpStyles.resolve(parent) : NULL;
+ const BaseStyle* parentStyle = (!parent.isEmpty()) ? m_tmpStyles.resolve(parent) : NULL;
QStringList sel;
for (int i = 0; i < m_selection.count(); ++i)
{
loop = false;
// Check if setting parent won't create a loop
- const Style* pStyle = parentStyle;
+ const BaseStyle* pStyle = parentStyle;
while (pStyle)
{
if (pStyle->hasParent() && (pStyle->parent() == m_selection[i]->name()))
@@ -2149,7 +2149,7 @@
if (m_tmpStyles[i].hasParent())
{
- const Style* parentStyle = m_tmpStyles[i].parentStyle();
+ const BaseStyle* parentStyle = m_tmpStyles[i].parentStyle();
if (parentStyle)
parentName = parentStyle->displayName();
}
@@ -3039,14 +3039,14 @@
Q_ASSERT(!parent.isNull());
bool loop = false, parentLoop = false;
- const Style* parentStyle = (!parent.isEmpty()) ? m_tmpStyles.resolve(parent) : NULL;
+ const BaseStyle* parentStyle = (!parent.isEmpty()) ? m_tmpStyles.resolve(parent) : NULL;
QStringList sel;
for (int i = 0; i < m_selection.count(); ++i)
{
loop = false;
// Check if setting parent won't create a loop
- const Style* pStyle = parentStyle;
+ const BaseStyle* pStyle = parentStyle;
while (pStyle)
{
if (pStyle->hasParent() && (pStyle->parent() == m_selection[i]->name()))
More information about the scribus-commit
mailing list