Gui updated, many keyset changes

[pierogi] / pirkeysetmetadata.h

diff --git a/pirkeysetmetadata.h b/pirkeysetmetadata.h
index 7bdf2e9..0673eb6 100644 (file)
--- a/pirkeysetmetadata.h
+++ b/pirkeysetmetadata.h
@@ -9,7 +9,7 @@
 #include "pirmakenames.h"
 #include "pirdevicetypenames.h"
 #include "pirkeysetwidgetitem.h"
-#include "pirprotocol.h"
+#include "protocols/pirprotocol.h"
 
 typedef std::map<PIRKeyName, const char *> KeyCollection;
 
@@ -41,18 +41,19 @@ public:
     unsigned int index);
 
   bool hasKey(
-    PIRKeyName name);
+    PIRKeyName name) const;
 
-  unsigned int getID();
+  unsigned int getID() const;
 
-  PIRMakeName getMake();
-  const char *getKeysetName();
+  PIRMakeName getMake() const;
+
+  const char *getKeysetName() const;
 
   void moveProtocolToThread(
     QThread &thread);
 
   void populateDeviceTypes(
-    PIRKeysetWidgetItem *kwi);
+    PIRKeysetWidgetItem *kwi) const;
 
 protected:
   void addControlledDevice(
@@ -67,7 +68,48 @@ protected:
     const char *name,
     PIRKeyName key,
     unsigned long data,
-    unsigned int bits);
+    unsigned int size);
+
+  // Special helper methods for SIRC keys:
+  void addSIRC12Key(
+    const char *name,
+    PIRKeyName key,
+    unsigned int addressData,
+    unsigned int commandData);
+
+  void addSIRC15Key(
+    const char *name,
+    PIRKeyName key,
+    unsigned int addressData,
+    unsigned int commandData);
+
+  void addSIRC20Key(
+    const char *name,
+    PIRKeyName key,
+    unsigned int secondaryAddressData,
+    unsigned int primaryAddressData,
+    unsigned int commandData);
+
+  // Helper method for Sharp keys:
+  void addSharpKey(
+    const char *name,
+    PIRKeyName key,
+    unsigned int addressData,
+    unsigned int commandData);
+
+  void addNECKey(
+    const char *name,
+    PIRKeyName key,
+    unsigned int addressData,
+    unsigned int commandData);
+
+  void addPioneerKey(
+    const char *name,
+    PIRKeyName key,
+    unsigned int addressOne,
+    unsigned int commandOne,
+    unsigned int addressTwo,
+    unsigned int commandTwo);
 
   void setPreData(
     unsigned long data,