diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2012-12-21 00:06:20 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2012-12-21 00:06:20 +0000 |
| commit | 8642fe0ba100dee5a66265b07e21e043887a4a92 (patch) | |
| tree | 25a0a32061a53d730d4af102c26e858b9a5344f4 /src | |
| parent | 6af2989d3abbe9ff64631df33f9f9e135274d90c (diff) | |
| download | libbu++-8642fe0ba100dee5a66265b07e21e043887a4a92.tar.gz libbu++-8642fe0ba100dee5a66265b07e21e043887a4a92.tar.bz2 libbu++-8642fe0ba100dee5a66265b07e21e043887a4a92.tar.xz libbu++-8642fe0ba100dee5a66265b07e21e043887a4a92.zip | |
Signals (slots really) are now comperable. Building two slots for the same
function or same object and method will compare as expected.
Also added a -= function to Bu::List which works just like erase.
Diffstat (limited to '')
| -rw-r--r-- | src/stable/archive.h | 2 | ||||
| -rw-r--r-- | src/stable/list.h | 5 | ||||
| -rw-r--r-- | src/tests/signal.cpp | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/stable/archive.h b/src/stable/archive.h index f98402d..5c3a055 100644 --- a/src/stable/archive.h +++ b/src/stable/archive.h | |||
| @@ -129,7 +129,7 @@ namespace Bu | |||
| 129 | private: | 129 | private: |
| 130 | Stream &rStream; | 130 | Stream &rStream; |
| 131 | uint32_t nNextID; | 131 | uint32_t nNextID; |
| 132 | Hash<uint32_t,uint32_t> hPtrID; | 132 | Hash<uint32_t,ptrdiff_t> hPtrID; |
| 133 | Hash<uint32_t,List<void **> > hPtrDest; | 133 | Hash<uint32_t,List<void **> > hPtrDest; |
| 134 | Hash<Bu::String, Variant> hProps; | 134 | Hash<Bu::String, Variant> hProps; |
| 135 | }; | 135 | }; |
diff --git a/src/stable/list.h b/src/stable/list.h index b7fb1d1..0b6329c 100644 --- a/src/stable/list.h +++ b/src/stable/list.h | |||
| @@ -250,6 +250,11 @@ namespace Bu | |||
| 250 | return *this; | 250 | return *this; |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | MyType &operator-=( const value &v ) | ||
| 254 | { | ||
| 255 | return erase( v ); | ||
| 256 | } | ||
| 257 | |||
| 253 | MyType &operator+=( const MyType &src ) | 258 | MyType &operator+=( const MyType &src ) |
| 254 | { | 259 | { |
| 255 | _hardCopy(); | 260 | _hardCopy(); |
diff --git a/src/tests/signal.cpp b/src/tests/signal.cpp index 93519fa..62e8bd5 100644 --- a/src/tests/signal.cpp +++ b/src/tests/signal.cpp | |||
| @@ -40,6 +40,8 @@ int main() | |||
| 40 | lMaths += slot(Double); | 40 | lMaths += slot(Double); |
| 41 | lMaths += slot(Square); | 41 | lMaths += slot(Square); |
| 42 | println("Math'd %1 = %2").arg( 5 ).arg( lMaths(5) ); | 42 | println("Math'd %1 = %2").arg( 5 ).arg( lMaths(5) ); |
| 43 | lMaths -= slot(Square); | ||
| 44 | println("Math'd %1 = %2").arg( 5 ).arg( lMaths(5) ); | ||
| 43 | 45 | ||
| 44 | return 0; | 46 | return 0; |
| 45 | } | 47 | } |
