<<<<<<< HEAD #ifndef CSPRINKLERDEVICE_H #define CSPRINKLERDEVICE_H #include typedef enum eSprinklerState { SPRINKLER_OFF_STATE = 0, SPRINKLER_ON_STATE, SPRINKLER_UNKNOWN_STATE }SprinklerState; class CSprinklerDevice { public: CSprinklerDevice(); int SetSprinklerState(SprinklerState State); SprinklerState GetSprinklerState(); int SetFlow(unsigned short flow); unsigned short GetFlow(); SprinklerState mSprinklerState; int mDeviceAddress; QString mDeviceLocation; unsigned short mFlowMeter; }; #endif // CSPRINKLERDEVICE_H ======= #ifndef SPRINKLERDEVICE_H #define SPRINKLERDEVICE_H #include class CSprinklerDevice : public QObject { Q_OBJECT public: explicit CSprinklerDevice(QObject *parent = 0); signals: public slots: }; #endif // SPRINKLERDEVICE_H >>>>>>> 2c22dda0f4b581f6a3d2d892b18202b64b8bc289