Fleshing out of using merge for colors.

2016-05-17 23:31:52 -04:00
parent d7480f9bb8
commit 669c1d02e7
16 changed files with 87 additions and 25 deletions
@@ -55,7 +55,7 @@ MergeText::~MergeText()
 ///
 /// Get key list
 ///
-QStringList MergeText::keyList() const
+QStringList MergeText::keys() const
 {
 	QStringList keys;
 	for ( int iField = 0; iField < mNFieldsMax; iField++ )