Adding per-keyset editable data

[pierogi] / pirkeysetmanager.h

diff --git a/pirkeysetmanager.h b/pirkeysetmanager.h
index 156b1f6..98f5ab7 100644 (file)
--- a/pirkeysetmanager.h
+++ b/pirkeysetmanager.h
@@ -1,20 +1,20 @@
 #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 PIRFavoritesDialog;
+class PIRKeysetWidgetItem;
 
 #include <map>
+class PIRKeysetMetaData;
 
 typedef std::map<unsigned int, PIRKeysetMetaData *> PIRKeysetCollection;
 
@@ -25,43 +25,52 @@ typedef std::map<QString, PIRKeysetNameIndex> PIRKeysetMakeIndex;
 class PIRKeysetManager
 {
 public:
-  PIRKeysetManager(
-    QObject *guiObject);
+  PIRKeysetManager();
 
   ~PIRKeysetManager();
 
-  void populateGuiWidget(
-    PIRSelectKeysetForm *widget);
+  void populateListWidgets(
+    PIRSelectKeysetForm *skf,
+    PIRFavoritesDialog *fd) const;
 
   bool keysetExists(
-    unsigned int keysetID);
+    unsigned int keysetID) const;
 
   bool findKeysetID(
     QString make,
     QString name,
-    unsigned int &id);
+    unsigned int &id) const;
 
   PIRKeysetWidgetItem *makeKeysetItem(
     QString make,
-    QString name);
+    QString name) const;
 
   bool hasKey(
     unsigned int keysetID,
-    PIRKeyName name);
+    PIRKeyName name) const;
 
   PIRMakeName getMake(
-    unsigned int keysetID);
+    unsigned int keysetID) const;
 
   QString getDisplayName(
-    unsigned int keysetID);
+    unsigned int keysetID) const;
 
+/*
   void populateDeviceTypes(
     PIRKeysetWidgetItem *kwi,
+    unsigned int keysetID) const;
+*/
+
+  void populateKeyset(
+    QObject *guiObject,
     unsigned int keysetID);
 
+  void populateFavorites(
+    PIRFavoritesDialog *favoritesDialog,
+    PIRSelectKeysetForm *keysetForm);
+
 private:
-  // This needs to be improved:
-  void populateKeyset(
+  void setupKeyset(
     PIRKeysetMetaData *keyset);
 
   PIRKeysetCollection keysetsInfo;