Added merge printing.

2016-05-21 21:21:45 -04:00
parent 38899348f9
commit 18089d8635
8 changed files with 124 additions and 66 deletions
@@ -1,6 +1,6 @@
 /*  ColorNode.h
 *
- *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
+ *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
 *
 *  This file is part of gLabels-qt.
 *
@@ -25,6 +25,8 @@
 #include <QColor>
 #include <stdint.h>

+class MergeRecord; // Forward reference
+

 ///
 /// Color Node Type
@@ -87,10 +89,7 @@ public:
 	/////////////////////////////////
 public:
 	uint32_t rgba( void ) const;
-		
-#if TODO
-	QColor expand( MergeRecord? record );
-#endif
+	QColor color( MergeRecord* record ) const;


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