diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
commit | f5aca1a1b402bd7ebc944dc6e6fe65828d863365 (patch) | |
tree | 4a0fdd8e166d5c4b03543279d332b9a858ef62df /src/tests/signals.cpp | |
parent | 10c557562e1d67c55314c212371ea9cb7f802863 (diff) | |
download | libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.gz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.bz2 libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.xz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.zip |
Bu::FString is now String, and there's a shell script to fix any other programs
that were using fstring, I hope.
Diffstat (limited to '')
-rw-r--r-- | src/tests/signals.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/tests/signals.cpp b/src/tests/signals.cpp index e53c16e..a8c8c4e 100644 --- a/src/tests/signals.cpp +++ b/src/tests/signals.cpp | |||
@@ -32,22 +32,22 @@ public: | |||
32 | sio << iState << ": void fnc1( " << a << " )" << sio.nl; | 32 | sio << iState << ": void fnc1( " << a << " )" << sio.nl; |
33 | } | 33 | } |
34 | 34 | ||
35 | void fnc2( int a, Bu::FString b ) | 35 | void fnc2( int a, Bu::String b ) |
36 | { | 36 | { |
37 | sio << iState << ": void fnc2( " << a << ", \"" << b << "\" )" << sio.nl; | 37 | sio << iState << ": void fnc2( " << a << ", \"" << b << "\" )" << sio.nl; |
38 | } | 38 | } |
39 | 39 | ||
40 | void fnc3( int a, Bu::FString b, double c ) | 40 | void fnc3( int a, Bu::String b, double c ) |
41 | { | 41 | { |
42 | sio << iState << ": void fnc3( " << a << ", \"" << b << "\", " << c << " )" << sio.nl; | 42 | sio << iState << ": void fnc3( " << a << ", \"" << b << "\", " << c << " )" << sio.nl; |
43 | } | 43 | } |
44 | 44 | ||
45 | void fnc4( int a, Bu::FString b, double c, char d ) | 45 | void fnc4( int a, Bu::String b, double c, char d ) |
46 | { | 46 | { |
47 | sio << iState << ": void fnc4( " << a << ", \"" << b << "\", " << c << ", '" << d << "' )" << sio.nl; | 47 | sio << iState << ": void fnc4( " << a << ", \"" << b << "\", " << c << ", '" << d << "' )" << sio.nl; |
48 | } | 48 | } |
49 | 49 | ||
50 | void fnc5( int a, Bu::FString b, double c, char d, long e ) | 50 | void fnc5( int a, Bu::String b, double c, char d, long e ) |
51 | { | 51 | { |
52 | sio << iState << ": void fnc5( " << a << ", \"" << b << "\", " << c << ", '" << d << "', " << e << " )" << sio.nl; | 52 | sio << iState << ": void fnc5( " << a << ", \"" << b << "\", " << c << ", '" << d << "', " << e << " )" << sio.nl; |
53 | } | 53 | } |
@@ -66,22 +66,22 @@ void pfnc1( int a ) | |||
66 | sio << ": void pfnc1( " << a << " )" << sio.nl; | 66 | sio << ": void pfnc1( " << a << " )" << sio.nl; |
67 | } | 67 | } |
68 | 68 | ||
69 | void pfnc2( int a, Bu::FString b ) | 69 | void pfnc2( int a, Bu::String b ) |
70 | { | 70 | { |
71 | sio << ": void pfnc2( " << a << ", \"" << b << "\" )" << sio.nl; | 71 | sio << ": void pfnc2( " << a << ", \"" << b << "\" )" << sio.nl; |
72 | } | 72 | } |
73 | 73 | ||
74 | void pfnc3( int a, Bu::FString b, double c ) | 74 | void pfnc3( int a, Bu::String b, double c ) |
75 | { | 75 | { |
76 | sio << ": void pfnc3( " << a << ", \"" << b << "\", " << c << " )" << sio.nl; | 76 | sio << ": void pfnc3( " << a << ", \"" << b << "\", " << c << " )" << sio.nl; |
77 | } | 77 | } |
78 | 78 | ||
79 | void pfnc4( int a, Bu::FString b, double c, char d ) | 79 | void pfnc4( int a, Bu::String b, double c, char d ) |
80 | { | 80 | { |
81 | sio << ": void pfnc4( " << a << ", \"" << b << "\", " << c << ", '" << d << "' )" << sio.nl; | 81 | sio << ": void pfnc4( " << a << ", \"" << b << "\", " << c << ", '" << d << "' )" << sio.nl; |
82 | } | 82 | } |
83 | 83 | ||
84 | void pfnc5( int a, Bu::FString b, double c, char d, long e ) | 84 | void pfnc5( int a, Bu::String b, double c, char d, long e ) |
85 | { | 85 | { |
86 | sio << ": void pfnc5( " << a << ", \"" << b << "\", " << c << ", '" << d << "', " << e << " )" << sio.nl; | 86 | sio << ": void pfnc5( " << a << ", \"" << b << "\", " << c << ", '" << d << "', " << e << " )" << sio.nl; |
87 | } | 87 | } |
@@ -105,22 +105,22 @@ int main() | |||
105 | cb1 = slot( &pfnc1 ); | 105 | cb1 = slot( &pfnc1 ); |
106 | cb1( 5 ); | 106 | cb1( 5 ); |
107 | 107 | ||
108 | Signal2<void, int, Bu::FString> cb2( slot( &t, &Thing::fnc2 ) ); | 108 | Signal2<void, int, Bu::String> cb2( slot( &t, &Thing::fnc2 ) ); |
109 | cb2( 5, "Hi there" ); | 109 | cb2( 5, "Hi there" ); |
110 | cb2 = slot( &pfnc2 ); | 110 | cb2 = slot( &pfnc2 ); |
111 | cb2( 5, "Hi there" ); | 111 | cb2( 5, "Hi there" ); |
112 | 112 | ||
113 | Signal3<void, int, Bu::FString, double> cb3( slot( &t, &Thing::fnc3 ) ); | 113 | Signal3<void, int, Bu::String, double> cb3( slot( &t, &Thing::fnc3 ) ); |
114 | cb3( 5, "Hi there", 12.85 ); | 114 | cb3( 5, "Hi there", 12.85 ); |
115 | cb3 = slot( &pfnc3 ); | 115 | cb3 = slot( &pfnc3 ); |
116 | cb3( 5, "Hi there", 12.85 ); | 116 | cb3( 5, "Hi there", 12.85 ); |
117 | 117 | ||
118 | Signal4<void, int, Bu::FString, double, char> cb4( slot( &t, &Thing::fnc4 ) ); | 118 | Signal4<void, int, Bu::String, double, char> cb4( slot( &t, &Thing::fnc4 ) ); |
119 | cb4( 5, "Hi there", 12.85, 'z' ); | 119 | cb4( 5, "Hi there", 12.85, 'z' ); |
120 | cb4 = slot( &pfnc4 ); | 120 | cb4 = slot( &pfnc4 ); |
121 | cb4( 5, "Hi there", 12.85, 'z' ); | 121 | cb4( 5, "Hi there", 12.85, 'z' ); |
122 | 122 | ||
123 | Signal5<void, int, Bu::FString, double, char, long> cb5( slot( &t, &Thing::fnc5 ) ); | 123 | Signal5<void, int, Bu::String, double, char, long> cb5( slot( &t, &Thing::fnc5 ) ); |
124 | cb5( 5, "Hi there", 12.85, 'z', 849 ); | 124 | cb5( 5, "Hi there", 12.85, 'z', 849 ); |
125 | cb5 = slot( &pfnc5 ); | 125 | cb5 = slot( &pfnc5 ); |
126 | cb5( 5, "Hi there", 12.85, 'z', 849 ); | 126 | cb5( 5, "Hi there", 12.85, 'z', 849 ); |