StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(model): return connection from interface macro

Browse Source 
connection is normally returned from Qt's connect, and the caller may want to
track the connection to manually disconnect it.

(cherry picked from commit 41b2b35ce3037a32f705caf92600c42b0ae4798a)
This commit is contained in:
Anthony Bilinski 2019-10-10 02:53:41 -07:00
parent dfeca3e906
commit 40e43586f1
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/model/interface.h
View File

@ -20,6 +20,8 @@
#ifndef INTERFACE_H #ifndef INTERFACE_H
#define INTERFACE_H #define INTERFACE_H
#include <QMetaObject>
#include <functional> #include <functional>
/** /**
@ -48,7 +50,7 @@
*/ */
#define DECLARE_SIGNAL(name, ...) \ #define DECLARE_SIGNAL(name, ...) \
using Slot_##name = std::function<void (__VA_ARGS__)>; \ using Slot_##name = std::function<void (__VA_ARGS__)>; \
virtual void connectTo_##name(Slot_##name slot) const = 0 virtual QMetaObject::Connection connectTo_##name(Slot_##name slot) const = 0
/** /**
* @def DECLARE_SIGNAL * @def DECLARE_SIGNAL
@ -56,7 +58,7 @@
*/ */
#define DECLARE_SIGNAL(name, ...) \ #define DECLARE_SIGNAL(name, ...) \
using Slot_##name = std::function<void (__VA_ARGS__)>; \ using Slot_##name = std::function<void (__VA_ARGS__)>; \
virtual void connectTo_##name(Slot_##name slot) const = 0 virtual QMetaObject::Connection connectTo_##name(Slot_##name slot) const = 0
/** /**
* @def SIGNAL_IMPL * @def SIGNAL_IMPL
@ -65,7 +67,7 @@
#define SIGNAL_IMPL(classname, name, ...) \ #define SIGNAL_IMPL(classname, name, ...) \
using Slot_##name = std::function<void (__VA_ARGS__)>; \ using Slot_##name = std::function<void (__VA_ARGS__)>; \
Q_SIGNAL void name(__VA_ARGS__); \ Q_SIGNAL void name(__VA_ARGS__); \
void connectTo_##name(Slot_##name slot) const override { \ QMetaObject::Connection connectTo_##name(Slot_##name slot) const override { \
connect(this, &classname::name, slot); \ connect(this, &classname::name, slot); \
} }