Gui updated, many keyset changes

[pierogi] / pirkeysetmetadata.cpp

diff --git a/pirkeysetmetadata.cpp b/pirkeysetmetadata.cpp
index 8e5ac10..5ae2599 100644 (file)
--- a/pirkeysetmetadata.cpp
+++ b/pirkeysetmetadata.cpp
@@ -13,7 +13,7 @@ PIRKeysetMetaData::PIRKeysetMetaData(
 }
 
 bool PIRKeysetMetaData::hasKey(
-  PIRKeyName name)
+  PIRKeyName name) const
 {
   return (keys.find(name) != keys.end());
 }
@@ -27,7 +27,7 @@ void PIRKeysetMetaData::moveProtocolToThread(
 
 
 void PIRKeysetMetaData::populateDeviceTypes(
-  PIRKeysetWidgetItem *kwi)
+  PIRKeysetWidgetItem *kwi) const
 {
   PIRDeviceTypeCollection::const_iterator i = deviceTypes.begin();
   while (i != deviceTypes.end())
@@ -38,12 +38,23 @@ void PIRKeysetMetaData::populateDeviceTypes(
 }
 
 
-unsigned int PIRKeysetMetaData::getID()
+unsigned int PIRKeysetMetaData::getID() const
 {
   return id;
 }
 
 
+PIRMakeName PIRKeysetMetaData::getMake() const
+{
+  return make;
+}
+
+const char *PIRKeysetMetaData::getKeysetName() const
+{
+  return keysetName;
+}
+
+
 void PIRKeysetMetaData::addControlledDevice(
   PIRMakeName make,
   const char *model,
@@ -130,6 +141,37 @@ void PIRKeysetMetaData::addSharpKey(
 }
 
 
+void PIRKeysetMetaData::addNECKey(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressData,
+  unsigned int commandData)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addNECKey(key, addressData, commandData);
+  }
+}
+
+
+void PIRKeysetMetaData::addPioneerKey(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressOne,
+  unsigned int commandOne,
+  unsigned int addressTwo,
+  unsigned int commandTwo)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addPioneerKey(
+      key, addressOne, commandOne, addressTwo, commandTwo);
+  }
+}
+
+
 void PIRKeysetMetaData::setPreData(
   unsigned long data,
   unsigned int bits)
@@ -146,17 +188,6 @@ void PIRKeysetMetaData::setPostData(
 }
 
 
-PIRMakeName PIRKeysetMetaData::getMake()
-{
-  return make;
-}
-
-const char *PIRKeysetMetaData::getKeysetName()
-{
-  return keysetName;
-}
-
-
 void PIRKeysetMetaData::setKeysetName(
   const char *n)
 {