Bug fixes, new panel

[pierogi] / pirkeysetmanager.cpp

diff --git a/pirkeysetmanager.cpp b/pirkeysetmanager.cpp
index 7bc2cc7..611d78b 100644 (file)
--- a/pirkeysetmanager.cpp
+++ b/pirkeysetmanager.cpp
@@ -7,32 +7,43 @@
 #include "keysets/acer.h"
 #include "keysets/admiral.h"
 #include "keysets/aiwa.h"
+#include "keysets/aoc.h"
 #include "keysets/apple.h"
+#include "keysets/arcam.h"
 #include "keysets/beko.h"
 #include "keysets/bose.h"
 #include "keysets/bush.h"
 #include "keysets/cambridge.h"
 #include "keysets/canon.h"
+#include "keysets/compro.h"
 #include "keysets/daewoo.h"
+#include "keysets/dell.h"
 #include "keysets/denon.h"
 #include "keysets/digitalstream.h"
 #include "keysets/directv.h"
 #include "keysets/dish.h"
+#include "keysets/dse.h"
+#include "keysets/dynex.h"
 #include "keysets/ei.h"
 #include "keysets/elgato.h"
 #include "keysets/emerson.h"
 #include "keysets/epson.h"
 #include "keysets/fortec.h"
+#include "keysets/foxtel.h"
 #include "keysets/goldstar.h"
 #include "keysets/grundig.h"
 #include "keysets/haier.h"
+#include "keysets/harmankardon.h"
 #include "keysets/hauppauge.h"
 #include "keysets/hitachi.h"
 #include "keysets/homecast.h"
 #include "keysets/hp.h"
 #include "keysets/huawei.h"
 #include "keysets/humax.h"
+#include "keysets/hyundai.h"
 #include "keysets/jvc.h"
+#include "keysets/kaon.h"
+#include "keysets/kathrein.h"
 #include "keysets/kenwood.h"
 #include "keysets/lg.h"
 #include "keysets/logitech.h"
@@ -40,6 +51,7 @@
 #include "keysets/mce.h"
 #include "keysets/mitsubishi.h"
 #include "keysets/motorola.h"
+#include "keysets/nad.h"
 #include "keysets/nokia.h"
 #include "keysets/onida.h"
 #include "keysets/panasonic.h"
@@ -47,6 +59,7 @@
 #include "keysets/philips.h"
 #include "keysets/pinnacle.h"
 #include "keysets/pioneer.h"
+#include "keysets/qnap.h"
 #include "keysets/raite.h"
 #include "keysets/rca.h"
 #include "keysets/roku.h"
@@ -57,12 +70,15 @@
 #include "keysets/sharp.h"
 #include "keysets/sky.h"
 #include "keysets/sony.h"
+#include "keysets/starsat.h"
 #include "keysets/technics.h"
 #include "keysets/tivo.h"
 #include "keysets/topfield.h"
 #include "keysets/toshiba.h"
 #include "keysets/united.h"
+#include "keysets/universum.h"
 #include "keysets/vestel.h"
+#include "keysets/viewsat.h"
 #include "keysets/virgin.h"
 #include "keysets/vizio.h"
 #include "keysets/wd.h"
@@ -81,7 +97,6 @@ extern QMutex stopRepeatingMutex;
 
 // Global helper objects:
 PIRMakeMgr makeManager;
-PIRDeviceTypeMgr deviceManager;
 
 // Now, on to the actual method definitions:
 
@@ -112,8 +127,12 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new AiwaCarStereo1(counter++));
   setupKeyset(new AiwaDVD1(counter++));
 
+  setupKeyset(new AOCTV1(counter++));
+
   setupKeyset(new AppleWhiteRemote(counter++));
 
+  setupKeyset(new ArcamReceiver1(counter++));
+
   setupKeyset(new BekoTV1(counter++));
 
   setupKeyset(new BoseRadio1(counter++));
@@ -135,6 +154,8 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new CanonCamcorder1(counter++));
   setupKeyset(new CanonPowershot1(counter++));
 
+  setupKeyset(new ComproTVCard1(counter++));
+
   setupKeyset(new DaewooTV1(counter++));
   setupKeyset(new DaewooTV2(counter++));
   setupKeyset(new DaewooTV3(counter++));
@@ -165,6 +186,8 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new DenonAudio3(counter++));
   setupKeyset(new DenonAudio4(counter++));
 
+  setupKeyset(new DellRemote1(counter++));
+
   setupKeyset(new DigitalStreamReceiver(counter++));
 
   setupKeyset(new DirectvReceiver1(counter++));
@@ -186,6 +209,11 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new DishReceiver1n(counter++));
   setupKeyset(new DishReceiver1o(counter++));
 
+  setupKeyset(new DSEDVD1(counter++));
+  setupKeyset(new DSESat1(counter++));
+
+  setupKeyset(new DynexTV1(counter++));
+
   setupKeyset(new EiTV1(counter++));
 
   setupKeyset(new ElgatoEyeTV1(counter++));
@@ -199,6 +227,9 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new FortecReceiver1(counter++));
   setupKeyset(new FortecReceiver2(counter++));
 
+  setupKeyset(new FoxtelSTB1(counter++));
+  setupKeyset(new FoxtelSTB2(counter++));
+
   setupKeyset(new GoldStarTV1(counter++));
   setupKeyset(new GoldStarTV2(counter++));
   setupKeyset(new GoldStarVCR1(counter++));
@@ -221,6 +252,15 @@ PIRKeysetManager::PIRKeysetManager()
 
   setupKeyset(new HaierTV1(counter++));
 
+  setupKeyset(new HarmanKardonAmp1(counter++));
+  setupKeyset(new HarmanKardonAmp2(counter++));
+  setupKeyset(new HarmanKardonReceiver2(counter++));
+  setupKeyset(new HarmanKardonTape1(counter++));
+  setupKeyset(new HarmanKardonDVD1(counter++));
+  setupKeyset(new HarmanKardonDVD1a(counter++));
+  setupKeyset(new HarmanKardonCD1(counter++));
+  setupKeyset(new HarmanKardonCD2(counter++));
+
   setupKeyset(new HauppaugePCTV1(counter++));
   setupKeyset(new HauppaugePCTV1a(counter++));
   setupKeyset(new HauppaugePCTV1b(counter++));
@@ -250,6 +290,10 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new HumaxReceiver2(counter++));
   setupKeyset(new HumaxReceiver3(counter++));
 
+  setupKeyset(new HyundaiDVD1(counter++));
+  setupKeyset(new HyundaiAudio1(counter++));
+  setupKeyset(new HyundaiTV1(counter++));
+
   setupKeyset(new JVCSat1(counter++));
   setupKeyset(new JVCSat2(counter++));
   setupKeyset(new JVCVCR1(counter++));
@@ -269,6 +313,12 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new JVCAudio2(counter++));
   setupKeyset(new JVCDVD1(counter++));
 
+  setupKeyset(new KaonSat1(counter++));
+
+  setupKeyset(new KathreinSat1(counter++));
+  setupKeyset(new KathreinSat2(counter++));
+  setupKeyset(new KathreinSat3(counter++));
+
   setupKeyset(new KenwoodAudio1(counter++));
   setupKeyset(new KenwoodComponent1(counter++));
   setupKeyset(new KenwoodComponent2(counter++));
@@ -293,6 +343,7 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new LGAC1(counter++));
 
   setupKeyset(new LogitechSpeakers(counter++));
+  setupKeyset(new LogitechSqueezebox(counter++));
 
   setupKeyset(new MagnavoxDVD1(counter++));
   setupKeyset(new MagnavoxVCR1(counter++));
@@ -319,6 +370,13 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new MotorolaSTB1b(counter++));
   setupKeyset(new MotorolaSkyDigital(counter++));
 
+  setupKeyset(new NADAudio1(counter++));
+  setupKeyset(new NADTuner1(counter++));
+  setupKeyset(new NADDVD1(counter++));
+  setupKeyset(new NADCD1(counter++));
+  setupKeyset(new NADCD2(counter++));
+  setupKeyset(new NADTape1(counter++));
+
   setupKeyset(new NokiaGenericVCR(counter++));
 
   setupKeyset(new OnidaTV1(counter++));
@@ -395,6 +453,8 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new PioneerLaserDisc1(counter++));
   setupKeyset(new PioneerDVD1(counter++));
 
+  setupKeyset(new QNAPPlayer1(counter++));
+
   setupKeyset(new RaiteDVD1(counter++));
 
   setupKeyset(new RCATV1(counter++));
@@ -480,6 +540,11 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new SonyVCR1a(counter++));
   setupKeyset(new SonyVCR1b(counter++));
   setupKeyset(new SonyReceiver1(counter++));
+  setupKeyset(new SonyCD1(counter++));
+  setupKeyset(new SonyCD1a(counter++));
+  setupKeyset(new SonyCD1b(counter++));
+
+  setupKeyset(new StarsatSat1(counter++));
 
   setupKeyset(new TechnicsAudio1(counter++));
   setupKeyset(new TechnicsAudio1a(counter++));
@@ -517,15 +582,27 @@ PIRKeysetManager::PIRKeysetManager()
   setupKeyset(new UnitedDVD1(counter++));
   setupKeyset(new UnitedDVBT1(counter++));
 
+  setupKeyset(new UniversumVCR1(counter++));
+  setupKeyset(new UniversumVCR2(counter++));
+  setupKeyset(new UniversumVCR3(counter++));
+  setupKeyset(new UniversumTV1(counter++));
+  setupKeyset(new UniversumTV1a(counter++));
+  setupKeyset(new UniversumSat1(counter++));
+  setupKeyset(new UniversumAudio1(counter++));
+
   setupKeyset(new VestelTV1(counter++));
   setupKeyset(new VestelTV2(counter++));
 
+  setupKeyset(new ViewsatSat1(counter++));
+  setupKeyset(new ViewsatSat1a(counter++));
+
   setupKeyset(new VirginSTB1(counter++));
 
   setupKeyset(new VizioTV1(counter++));
 
   setupKeyset(new WDMediaPlayer1(counter++));
   setupKeyset(new WDMediaPlayer1a(counter++));
+  setupKeyset(new WDMediaPlayer1b(counter++));
 
   setupKeyset(new WestinghouseTV1(counter++));
   setupKeyset(new WestinghouseTV2(counter++));
@@ -694,7 +771,7 @@ void PIRKeysetManager::setupKeyset(
 }
 
 
-void PIRKeysetManager::populateGuiWidget(
+void PIRKeysetManager::populateSelectionWidget(
   PIRSelectKeysetForm *skf) const
 {
   PIRMakeName make;
@@ -704,18 +781,20 @@ void PIRKeysetManager::populateGuiWidget(
 
   while (i != keysetsInfo.end())
   {
+    // Create a widget for the keyset:
     make = i->second->getMake();
     QString tempString = makeManager.getMakeString(make);
     tempString.append(" ");
     tempString.append(i->second->getKeysetName());
     kwi = new PIRKeysetWidgetItem(tempString, i->first, make);
-    i->second->populateDeviceTypes(kwi);
     skf->addWidgetItem(kwi);
+
     ++i;
   }
 }
 
 
+/*
 void PIRKeysetManager::populateDeviceTypes(
   PIRKeysetWidgetItem *kwi,
   unsigned int keysetID) const
@@ -726,3 +805,4 @@ void PIRKeysetManager::populateDeviceTypes(
     i->second->populateDeviceTypes(kwi);
   }
 }
+*/