Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Removed C++17 nested namespace definitions. Should build on trusty again.

Browse Source
This commit is contained in:
Jim Evins
2017-11-24 15:49:26 -05:00
parent 4821e103bc
commit c9f2b91daf
129 changed files with 18995 additions and 18592 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/Markup.h
+95 -92
View File
@@ -27,129 +27,132 @@
#include <QPainterPath>
namespace glabels::model
namespace glabels
{
class Markup
namespace model
{
public:
virtual Markup* dup() const = 0;
const QPainterPath& path() const;
class Markup
{
public:
virtual Markup* dup() const = 0;
protected:
QPainterPath mPath;
};
const QPainterPath& path() const;
protected:
QPainterPath mPath;
};
class MarkupMargin : public Markup
{
public:
MarkupMargin( const Frame* frame,
const Distance& size );
class MarkupMargin : public Markup
{
public:
MarkupMargin( const Frame* frame,
const Distance& size );
Distance size() const;
Distance size() const;
Markup* dup() const override;
Markup* dup() const override;
private:
const Frame* mFrame;
Distance mSize;
};
private:
const Frame* mFrame;
Distance mSize;
};
class MarkupLine : public Markup
{
public:
MarkupLine( const Distance& x1,
const Distance& y1,
const Distance& x2,
const Distance& y2 );
class MarkupLine : public Markup
{
public:
MarkupLine( const Distance& x1,
const Distance& y1,
const Distance& x2,
const Distance& y2 );
Distance x1() const;
Distance y1() const;
Distance x2() const;
Distance y2() const;
Distance x1() const;
Distance y1() const;
Distance x2() const;
Distance y2() const;
Markup* dup() const override;
Markup* dup() const override;
private:
Distance mX1;
Distance mY1;
Distance mX2;
Distance mY2;
};
private:
Distance mX1;
Distance mY1;
Distance mX2;
Distance mY2;
};
class MarkupRect : public Markup
{
public:
MarkupRect( const Distance& x1,
const Distance& y1,
const Distance& w,
const Distance& h,
const Distance& r );
class MarkupRect : public Markup
{
public:
MarkupRect( const Distance& x1,
const Distance& y1,
const Distance& w,
const Distance& h,
const Distance& r );
Distance x1() const;
Distance y1() const;
Distance w() const;
Distance h() const;
Distance r() const;
Distance x1() const;
Distance y1() const;
Distance w() const;
Distance h() const;
Distance r() const;
Markup* dup() const override;
Markup* dup() const override;
private:
Distance mX1;
Distance mY1;
Distance mW;
Distance mH;
Distance mR;
};
private:
Distance mX1;
Distance mY1;
Distance mW;
Distance mH;
Distance mR;
};
class MarkupEllipse : public Markup
{
public:
MarkupEllipse( const Distance& x1,
const Distance& y1,
const Distance& w,
const Distance& h );
class MarkupEllipse : public Markup
{
public:
MarkupEllipse( const Distance& x1,
const Distance& y1,
const Distance& w,
const Distance& h );
Distance x1() const;
Distance y1() const;
Distance w() const;
Distance h() const;
Distance x1() const;
Distance y1() const;
Distance w() const;
Distance h() const;
Markup* dup() const override;
Markup* dup() const override;
private:
Distance mX1;
Distance mY1;
Distance mW;
Distance mH;
};
private:
Distance mX1;
Distance mY1;
Distance mW;
Distance mH;
};
class MarkupCircle : public Markup
{
public:
MarkupCircle( const Distance& x0,
const Distance& y0,
const Distance& r );
class MarkupCircle : public Markup
{
public:
MarkupCircle( const Distance& x0,
const Distance& y0,
const Distance& r );
Distance x0() const;
Distance y0() const;
Distance r() const;
Distance x0() const;
Distance y0() const;
Distance r() const;
Markup* dup() const override;
Markup* dup() const override;
private:
Distance mX0;
Distance mY0;
Distance mR;
};
private:
Distance mX0;
Distance mY0;
Distance mR;
};
}
}