Memory Management Improved

[pierogi] / pirkeysetmetadata.h

diff --git a/pirkeysetmetadata.h b/pirkeysetmetadata.h
index 42e34c2..c961b00 100644 (file)
--- a/pirkeysetmetadata.h
+++ b/pirkeysetmetadata.h
@@ -9,6 +9,7 @@
 #include <list>
 
 class QThread;
+class QObject;
 
 class PIRKeysetWidgetItem;
 class PIRProtocol;
@@ -51,7 +52,10 @@ public:
 
   const char *getKeysetName() const;
 
-  void moveProtocolToThread(
+  virtual void populateProtocol(
+    QObject *guiObject) = 0;
+
+  void moveToThread(
     QThread *thread);
 
   void populateDeviceTypes(
@@ -121,6 +125,18 @@ protected:
     unsigned int commandData);
 */
 
+  void addKaseikyoKey(
+    const char *name,
+    PIRKeyName key,
+    unsigned int addressData,
+    unsigned int commandData);
+
+  void addDishKey(
+    const char *name,
+    PIRKeyName key,
+    unsigned int firstCommand,
+    unsigned int secondCommand);
+
   void setPreData(
     unsigned long data,
     unsigned int bits);
@@ -129,21 +145,20 @@ protected:
     unsigned long data,
     unsigned int bits);
 
+  void setKeysetName(
+    const char *name);
+
   KeyCollection keys;
 
   DeviceCollection controlledDevices;
 
   PIRProtocol *threadableProtocol;
-
-  void setKeysetName(
-    const char *name);
+  unsigned int index;
 
 private:
   const char *keysetName;
   PIRMakeName make;
   PIRDeviceTypeCollection deviceTypes;
-
-  unsigned int id;
 };