UserVariables branch merge

2019-08-21 03:37:56 +01:00
parent 6ab3a12b92 6a789c9632
commit 2444cacb74
92 changed files with 3624 additions and 1283 deletions
@@ -73,8 +73,16 @@ namespace glabels
 			// Drawing operations
 			///////////////////////////////////////////////////////////////
 		protected:
-			void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-			void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			void drawShadow( QPainter*      painter,
+			                 bool           inEditor,
+			                 merge::Record* record,
+			                 Variables*     variables ) const override;
+			
+			void drawObject( QPainter*      painter,
+			                 bool           inEditor,
+			                 merge::Record* record,
+			                 Variables*     variables ) const override;
+			
 			QPainterPath hoverPath( double scale ) const override;

 		};