projects
/
pierogi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug fixes, new panel
[pierogi]
/
pirkeysetmetadata.h
diff --git
a/pirkeysetmetadata.h
b/pirkeysetmetadata.h
index
c961b00
..
b3bfb55
100644
(file)
--- a/
pirkeysetmetadata.h
+++ b/
pirkeysetmetadata.h
@@
-3,37
+3,21
@@
#include "pirkeynames.h"
#include "pirmakenames.h"
#include "pirkeynames.h"
#include "pirmakenames.h"
-#include "pirdevicetypenames.h"
+//#include "pirdevicetypenames.h"
+
+#include "pirdeviceinfo.h"
#include <map>
#include <map>
-#include <list>
+//#include <list>
class QThread;
class QObject;
class QThread;
class QObject;
-class PIRKeysetWidgetItem;
+class PIRSelectDeviceForm;
class PIRProtocol;
typedef std::map<PIRKeyName, const char *> KeyCollection;
class PIRProtocol;
typedef std::map<PIRKeyName, const char *> KeyCollection;
-class DeviceInfo
-{
-public:
- DeviceInfo(
- PIRMakeName ma,
- const char *mo,
- PIRDeviceTypeName t)
- : make(ma),
- model(mo),
- type(t)
- {}
-
- PIRMakeName make;
- const char *model;
- PIRDeviceTypeName type;
-};
-
-typedef std::list<DeviceInfo> DeviceCollection;
class PIRKeysetMetaData
{
class PIRKeysetMetaData
{
@@
-58,8
+42,8
@@
public:
void moveToThread(
QThread *thread);
void moveToThread(
QThread *thread);
- void populateDeviceTypes(
- PIRKeysetWidgetItem *kwi) const;
+ static void populateDevices(
+ PIRSelectDeviceForm *sdf);
protected:
void addControlledDevice(
protected:
void addControlledDevice(
@@
-150,15
+134,14
@@
protected:
KeyCollection keys;
KeyCollection keys;
- DeviceCollection controlledDevices;
-
PIRProtocol *threadableProtocol;
unsigned int index;
private:
const char *keysetName;
PIRMakeName make;
PIRProtocol *threadableProtocol;
unsigned int index;
private:
const char *keysetName;
PIRMakeName make;
- PIRDeviceTypeCollection deviceTypes;
+ static PIRDeviceCollection controlledDevices;
+// PIRDeviceTypeCollection deviceTypes;
};
};