Merge lp:~marcustomlinson/properties-cpp/fix_qt_keyword_clash into lp:properties-cpp
Proposed by
Marcus Tomlinson
Status: | Merged |
---|---|
Approved by: | Marcus Tomlinson |
Approved revision: | 16 |
Merged at revision: | 16 |
Proposed branch: | lp:~marcustomlinson/properties-cpp/fix_qt_keyword_clash |
Merge into: | lp:properties-cpp |
Diff against target: |
119 lines (+18/-18) 1 file modified
include/core/signal.h (+18/-18) |
To merge this branch: | bzr merge lp:~marcustomlinson/properties-cpp/fix_qt_keyword_clash |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thomas Voß (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Renamed "slots" to "slot_list" in signal.h as to avoid clashing with the "slots" Qt keyword.
Description of the change
Renamed "slots" to "slot_list" in signal.h as to avoid clashing with the "slots" Qt keyword.
To post a comment you must log in.
This fix has been spurred on by compilation errors experienced when building scopes against the latest unity-scopes-api (which now includes a dependancy on properties-cpp).
http:// paste.ubuntu. com/7638421/