Fleshing out of using merge for colors.

This commit is contained in:
Jim Evins
2016-05-17 23:31:52 -04:00
parent d7480f9bb8
commit 669c1d02e7
16 changed files with 87 additions and 25 deletions
+3 -3
View File
@@ -34,14 +34,14 @@ FieldMenu::FieldMenu()
///
/// set keys
///
void FieldMenu::setKeys( const QList<QString>& keyList )
void FieldMenu::setKeys( const QStringList& keyList )
{
clear();
foreach ( QString key, keyList )
{
FieldMenuItem* menuItem = new FieldMenuItem( key );
connect( menuItem, SIGNAL(activated()), this, SLOT(onMenuItemActivated) );
connect( menuItem, SIGNAL(activated(QString)), this, SLOT(onMenuItemActivated(QString)) );
addAction( menuItem );
}
@@ -51,7 +51,7 @@ void FieldMenu::setKeys( const QList<QString>& keyList )
///
/// onMenuItemActivated slot
///
void FieldMenu::onMenuItemActivated( const QString& key )
void FieldMenu::onMenuItemActivated( QString key )
{
emit keySelected( key );
}