New GUI, many changes

[pierogi] / pirkeysetmanager.h

diff --git a/pirkeysetmanager.h b/pirkeysetmanager.h
index c8b305f..4cc5f42 100644 (file)
--- a/pirkeysetmanager.h
+++ b/pirkeysetmanager.h
@@ -1,20 +1,19 @@
 #ifndef PIRKEYSETMANAGER_H
 #define PIRKEYSETMANAGER_H
 
-#include "pirkeysetmetadata.h"
-//#include "protocol.h"
 #include "pirkeynames.h"
-//#include "selectionwindow.h"
-#include "pirselectkeysetform.h"
-#include "pirkeysetwidgetitem.h"
+#include "pirmakenames.h"
 
-#include <QString> // needed to work with QSettings data...
-
-//#include <QtCore/QCoreApplication>
+#include <QString>
 #include <QThread>
-//#include <QStringList>
+
+class QObject;
+class PIRSelectKeysetForm;
+class PIRSelectDeviceForm;
+class PIRKeysetWidgetItem;
 
 #include <map>
+class PIRKeysetMetaData;
 
 typedef std::map<unsigned int, PIRKeysetMetaData *> PIRKeysetCollection;
 
@@ -25,13 +24,13 @@ typedef std::map<QString, PIRKeysetNameIndex> PIRKeysetMakeIndex;
 class PIRKeysetManager
 {
 public:
-  PIRKeysetManager(
-    QObject *guiObject);
+  PIRKeysetManager();
 
   ~PIRKeysetManager();
 
-  void populateGuiWidget(
-    PIRSelectKeysetForm *widget) const;
+  void populateSelectionWidgets(
+    PIRSelectKeysetForm *skf,
+    PIRSelectDeviceForm *sdf) const;
 
   bool keysetExists(
     unsigned int keysetID) const;
@@ -55,13 +54,18 @@ public:
   QString getDisplayName(
     unsigned int keysetID) const;
 
+/*
   void populateDeviceTypes(
     PIRKeysetWidgetItem *kwi,
     unsigned int keysetID) const;
+*/
 
-private:
-  // This needs to be improved:
   void populateKeyset(
+    QObject *guiObject,
+    unsigned int keysetID);
+
+private:
+  void setupKeyset(
     PIRKeysetMetaData *keyset);
 
   PIRKeysetCollection keysetsInfo;