Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25210 → Rev 25211

/branches/Version15x/Scribus/scribus/desaxe/actions.h
37,7 → 37,7
 
Digester* dig {nullptr};
private:
int refs;
int refs { 0 };
friend class Action;
};
 
100,7 → 100,7
body->refs = 1;
}
 
Action_body* body;
Action_body* body { nullptr };
 
private:
Action(); // not defined
/branches/Version15x/Scribus/scribus/desaxe/digester.h
36,7 → 36,7
class VarPtr
{
public:
void* ptr;
void* ptr { nullptr };
std::string type;
};
 
75,10 → 75,11
 
 
 
class Patch {
class Patch
{
public:
// internal linked list
Patch* next;
Patch* next { nullptr };
Patch(Patch* nxt) : next(nxt) {}
 
virtual void run(VarPtr lnk) = 0;
284,7 → 285,7
struct Patch2 : public Patch
{
typedef void (ObjType::*FunType2)(LinkType*);
ObjType* obj;
ObjType* obj { nullptr };
FunType2 fun;
Patch2(ObjType* ob, FunType2 fn, Patch* nxt = nullptr) : Patch(nxt), obj(ob), fun(fn) {}
/branches/Version15x/Scribus/scribus/numeration.h
33,7 → 33,7
class Numeration
{
public:
Numeration() : numFormat(Type_1_2_3), asterix(QString()), lead('0'), range(NSRdocument) {}
Numeration() : numFormat(Type_1_2_3), asterix(QString()), lead('0') {}
Numeration(NumFormat f) : numFormat(f), asterix("*") {}
QString numString(int num) const;
42,7 → 42,7
QString asterix;
QChar lead;
int len { 0 };
NumerationRange range;
NumerationRange range { NSRdocument };
QString prefix;
QString suffix;
int start { 1 };
/branches/Version15x/Scribus/scribus/scribusdoc.cpp
135,11 → 135,8
*/
class DocUpdater : public Observer<ScPage*>, public Observer<PageItem*>
{
ScribusDoc* doc;
int m_updateEnabled;
bool m_docChangeNeeded;
public:
DocUpdater(ScribusDoc* d) : doc(d), m_updateEnabled(0), m_docChangeNeeded(false) {}
DocUpdater(ScribusDoc* d) : doc(d) {}
 
bool inUpdateSession() const
{
204,6 → 201,11
{
m_docChangeNeeded = changeNeeded;
}
 
private:
ScribusDoc* doc { nullptr };
int m_updateEnabled { 0 };
bool m_docChangeNeeded { false };
};
 
 
/branches/Version15x/Scribus/scribus/sctextstruct.h
83,7 → 83,8
class SCRIBUS_API ExpansionPoint
{
public:
enum ExpansionType {
enum ExpansionType
{
Invalid,
PageNumber,
PageCount,
/branches/Version15x/Scribus/scribus/styles/paragraphstyle.h
68,8 → 68,8
 
struct TabRecord
{
qreal tabPosition;
int tabType;
qreal tabPosition { 0 };
int tabType { 0 };
QChar tabFillChar;
bool operator==(const TabRecord& other) const;
bool operator<(const TabRecord& other) const { return tabPosition < other.tabPosition; }
/branches/Version15x/Scribus/scribus/transaction.h
40,7 → 40,8
class SCRIBUS_API Transaction {
 
public:
enum Status {
enum Status
{
STATE_OPEN,
STATE_WILLFAIL,
STATE_FAILED,
52,12 → 53,12
public:
virtual ~TransactionStateBase() = default;
 
Status m_status;
Status m_status { STATE_OPEN };
};
Transaction(TransactionStateBase* data) : m_data(data)
{
if (data != 0)
if (data != nullptr)
m_data->m_status = STATE_OPEN;
}