New GUI, many changes

[pierogi] / keysets / sony.h

diff --git a/keysets/sony.h b/keysets/sony.h
index 60843e3..3ceb575 100644 (file)
--- a/keysets/sony.h
+++ b/keysets/sony.h
@@ -3,14 +3,16 @@
 
 #include "pirkeysetmetadata.h"
 
-#include <QObject>
+class QObject;
 
 class SonyTV1: public PIRKeysetMetaData
 {
 public:
   SonyTV1(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -18,26 +20,32 @@ class SonyTV1a: public SonyTV1
 {
 public:
   SonyTV1a(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
-class SonyTV1b: public SonyTV1
+class SonyTV1b: public SonyTV1a
 {
 public:
   SonyTV1b(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
-class SonyTV1d: public SonyTV1a
+class SonyTV1c: public SonyTV1
 {
 public:
-  SonyTV1d(
-    QObject *guiObject,
+  SonyTV1c(
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -45,8 +53,10 @@ class SonyAmp1: public PIRKeysetMetaData
 {
 public:
   SonyAmp1(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -54,44 +64,32 @@ class SonyAmp2: public PIRKeysetMetaData
 {
 public:
   SonyAmp2(
-    QObject *guiObject,
     unsigned int index);
-};
 
-
-class SonyCD1: public PIRKeysetMetaData
-{
-public:
-  SonyCD1(
-    QObject *guiObject,
-    unsigned int index);
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
-class SonyCD1a: public SonyCD1
+class SonyAudio1: public PIRKeysetMetaData
 {
 public:
-  SonyCD1a(
-    QObject *guiObject,
+  SonyAudio1(
     unsigned int index);
-};
 
-
-class SonyCD2: public PIRKeysetMetaData
-{
-public:
-  SonyCD2(
-    QObject *guiObject,
-    unsigned int index);
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
-class SonyCD3: public PIRKeysetMetaData
+class SonyAudio1a: public SonyAudio1
 {
 public:
-  SonyCD3(
-    QObject *guiObject,
+  SonyAudio1a(
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -99,8 +97,10 @@ class SonyDAT1: public PIRKeysetMetaData
 {
 public:
   SonyDAT1(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -108,8 +108,10 @@ class SonyDVD1: public PIRKeysetMetaData
 {
 public:
   SonyDVD1(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -117,8 +119,10 @@ class SonyDVD1a: public SonyDVD1
 {
 public:
   SonyDVD1a(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -126,8 +130,10 @@ class SonyDVD1b: public SonyDVD1
 {
 public:
   SonyDVD1b(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -135,8 +141,10 @@ class SonyDVD1c: public SonyDVD1
 {
 public:
   SonyDVD1c(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -144,8 +152,10 @@ class SonyVCR1: public PIRKeysetMetaData
 {
 public:
   SonyVCR1(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -153,8 +163,21 @@ class SonyVCR1a: public SonyVCR1
 {
 public:
   SonyVCR1a(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
+};
+
+
+class SonyVCR1b: public SonyVCR1a
+{
+public:
+  SonyVCR1b(
+    unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 
@@ -162,8 +185,41 @@ class SonyReceiver1: public PIRKeysetMetaData
 {
 public:
   SonyReceiver1(
-    QObject *guiObject,
     unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
+};
+
+
+class SonyCD1: public PIRKeysetMetaData
+{
+public:
+  SonyCD1(
+    unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
+};
+
+class SonyCD1a: public SonyCD1
+{
+public:
+  SonyCD1a(
+    unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
+};
+
+class SonyCD1b: public SonyCD1
+{
+public:
+  SonyCD1b(
+    unsigned int index);
+
+  virtual void populateProtocol(
+    QObject *guiObject);
 };
 
 #endif // SONY_H