Index: sources/main.h =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -r87e242f80901ae2c38cc449e0ae28f136808dc85 --- sources/main.h (.../main.h) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/main.h (.../main.h) (revision 87e242f80901ae2c38cc449e0ae28f136808dc85) @@ -50,121 +50,174 @@ //--------------------------------------------------------------------------------// #define DEBUG_PROPERTY_CHANGED(vVARIABLE) //qDebug() << "#" << #vVARIABLE << v##vVARIABLE; //--------------------------------------------------------------------------------// -#define PROPERTY_SLOT( vTYPE , vVARIABLE ) \ - protected : \ - void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ - static bool init = false; \ - if ( !init || _##vVARIABLE != v##vVARIABLE ) { \ - DEBUG_PROPERTY_CHANGED(vVARIABLE) \ - init = true; \ - _##vVARIABLE = v##vVARIABLE; \ - emit vVARIABLE##Changed( _##vVARIABLE ); \ - } \ +#define PROPERTY_SLOT( vTYPE , vVARIABLE ) \ + protected : \ + void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ + static bool init = false; \ + if ( !init || _##vVARIABLE != v##vVARIABLE ) { \ + DEBUG_PROPERTY_CHANGED(vVARIABLE) \ + init = true; \ + _##vVARIABLE = v##vVARIABLE; \ + emit vVARIABLE##Changed( _##vVARIABLE ); \ + } \ } //--------------------------------------------------------------------------------// -#define TRIGGER_SLOT( vTYPE , vVARIABLE ) \ - protected: \ - void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ - DEBUG_PROPERTY_CHANGED(vVARIABLE) \ - _##vVARIABLE = v##vVARIABLE; \ - emit vVARIABLE##Triggered( _##vVARIABLE ); \ +#define TRIGGER_SLOT( vTYPE , vVARIABLE ) \ + protected: \ + void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ + DEBUG_PROPERTY_CHANGED(vVARIABLE) \ + _##vVARIABLE = v##vVARIABLE; \ + emit vVARIABLE##Triggered( _##vVARIABLE ); \ } //--------------------------------------------------------------------------------// -#define PROPERTY_BASE(vTYPE , vVARIABLE , vDEFVALUE, vSIGNAL) \ - Q_PROPERTY( vTYPE vVARIABLE \ - READ vVARIABLE \ - WRITE vVARIABLE \ - NOTIFY vVARIABLE##vSIGNAL) \ - Q_SIGNALS: \ - void vVARIABLE##vSIGNAL( const vTYPE & v##vVARIABLE ); \ - private: \ - vTYPE _##vVARIABLE = vDEFVALUE; \ - protected: \ - vTYPE vVARIABLE () const { \ - return _##vVARIABLE ; \ +#define PROPERTY_BASE(vTYPE , vVARIABLE , vDEFVALUE, vSIGNAL) \ + Q_PROPERTY( vTYPE vVARIABLE \ + READ vVARIABLE \ + WRITE vVARIABLE \ + NOTIFY vVARIABLE##vSIGNAL) \ + Q_SIGNALS: \ + void vVARIABLE##vSIGNAL( const vTYPE & v##vVARIABLE ); \ + private: \ + vTYPE _##vVARIABLE = vDEFVALUE; \ + protected: \ + vTYPE vVARIABLE () const { \ + return _##vVARIABLE ; \ } //--------------------------------------------------------------------------------// #define PROPERTY( vTYPE , vVARIABLE , vDEFVALUE ) \ - PROPERTY_BASE( vTYPE , vVARIABLE , vDEFVALUE , Changed ) \ - PROPERTY_SLOT( vTYPE , vVARIABLE) +Q_PROPERTY( vTYPE vVARIABLE \ + READ vVARIABLE \ + WRITE vVARIABLE \ + NOTIFY vVARIABLE##Changed) \ +Q_SIGNALS: \ + void vVARIABLE##Changed( const vTYPE & v##vVARIABLE ); \ +private: \ + vTYPE _##vVARIABLE = vDEFVALUE; \ +protected: \ +vTYPE vVARIABLE () const { \ + return _##vVARIABLE ; \ + } \ +void vVARIABLE (const vTYPE & v##vVARIABLE) { \ + static bool init = false; \ + if ( !init || _##vVARIABLE != v##vVARIABLE ) { \ + DEBUG_PROPERTY_CHANGED(vVARIABLE) \ + init = true; \ + _##vVARIABLE = v##vVARIABLE; \ + emit vVARIABLE##Changed(_##vVARIABLE); \ + } \ +} //--------------------------------------------------------------------------------// -#define TRIGGER( vTYPE , vVARIABLE , vDEFVALUE ) \ - PROPERTY_BASE( vTYPE , vVARIABLE , vDEFVALUE , Triggered) \ - TRIGGER_SLOT( vTYPE , vVARIABLE) +#define TRIGGER(vTYPE , vVARIABLE, vDEFVALUE) \ +Q_PROPERTY(vTYPE vVARIABLE \ + READ vVARIABLE \ + WRITE vVARIABLE \ + NOTIFY vVARIABLE##Triggered) \ +Q_SIGNALS: \ + void vVARIABLE##Triggered(const vTYPE& v##vVARIABLE); \ +private: \ + vTYPE _##vVARIABLE = vDEFVALUE; \ +protected: \ + vTYPE vVARIABLE() const { \ + return _##vVARIABLE; \ + } \ +void vVARIABLE(const vTYPE & v##vVARIABLE) { \ + DEBUG_PROPERTY_CHANGED(vVARIABLE) \ + _##vVARIABLE = v##vVARIABLE; \ + emit vVARIABLE##Triggered( _##vVARIABLE ); \ +} + //--------------------------------------------------------------------------------// -//--------------------------------------------------------------------------------// #define ACTION_VIEW_CONNECTION(vTYPE) \ connect(&_GuiController, SIGNAL(didActionReceive(const vTYPE &)), \ this, SLOT( onActionReceive(const vTYPE &))); //--------------------------------------------------------------------------------// #define ADJUST_VIEW_CONNECTION(vTYPE) \ - connect( this, SIGNAL(didAdjustment (const vTYPE &)), \ - &_GuiController, SLOT( doAdjustment (const vTYPE &))); + connect( this, SIGNAL(didAdjustment(const vTYPE &)), \ + &_GuiController, SLOT( doAdjustment(const vTYPE &))); //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// #define ACTION_METHOD_BRIDGE_CONNECTION(vMETHOD, vSOURCE, vTYPE) \ connect(&vSOURCE, SIGNAL(did##vMETHOD(const vTYPE &)), \ this , SLOT( on##vMETHOD(const vTYPE &))); //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, vTYPE) \ - ACTION_METHOD_BRIDGE_CONNECTION(ActionReceive, vSOURCE, vTYPE) + connect(&vSOURCE, SIGNAL(didActionReceive(const vTYPE &)), \ + this , SLOT( onActionReceive(const vTYPE &))); + //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, vTYPE) \ - ACTION_METHOD_BRIDGE_CONNECTION(Adjustment , vSOURCE, vTYPE) + connect(&vSOURCE, SIGNAL(didAdjustment(const vTYPE &)), \ + this , SLOT( onAdjustment(const vTYPE &))); \ + //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_PRIVATE_SLOT(vTYPE) \ private Q_SLOTS: \ - void onActionReceive (const vTYPE &vData) { \ + void onActionReceive(const vTYPE &vData) { \ emit didActionReceive(vData); \ } //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_PRIVATE_SLOT_DEFINITION(vTYPE) \ private Q_SLOTS: \ - void onAdjustment (const vTYPE &vData); + void onAdjustment(const vTYPE &vData); //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_PRIVATE_SLOT(vTYPE) \ private Q_SLOTS: \ - void onAdjustment (const vTYPE &vData) { \ - emit didAdjustment( vData); \ + void onAdjustment(const vTYPE &vData) { \ + emit didAdjustment(vData); \ } //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_PUBLIC_SLOT(vTYPE) \ public Q_SLOTS: \ - void doAdjustment (const vTYPE &vData) { \ - emit didAdjustment( vData); \ + void doAdjustment(const vTYPE &vData) { \ + emit didAdjustment(vData); \ } //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_SIGNAL(vTYPE) \ Q_SIGNALS: \ - void didActionReceive (const vTYPE &vData); + void didActionReceive(const vTYPE &vData); //--------------------------------------------------------------------------------// #define ACTION_TRANSMT_SIGNAL(vTYPE) \ Q_SIGNALS: \ void didActionTransmit(const vTYPE &vData); //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_SIGNAL(vTYPE) \ Q_SIGNALS: \ - void didAdjustment (const vTYPE &vData); + void didAdjustment(const vTYPE &vData); //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_BRIDGE_DEFINITION(vTYPE) \ - ACTION_RECEIVE_PRIVATE_SLOT (vTYPE) \ - ACTION_RECEIVE_SIGNAL (vTYPE) + private Q_SLOTS: \ + void onActionReceive(const vTYPE &vData) { \ + emit didActionReceive(vData); \ + } \ + Q_SIGNALS: \ + void didActionReceive(const vTYPE &vData); //--------------------------------------------------------------------------------// -#define ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(vTYPE) \ - ADJUST_TRANSMT_PRIVATE_SLOT_DEFINITION (vTYPE) \ - ADJUST_TRANSMT_SIGNAL (vTYPE) +#define ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(vTYPE) \ + private Q_SLOTS: \ + void onAdjustment(const vTYPE &vData); \ +Q_SIGNALS: \ + void didAdjustment(const vTYPE &vData); + //--------------------------------------------------------------------------------// -#define ADJUST_TRANSMT_BRIDGE_DEFINITION(vTYPE) \ - ADJUST_TRANSMT_PRIVATE_SLOT (vTYPE) \ - ADJUST_TRANSMT_SIGNAL (vTYPE) +#define ADJUST_TRANSMT_BRIDGE_DEFINITION(vTYPE) \ + private Q_SLOTS: \ + void onAdjustment(const vTYPE &vData) { \ + emit didAdjustment(vData); \ + } \ +Q_SIGNALS: \ + void didAdjustment(const vTYPE &vData); //--------------------------------------------------------------------------------// -#define ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(vTYPE) \ - ADJUST_TRANSMT_PUBLIC_SLOT (vTYPE) \ - ADJUST_TRANSMT_SIGNAL (vTYPE) +#define ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(vTYPE) \ + public Q_SLOTS: \ + void doAdjustment(const vTYPE &vData) { \ + emit didAdjustment(vData); \ + } \ +Q_SIGNALS: \ + void didAdjustment (const vTYPE &vData); //--------------------------------------------------------------------------------// #define REGISTER_METATYPE(vTYPE) \ - qRegisterMetaType < vTYPE > (#vTYPE); + qRegisterMetaType (#vTYPE); //--------------------------------------------------------------------------------// #define REGISTER_TYPE(vTYPE) \ - qmlRegisterType < vTYPE > (#vTYPE, 0, 1, #vTYPE); + qmlRegisterType (#vTYPE, 0, 1, #vTYPE);