--- a/src/primitives.h Tue Jan 07 08:26:15 2014 +0200 +++ b/src/primitives.h Tue Jan 07 08:53:27 2014 +0200 @@ -28,22 +28,26 @@ class Ui_MakePrimUI; class PrimitiveCategory; struct Primitive -{ str name, title; +{ + str name, title; PrimitiveCategory* cat; }; class PrimitiveCategory : public QObject -{ Q_OBJECT +{ + Q_OBJECT PROPERTY (public, str, Name, STR_OPS, STOCK_WRITE) public: enum ERegexType - { EFilenameRegex, + { + EFilenameRegex, ETitleRegex }; struct RegexEntry - { QRegExp regex; + { + QRegExp regex; ERegexType type; }; @@ -66,7 +70,8 @@ // builds an index of them. // ============================================================================= class PrimitiveLister : public QObject -{ Q_OBJECT +{ + Q_OBJECT public: explicit PrimitiveLister (QObject* parent = 0); @@ -94,7 +99,8 @@ PrimitiveLister* getPrimitiveLister(); enum PrimitiveType -{ Circle, +{ + Circle, Cylinder, Disc, DiscNeg, @@ -104,7 +110,8 @@ // ============================================================================= class PrimitivePrompt : public QDialog -{ Q_OBJECT +{ + Q_OBJECT public: explicit PrimitivePrompt (QWidget* parent = null, Qt::WindowFlags f = 0);