Added variables expansion to TextNode and ColorNode.

2019-07-27 22:00:05 -04:00
parent f6ecdc64e0
commit 57cbf18039
11 changed files with 78 additions and 87 deletions
@@ -22,6 +22,7 @@
 #define model_TextNode_h


+#include "Variables.h"
 #include "merge/Record.h"

 #include <QString>
@@ -76,8 +77,8 @@ namespace glabels
 			/////////////////////////////////
 			// Misc. Methods
 			/////////////////////////////////
-			QString text( merge::Record* record ) const;
-			bool isEmptyField( merge::Record* record ) const;
+			QString text( const merge::Record* record,
+			              const Variables*     variables ) const;


 			/////////////////////////////////