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

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
+39 -36
View File
@@ -26,53 +26,56 @@
#include <QPainterPath>
namespace glabels::model
namespace glabels
{
// Forward references
class ModelObject;
///
/// Outline Base Class
///
class Outline
namespace model
{
////////////////////////////
// Lifecycle Methods
////////////////////////////
public:
Outline( ModelObject* owner );
Outline( const Outline* outline, ModelObject* newOwner );
virtual ~Outline();
// Forward references
class ModelObject;
///
/// Outline Base Class
///
class Outline
{
////////////////////////////
// Lifecycle Methods
////////////////////////////
public:
Outline( ModelObject* owner );
Outline( const Outline* outline, ModelObject* newOwner );
virtual ~Outline();
////////////////////////////
// Duplication
////////////////////////////
Outline* clone( ModelObject* newOwner ) const;
////////////////////////////
// Duplication
////////////////////////////
Outline* clone( ModelObject* newOwner ) const;
////////////////////////////
// Drawing Methods
////////////////////////////
public:
void draw( QPainter* painter ) const;
QPainterPath hoverPath( double scale ) const;
////////////////////////////
// Drawing Methods
////////////////////////////
public:
void draw( QPainter* painter ) const;
QPainterPath hoverPath( double scale ) const;
////////////////////////////
// Private Data
////////////////////////////
private:
ModelObject* mOwner;
////////////////////////////
// Private Data
////////////////////////////
private:
ModelObject* mOwner;
QVector<qreal> mDashes;
QPen mPen1;
QPen mPen2;
QVector<qreal> mDashes;
QPen mPen1;
QPen mPen2;
};
};
}
}