projects
/
pierogi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New GUI, many changes
[pierogi]
/
pirkeysetmetadata.h
diff --git
a/pirkeysetmetadata.h
b/pirkeysetmetadata.h
index
c961b00
..
c70b040
100644
(file)
--- a/
pirkeysetmetadata.h
+++ b/
pirkeysetmetadata.h
@@
-11,7
+11,7
@@
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;
@@
-33,7
+33,7
@@
public:
PIRDeviceTypeName type;
};
PIRDeviceTypeName type;
};
-typedef std::list<DeviceInfo> DeviceCollection;
+typedef std::list<DeviceInfo> PIRDeviceCollection;
class PIRKeysetMetaData
{
class PIRKeysetMetaData
{
@@
-58,8
+58,9
@@
public:
void moveToThread(
QThread *thread);
void moveToThread(
QThread *thread);
- void populateDeviceTypes(
- PIRKeysetWidgetItem *kwi) const;
+ void populateDevices(
+ unsigned int id,
+ PIRSelectDeviceForm *sdf) const;
protected:
void addControlledDevice(
protected:
void addControlledDevice(
@@
-150,7
+151,7
@@
protected:
KeyCollection keys;
KeyCollection keys;
- DeviceCollection controlledDevices;
+ PIRDeviceCollection controlledDevices;
PIRProtocol *threadableProtocol;
unsigned int index;
PIRProtocol *threadableProtocol;
unsigned int index;