Pointer cleanup (#242)
- Made greater use of smart pointers, eliminating many instances of manual memory management - Do not use pointers at all for many non-polymorphic classes - Assorted other code cleanup
This commit is contained in:
+13
-15
@@ -35,16 +35,16 @@ namespace glabels
|
||||
Q_DECLARE_TR_FUNCTIONS(FrameCd)
|
||||
|
||||
public:
|
||||
FrameCd( const Distance& r1,
|
||||
const Distance& r2,
|
||||
const Distance& w,
|
||||
const Distance& h,
|
||||
const Distance& waste,
|
||||
const QString& id = "0" );
|
||||
FrameCd( Distance r1,
|
||||
Distance r2,
|
||||
Distance w,
|
||||
Distance h,
|
||||
Distance waste,
|
||||
const QString& id = "0" );
|
||||
|
||||
FrameCd( const FrameCd &other ) = default;
|
||||
|
||||
Frame *dup() const override;
|
||||
std::unique_ptr<Frame> clone() const override;
|
||||
|
||||
Distance r1() const;
|
||||
Distance r2() const;
|
||||
@@ -53,13 +53,15 @@ namespace glabels
|
||||
Distance w() const override;
|
||||
Distance h() const override;
|
||||
|
||||
QString sizeDescription( const Units& units ) const override;
|
||||
bool isSimilarTo( Frame* other ) const override;
|
||||
QString sizeDescription( Units units ) const override;
|
||||
bool isSimilarTo( const Frame& other ) const override;
|
||||
|
||||
const QPainterPath& path() const override;
|
||||
const QPainterPath& clipPath() const override;
|
||||
QPainterPath marginPath( const Distance& xSize,
|
||||
const Distance& ySize ) const override;
|
||||
QPainterPath marginPath( Distance xSize, Distance ySize ) const override;
|
||||
|
||||
// Debugging support
|
||||
void print( QDebug& dbg ) const override;
|
||||
|
||||
|
||||
private:
|
||||
@@ -78,8 +80,4 @@ namespace glabels
|
||||
}
|
||||
|
||||
|
||||
// Debugging support
|
||||
QDebug operator<<( QDebug dbg, const glabels::model::FrameCd& frame );
|
||||
|
||||
|
||||
#endif // model_FrameCd_h
|
||||
|
||||
Reference in New Issue
Block a user