Wow! Merged the branch, streams are updated, and there's no more FString, run

the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/tests/signals.cpp b/src/tests/signals.cpp
index e53c16e..14bbc9c 100644
--- a/src/tests/signals.cpp
+++ b/src/tests/signals.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
  *
  * This file is part of the libbu++ library and is released under the
  * terms of the license contained in the file LICENSE.
@@ -32,22 +32,22 @@ public:
                 sio << iState << ": void fnc1( " << a << " )" << sio.nl;
         }
         
-        void fnc2( int a, Bu::FString b )
+        void fnc2( int a, Bu::String b )
         {
                 sio << iState << ": void fnc2( " << a << ", \"" << b << "\" )" << sio.nl;
         }
         
-        void fnc3( int a, Bu::FString b, double c )
+        void fnc3( int a, Bu::String b, double c )
         {
                 sio << iState << ": void fnc3( " << a << ", \"" << b << "\", " << c << " )" << sio.nl;
         }
         
-        void fnc4( int a, Bu::FString b, double c, char d )
+        void fnc4( int a, Bu::String b, double c, char d )
         {
                 sio << iState << ": void fnc4( " << a << ", \"" << b << "\", " << c << ", '" << d << "' )" << sio.nl;
         }
         
-        void fnc5( int a, Bu::FString b, double c, char d, long e )
+        void fnc5( int a, Bu::String b, double c, char d, long e )
         {
                 sio << iState << ": void fnc5( " << a << ", \"" << b << "\", " << c << ", '" << d << "', " << e << " )" << sio.nl;
         }
@@ -66,22 +66,22 @@ void pfnc1( int a )
         sio <<  ": void pfnc1( " << a << " )" << sio.nl;
 }
 
-void pfnc2( int a, Bu::FString b )
+void pfnc2( int a, Bu::String b )
 {
         sio <<  ": void pfnc2( " << a << ", \"" << b << "\" )" << sio.nl;
 }
 
-void pfnc3( int a, Bu::FString b, double c )
+void pfnc3( int a, Bu::String b, double c )
 {
         sio <<  ": void pfnc3( " << a << ", \"" << b << "\", " << c << " )" << sio.nl;
 }
 
-void pfnc4( int a, Bu::FString b, double c, char d )
+void pfnc4( int a, Bu::String b, double c, char d )
 {
         sio <<  ": void pfnc4( " << a << ", \"" << b << "\", " << c << ", '" << d << "' )" << sio.nl;
 }
 
-void pfnc5( int a, Bu::FString b, double c, char d, long e )
+void pfnc5( int a, Bu::String b, double c, char d, long e )
 {
         sio <<  ": void pfnc5( " << a << ", \"" << b << "\", " << c << ", '" << d << "', " << e << " )" << sio.nl;
 }
@@ -105,22 +105,22 @@ int main()
         cb1 = slot( &pfnc1 );
         cb1( 5 );
         
-        Signal2<void, int, Bu::FString> cb2( slot( &t, &Thing::fnc2 ) );
+        Signal2<void, int, Bu::String> cb2( slot( &t, &Thing::fnc2 ) );
         cb2( 5, "Hi there" );
         cb2 = slot( &pfnc2 );
         cb2( 5, "Hi there" );
         
-        Signal3<void, int, Bu::FString, double> cb3( slot( &t, &Thing::fnc3 ) );
+        Signal3<void, int, Bu::String, double> cb3( slot( &t, &Thing::fnc3 ) );
         cb3( 5, "Hi there", 12.85 );
         cb3 = slot( &pfnc3 );
         cb3( 5, "Hi there", 12.85 );
         
-        Signal4<void, int, Bu::FString, double, char> cb4( slot( &t, &Thing::fnc4 ) );
+        Signal4<void, int, Bu::String, double, char> cb4( slot( &t, &Thing::fnc4 ) );
         cb4( 5, "Hi there", 12.85, 'z' );
         cb4 = slot( &pfnc4 );
         cb4( 5, "Hi there", 12.85, 'z' );
         
-        Signal5<void, int, Bu::FString, double, char, long> cb5( slot( &t, &Thing::fnc5 ) );
+        Signal5<void, int, Bu::String, double, char, long> cb5( slot( &t, &Thing::fnc5 ) );
         cb5( 5, "Hi there", 12.85, 'z', 849 );
         cb5 = slot( &pfnc5 );
         cb5( 5, "Hi there", 12.85, 'z', 849 );