Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 9389 → Rev 9390

/branches/Version13x/Scribus/scribus/scribusstructs.h
19,6 → 19,7
#include <qkeysequence.h>
#include <vector>
 
#include "scribusapi.h"
#include "sctextstruct.h"
#include "scfonts.h"
#include "fpointarray.h"
26,6 → 27,8
#include "annotation.h"
#include "pageitem.h"
 
extern bool SCRIBUS_API compareDouble(double, double);
 
typedef struct
{
int r;
249,6 → 252,19
int LineJoin;
QString Color;
int Shade;
bool operator==(const SingleLine& other) const
{
if (!compareDouble(Width, other.Width) )
return false;
if ((Dash != other.Dash) || (LineEnd != other.LineEnd) || (LineJoin != other.LineJoin) ||
(Color != other.Color)|| (Shade != other.Shade))
return false;
return true;
}
bool operator!=(const SingleLine& other) const
{
return !(*this == other);
}
};
 
struct ArrowDesc
335,8 → 351,13
typedef QMap<QString,QString> ProfilesL;
// typedef QValueVector<SingleLine> multiLine;
 
struct multiLine : public QValueVector<SingleLine> {
class multiLine : public QValueVector<SingleLine> {
public:
QString shortcut;
bool operator!=(const multiLine& other) const
{
return !(this->operator ==(other));
}
};
 
typedef enum {